small cleanups

README.md

@@ -11,6 +11,7 @@ Sample Applications
 - [Pacman](https://github.com/jscrane/pacman)
 - [Commodore PET](https://github.com/jscrane/PET)
 - [Compukit UK101](https://github.com/jscrane/UK101)
+- [Commodore Chessmate](https://github.com/jscrane/Chessmate)
 
 Configuration for Arduino
 --------------
@@ -51,5 +52,5 @@ ESP8266 board, e.g., [WeMOS](https://www.wemos.cc/en/latest/d1/d1_mini.html), _o
 ESP32-based board, e.g., [Node32s](https://www.esp32.com/viewtopic.php?t=459),
 - An SD drive to store programs (for Stellarpad),
 - A 23k256 SPI RAM chip (for Stellarpad, optional),
-- A supported TFT screen, such as [this one](http://forum.stellarisiti.com/topic/626-ssd1289-32-320x240-tft-16bit-parallel-interface-touch-libraries/),
+- A supported TFT screen (if not using a board with VGA),
 - A PS/2 keyboard.

display.cpp

@@ -193,7 +193,7 @@ void Display::drawCircle(unsigned x, unsigned y, unsigned r, colour_t col) {
 #elif defined(USE_ESPI)
 	espi.drawCircle(x, y, r, col);
 #elif defined(USE_VGA)
-	canvas.setBrushColor(rgb(col));
+	canvas.setPenColor(rgb(col));
 	canvas.fillEllipse(x, y, r, r);
 #endif
 }
@@ -207,7 +207,7 @@ void Display::fillCircle(unsigned x, unsigned y, unsigned r, colour_t col) {
 #elif defined(USE_ESPI)
 	espi.fillCircle(x, y, r, col);
 #elif defined(USE_VGA)
-	canvas.setPenColor(rgb(col));
+	canvas.setBrushColor(rgb(col));
 	canvas.drawEllipse(x, y, r, r);
 #endif
 }
@@ -221,7 +221,7 @@ void Display::drawRectangle(unsigned x, unsigned y, unsigned w, unsigned h, colo
 #elif defined(USE_ESPI)
 	espi.drawRect(x, y, w, h, col);
 #elif defined(USE_VGA)
-	canvas.setBrushColor(rgb(col));
+	canvas.setPenColor(rgb(col));
 	canvas.fillRectangle(x, y, x+w, y+h);
 #endif
 }
@@ -235,7 +235,7 @@ void Display::fillRectangle(unsigned x, unsigned y, unsigned w, unsigned h, colo
 #elif defined(USE_ESPI)
 	espi.fillRect(x, y, w, h, col);
 #elif defined(USE_VGA)
-	canvas.setPenColor(rgb(col));
+	canvas.setBrushColor(rgb(col));
 	canvas.drawRectangle(x, y, x+w, y+h);
 #endif
 }

hw/esp8bit.h

@@ -22,10 +22,12 @@
 #define KBD_DATA	D4
 
 // SPI-RAM
+#if !defined(NO_SPIRAM)
 #define USE_SPIRAM
 #define SPIRAM_DEV	SPI
 #define SPIRAM_CS       D0
 #define SPIRAM_SIZE	0x8000u
+#endif
 
 // flash storage
 #if !defined(NO_STORAGE)

hw/node32s-example.h

@@ -28,10 +28,12 @@
 #define KBD_DATA	34
 #define KBD_IRQ		35
 
-// storage
+// Storage
+#if !defined(NO_STORAGE)
 #undef USE_SD
 #undef USE_LITTLEFS
 #define USE_SPIFFS
+#endif
 
 // sound: dac and pwm
 #define DAC_SOUND	25

hw/stellarpad-example.h

@@ -7,12 +7,15 @@
 #define KBD_DATA	PE_4
 #define KBD_IRQ		PE_5
 
-// "tape" storage...
+// Storage
+#if !defined(NO_STORAGE)
 #define USE_SD
 #define SD_CS		PF_3
 #define SD_SPI		1
+#endif
 
 // 23k256 SPI-RAM
+#if !defined(NO_SPIRAM)
 #define USE_SPIRAM
 #define SPI_CS		PF_3
 #define SPIRAM_CS       PE_0
@@ -20,6 +23,7 @@
 #define SPIRAM_MODULE	1
 #define SPIRAM_CLKDIV	1
 #define SPIRAM_SIZE	0x8000u
+#endif
 
 // TFT display...
 // NOTE: edit memorysaver.h to select the correct chip for your display!

hw/ttgo-t7-v14-mini32.h

@@ -20,7 +20,9 @@
 #define DAC_SOUND	25
 #define PWM_SOUND	25
 
-// "tape" storage...
+// Storage
+#if !defined(NO_STORAGE)
 #undef USE_SD
 #undef USE_LITTLEFS
 #define USE_SPIFFS
+#endif

sound_dac.cpp

@@ -3,9 +3,9 @@
 #include "timed.h"
 #include "sound_dac.h"
 
+#if defined(DAC_SOUND) && defined(ESP_PLATFORM)
 static DAC *s;
 
-#if defined(DAC_SOUND) && defined(ESP_PLATFORM)
 #include <driver/dac.h>
 
 static portMUX_TYPE mux = portMUX_INITIALIZER_UNLOCKED;