Apple-1-HW/Apple1-esp
1
0
Fork 0
mirror of https://github.com/jscrane/Apple1.git synced 2025-02-16 17:30:28 +00:00
Code Issues Projects Releases Wiki Activity

fix compile error + Makefile tweaks

Browse Source
This commit is contained in:
steve 2023-07-28 13:08:15 +01:00
parent b40cc26ca5
commit c129e717d8
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Apple1.ino
View File

@ -46,10 +46,15 @@ void setup() {
#if defined(DEBUGGING) || defined(CPU_DEBUG) #if defined(DEBUGGING) || defined(CPU_DEBUG)
Serial.begin(TERMINAL_SPEED); Serial.begin(TERMINAL_SPEED);
Serial.println(); Serial.println();
Serial.printf("RAM: %dkB at 0x0000", RAM_PAGES); Serial.print("RAM: ");
Serial.print(RAM_PAGES);
Serial.print("kB at 0x0000");
Serial.println(); Serial.println();
#if defined(USE_SPIRAM) #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(); Serial.println();
#endif #endif
#endif #endif

4
Makefile
View File

@ -4,7 +4,7 @@ TERMINAL_SPEED := 115200
ifeq ($t, esp8266) ifeq ($t, esp8266)
BOARD := d1_mini BOARD := d1_mini
UPLOAD_SPEED := 921600 BAUD := 921600
FS_DIR := programs FS_DIR := programs
EESZ := 4M1M EESZ := 4M1M
F_CPU := 80 F_CPU := 80
@ -21,7 +21,7 @@ LIBRARIES := UTFT SD SpiRAM
endif endif
ifeq ($t, esp32) ifeq ($t, esp32)
UPLOAD_SPEED := 921600 UPLOADSPEED := 921600
FS_DIR := programs FS_DIR := programs
CPPFLAGS = -DDEBUGGING -DCPU_DEBUG -DTERMINAL_SPEED=$(TERMINAL_SPEED) CPPFLAGS = -DDEBUGGING -DCPU_DEBUG -DTERMINAL_SPEED=$(TERMINAL_SPEED)
LIBRARIES = FS SPIFFS LIBRARIES = FS SPIFFS