Added support for VGA-32 v1.4 using #ifdef VGA32V14

Author: abelykh0

.gitignore

@@ -8,6 +8,7 @@ platformio.ini
 /work
 .piolibdeps/
 .vscode
+.pio
 data/boot.cfg
 data/sna/**
 !data/sna/sppong.sna

include/Disk.h

@@ -21,7 +21,13 @@ extern String cfg_wssid;
 extern String cfg_wpass;
 
 // Declared methods
+
+#ifdef VGA32V14
+void IRAM_ATTR mount_sd();
+#else
 void IRAM_ATTR mount_spiffs();
+#endif
+
 String getAllFilesFrom(const String path);
 void listAllFiles();
 File IRAM_ATTR open_read_file(String filename);

include/def/hardware.h

@@ -1,3 +1,25 @@
+#ifdef VGA32V14
+
+#define SPEAKER_PIN 25
+#define EAR_PIN 34
+#define MIC_PIN 39
+
+#define KEYBOARD_DATA 32
+#define KEYBOARD_CLK 33
+
+#define COLOUR_16
+
+// 16b pins
+#define RED_PINS 21, 21, 22, 22, 22
+#define GREEN_PINS 18, 18, 19, 19, 19
+#define BLUE_PINS 4, 4, 5, 5
+
+// VGA sync pins
+#define HSYNC_PIN 23
+#define VSYNC_PIN 15
+
+#else
+
 #define SPEAKER_PIN 5
 #define EAR_PIN 34
 #define MIC_PIN 0
@@ -22,6 +44,9 @@
 #define HSYNC_PIN 32
 #define VSYNC_PIN 33
 
+
+#endif
+
 #ifdef COLOUR_8
 #define BLACK 0x08
 #define BLUE 0x0c

platformio.ini.vga32

@@ -0,0 +1,11 @@
+# Use this configuration to build for VGA32 v1.4
+
+[env:pico32]
+platform = espressif32
+board = pico32
+framework = arduino
+board_build.partitions = noota_3g.csv
+lib_deps = bitluni/bitluni ESP32Lib@0.2.1
+build_flags =
+    -DVGA32V14
+

src/Disk.cpp

@@ -8,7 +8,12 @@
 #include "def/types.h"
 #include "osd.h"
 #include <FS.h>
+
+#ifdef VGA32V14
+#include <SD.h>
+#else
 #include <SPIFFS.h>
+#endif
 
 void errorHalt(String errormsg);
 void IRAM_ATTR kb_interruptHandler(void);
@@ -26,16 +31,32 @@ boolean cfg_wconn = false;
 String cfg_wssid = "none";
 String cfg_wpass = "none";
 
+static fs::FS* fileSystem;
+
+#ifdef VGA32V14
+void IRAM_ATTR mount_sd() {
+    SPI.begin(14, 2, 12);
+    if (!SD.begin(13)) 
+    {
+        errorHalt(ERR_MOUNT_FAIL);
+    }
+
+    fileSystem = &SD;
+    vTaskDelay(2);
+}
+#else
 void IRAM_ATTR mount_spiffs() {
     if (!SPIFFS.begin())
         errorHalt(ERR_MOUNT_FAIL);
 
+    fileSystem = &SPIFFS;
     vTaskDelay(2);
 }
+#endif
 
 String getAllFilesFrom(const String path) {
     KB_INT_STOP;
-    File root = SPIFFS.open("/");
+    File root = fileSystem->open("/");
     File file = root.openNextFile();
     String listing;
 
@@ -54,7 +75,7 @@ String getAllFilesFrom(const String path) {
 
 void listAllFiles() {
     KB_INT_STOP;
-    File root = SPIFFS.open("/");
+    File root = fileSystem->open("/");
     Serial.println("fs opened");
     File file = root.openNextFile();
     Serial.println("fs openednextfile");
@@ -74,11 +95,11 @@ File open_read_file(String filename) {
     filename.trim();
     if (cfg_slog_on)
         Serial.printf("%s '%s'\n", MSG_LOADING, filename.c_str());
-    if (!SPIFFS.exists(filename.c_str())) {
+    if (!fileSystem->exists(filename.c_str())) {
         KB_INT_START;
         errorHalt((String)ERR_READ_FILE + "\n" + filename);
     }
-    f = SPIFFS.open(filename.c_str(), FILE_READ);
+    f = fileSystem->open(filename.c_str(), FILE_READ);
     vTaskDelay(2);
 
     return f;
@@ -235,7 +256,7 @@ String getFileEntriesFromDir(String path) {
     KB_INT_STOP;
     Serial.printf("Getting entries from: '%s'\n", path.c_str());
     String filelist;
-    File root = SPIFFS.open(path.c_str());
+    File root = fileSystem->open(path.c_str());
     if (!root || !root.isDirectory()) {
         errorHalt((String)ERR_DIR_OPEN + "\n" + root);
     }
@@ -379,7 +400,7 @@ void config_read() {
 void config_save() {
     KB_INT_STOP;
     Serial.printf("Saving config file '%s':\n", DISK_BOOT_FILENAME);
-    File f = SPIFFS.open(DISK_BOOT_FILENAME, FILE_WRITE);
+    File f = fileSystem->open(DISK_BOOT_FILENAME, FILE_WRITE);
     // Architecture
     Serial.printf("  + arch:%s\n", cfg_arch.c_str());
     f.printf("arch:%s\n", cfg_arch.c_str());

src/ZX-ESPectrum.ino

@@ -49,7 +49,12 @@ void setup_cpuspeed();
 void config_read();
 void do_OSD();
 void errorHalt(String);
+
+#ifdef VGA32V14
+void mount_sd();
+#else
 void mount_spiffs();
+#endif
 
 // GLOBALS
 volatile byte z80ports_in[128];
@@ -75,7 +80,6 @@ VGA3Bit vga;
 VGA14Bit vga;
 #endif
 
-
 void setup() {
     // Turn off peripherals to gain memory (?do they release properly)
     esp_bt_controller_deinit();
@@ -88,7 +92,12 @@ void setup() {
 
     Serial.printf("HEAP BEGIN %d\n", ESP.getFreeHeap());
 
+#ifdef VGA32V14
+    mount_sd();
+#else
     mount_spiffs();
+#endif
+
     config_read();
     // wifiConn();
     Serial.printf("HEAP AFTER WIFI %d\n", ESP.getFreeHeap());