mirror of
https://github.com/jscrane/Apple1.git
synced 2024-12-27 20:31:00 +00:00
fix compile error + Makefile tweaks
This commit is contained in:
parent
b40cc26ca5
commit
c129e717d8
@ -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
|
||||
|
4
Makefile
4
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
|
||||
|
Loading…
Reference in New Issue
Block a user