diff --git a/Apple1.ino b/Apple1.ino index 489915f..1f6a828 100644 --- a/Apple1.ino +++ b/Apple1.ino @@ -43,6 +43,7 @@ terminal_disp dsp(Serial); #endif io io(files, kbd, dsp); +Memory memory; r6502 cpu(memory); void reset() { diff --git a/Makefile b/Makefile index b480bd2..6eddd08 100644 --- a/Makefile +++ b/Makefile @@ -35,10 +35,10 @@ CPPFLAGS += -DHARDWARE_H=\"hw/ttgo-t7-v14-mini32.h\" LIBRARIES += FabGL WiFi else -BOARD := node32s +BOARD := lolin32 CPPFLAGS += -DUSER_SETUP_LOADED -DILI9341_DRIVER -DTFT_CS=5 -DTFT_DC=2 \ -DTFT_RST=-1 -DSPI_FREQUENCY=40000000 -DLOAD_GLCD \ - -DHARDWARE_H=\"hw/node32s-example.h\" + -DHARDWARE_H=\"hw/esp32-example.h\" LIBRARIES += TFT_eSPI endif endif