Updates for wikwi

script/merge_firmware.py

@@ -6,10 +6,15 @@
 
 
 def merge_bin(source, target, env):
+    print( "Running merge bin." )
+
     # The list contains all extra images (bootloader, partitions, eboot) and
     # the final application binary
     flash_images = env.Flatten(env.get("FLASH_EXTRA_IMAGES", [])) + ["$ESP32_APP_OFFSET", APP_BIN]
 
+    #flash_images.append( "0x390000" )
+    #flash_images.append( ".pio/build/gravity32-wokwi/spiffs.bin" )
+
     # Run esptool to merge images into a single binary
     env.Execute(
         " ".join(
@@ -37,4 +42,4 @@ def merge_bin(source, target, env):
         ]
         + ["0x0", MERGED_BIN],
     UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS',
-)
+)

src/main.hpp

@@ -124,7 +124,12 @@ extern RunMode runMode;
 // Hardware config for ESP32-d1-min, iSpindel hardware
 // ------------------------------------------------------
 #include <FS.h>
+#if defined(WOKWI) // TEMPORARY FIX FOR ISSUE https://github.com/wokwi/wokwi-features/issues/642
+#include <SPIFFS.h>
+#define LittleFS SPIFFS
+#else
 #include <LittleFS.h>
+#endif
 
 #include "esp32/rom/rtc.h"
 #define ESPhttpUpdate httpUpdate