diff --git a/hardware.cpp b/hardware.cpp index 72c7a8c..83e283c 100644 --- a/hardware.cpp +++ b/hardware.cpp @@ -18,7 +18,7 @@ #include "ps2drv.h" #include "CPU.h" -#if defined(SPIRAM_CS) +#if defined(USE_SPIRAM) #include #include "spiram.h" spiram sram(SPIRAM_SIZE); @@ -32,7 +32,7 @@ static CPU *_cpu; bool hardware_reset() { bool success = true; -#if defined(SPIRAM_CS) +#if defined(USE_SPIRAM) extern SPIClass SPIRAM_DEV; SPIRAM_DEV.begin(); SPIRAM_DEV.setModule(SPIRAM_SPI); @@ -73,7 +73,7 @@ void hardware_init(CPU &cpu) { digitalWrite(SD_CS, HIGH); #endif -#if defined(SPIRAM_CS) +#if defined(USE_SPIRAM) pinMode(SPIRAM_CS, OUTPUT); digitalWrite(SPIRAM_CS, HIGH); #endif diff --git a/hardware.h b/hardware.h index eeae1b4..60b021a 100644 --- a/hardware.h +++ b/hardware.h @@ -22,7 +22,7 @@ void hardware_restore(class Stream &); #ifdef __PS2DRV_H__ extern class PS2Driver ps2; #endif -#if defined(__SPIRAM_H__) && defined(SPIRAM_CS) +#if defined(__SPIRAM_H__) && defined(USE_SPIRAM) extern class spiram sram; #endif #ifdef __MEMORY_H__ diff --git a/hw/esp32-espi-dac.h b/hw/esp32-espi-dac.h index b7892e5..4a0f4d4 100644 --- a/hw/esp32-espi-dac.h +++ b/hw/esp32-espi-dac.h @@ -16,7 +16,7 @@ #define KBD_IRQ 35 // SPI-RAM -#undef SPIRAM_CS +#undef USE_SPIRAM // "tape" storage... #undef USE_SD diff --git a/hw/esp32-utft-dac.h b/hw/esp32-utft-dac.h index 407411b..a3d597a 100644 --- a/hw/esp32-utft-dac.h +++ b/hw/esp32-utft-dac.h @@ -12,7 +12,7 @@ #define KBD_IRQ 35 // SPI-RAM -#undef SPIRAM_CS +#undef USE_SPIRAM // "tape" storage... #undef USE_SD diff --git a/hw/esp8266-pwm.h b/hw/esp8266-pwm.h index eec5148..9fe7d09 100644 --- a/hw/esp8266-pwm.h +++ b/hw/esp8266-pwm.h @@ -16,7 +16,7 @@ #define KBD_IRQ D4 // SPI-RAM -#undef SPIRAM_CS +#undef USE_SPIRAM // "tape" storage... #undef USE_SD diff --git a/hw/lm4f-utft-sd.h b/hw/lm4f-utft-sd.h index feee865..51127a7 100644 --- a/hw/lm4f-utft-sd.h +++ b/hw/lm4f-utft-sd.h @@ -14,6 +14,7 @@ #define KBD_IRQ PE_5 // SPI-RAM +#define USE_SPIRAM #define SPIRAM_CS PE_0 #define SPIRAM_SPI 1 #define SPIRAM_DEV SPI_for_SD diff --git a/hw/lm4f-utft.h b/hw/lm4f-utft.h new file mode 100644 index 0000000..2b2cfdc --- /dev/null +++ b/hw/lm4f-utft.h @@ -0,0 +1,22 @@ +// TFT display... +// NOTE: edit memorysaver.h to select the correct chip for your display! +// Daniel Rebollo's boosterpack +#define USE_UTFT +#define TFT_BACKLIGHT PD_6 +#define TFT_MODEL SSD1289 +#define TFT_RS PC_6 +#define TFT_WR PC_5 +#define TFT_CS PC_7 +#define TFT_RST PC_4 + +// PS/2 keyboard +#define KBD_DATA PE_4 +#define KBD_IRQ PE_5 + +// SPI-RAM +#undef USE_SPIRAM + +// "tape" storage... +#undef USE_SD + +#define SPI_CS PF_3 diff --git a/spiram.cpp b/spiram.cpp index 05e77b6..6f0452a 100644 --- a/spiram.cpp +++ b/spiram.cpp @@ -1,10 +1,10 @@ +#include "hardware.h" + +#if defined(USE_SPIRAM) #include #include #include "memory.h" #include "spiram.h" -#include "hardware.h" - -#if defined(SPIRAM_CS) extern SPIClass SPIRAM_DEV;