From c129e717d821008a61d8a5ee0ccb2b0df641bd8b Mon Sep 17 00:00:00 2001 From: steve Date: Fri, 28 Jul 2023 13:08:15 +0100 Subject: [PATCH] fix compile error + Makefile tweaks --- Apple1.ino | 9 +++++++-- Makefile | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Apple1.ino b/Apple1.ino index 4d6339c..dc3eb3b 100644 --- a/Apple1.ino +++ b/Apple1.ino @@ -46,10 +46,15 @@ void setup() { #if defined(DEBUGGING) || defined(CPU_DEBUG) Serial.begin(TERMINAL_SPEED); Serial.println(); - Serial.printf("RAM: %dkB at 0x0000", RAM_PAGES); + Serial.print("RAM: "); + Serial.print(RAM_PAGES); + Serial.print("kB at 0x0000"); Serial.println(); #if defined(USE_SPIRAM) - Serial.printf("SpiRAM: %dkB at 0x%04x", SPIRAM_EXTENT * Memory::page_size / 1024, SPIRAM_BASE); + Serial.print("SpiRAM: "); + Serial.print(SPIRAM_EXTENT * Memory::page_size / 1024); + Serial.print("kB at 0x"); + Serial.print(SPIRAM_BASE, 16); Serial.println(); #endif #endif diff --git a/Makefile b/Makefile index bd1ea31..8bd333b 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ TERMINAL_SPEED := 115200 ifeq ($t, esp8266) BOARD := d1_mini -UPLOAD_SPEED := 921600 +BAUD := 921600 FS_DIR := programs EESZ := 4M1M F_CPU := 80 @@ -21,7 +21,7 @@ LIBRARIES := UTFT SD SpiRAM endif ifeq ($t, esp32) -UPLOAD_SPEED := 921600 +UPLOADSPEED := 921600 FS_DIR := programs CPPFLAGS = -DDEBUGGING -DCPU_DEBUG -DTERMINAL_SPEED=$(TERMINAL_SPEED) LIBRARIES = FS SPIFFS