Fix Render Map reading SD Shared SPI BUS

jgauchia · Aug 9, 2024 · d56e77a · d56e77a
1 parent 0a2aebc
commit d56e77a
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 8 deletions.
diff --git a/lib/gui/src/mainScr.cpp b/lib/gui/src/mainScr.cpp
@@ -210,7 +210,6 @@ void getZoomValue(lv_event_t *event)
       case LV_DIR_RIGHT:
         break;
       case LV_DIR_TOP:
-        tft.endTransaction();
         if (!isVectorMap)
         {
             if (zoom >= minZoom && zoom < maxZoom)
@@ -229,7 +228,6 @@ void getZoomValue(lv_event_t *event)
         lv_obj_send_event(mapTile, LV_EVENT_REFRESH, NULL);
         break;
       case LV_DIR_BOTTOM:
-        tft.endTransaction();
         if (!isVectorMap)
         {
           if (zoom <= maxZoom && zoom > minZoom)

diff --git a/lib/maps/src/renderMaps.cpp b/lib/maps/src/renderMaps.cpp
@@ -93,6 +93,13 @@ void generateRenderMap()
     deleteMapScrSprites();
     createMapScrSprites();
 
+    #ifdef SPI_SHARED
+    tft.endTransaction();
+    tft.waitDisplay();
+    tft.releaseBus();
+    initSD();
+    #endif
+
     mapTempSprite.fillScreen(TFT_BLACK);
     isMapFound  = mapTempSprite.drawPngFile(SD, currentMapTile.file, tileSize, tileSize);
 
@@ -132,6 +139,12 @@ void generateRenderMap()
       redrawMap = true;
     }
 
+    #ifdef SPI_SHARED
+    SD.end();
+    tft.initBus();
+    tft.beginTransaction();
+    #endif
+
     log_v("TILE: %s", oldMapTile.file);
   }
 }
diff --git a/lib/maps/src/renderMaps.hpp b/lib/maps/src/renderMaps.hpp
@@ -39,5 +39,6 @@ uint32_t lat2tiley(double f_lat, uint8_t zoom);
 MapTile getMapTile(double lon, double lat, uint8_t zoomLevel, int16_t offsetX, int16_t offsetY);
 void drawMapWidgets();
 void generateRenderMap();
+void initSD();
 
 #endif
diff --git a/lib/panel/ILI9488_FT5x06_SPI.hpp b/lib/panel/ILI9488_FT5x06_SPI.hpp
@@ -39,17 +39,17 @@ class LGFX : public lgfx::LGFX_Device
     {
       auto cfg = _bus_instance.config();
       #ifdef ARDUINO_ESP32S3_DEV
-      cfg.spi_host = SPI3_HOST;
+      cfg.spi_host = SPI2_HOST;
       #endif
       #ifdef ARDUINO_ESP32_DEV
       cfg.spi_host = HSPI_HOST;
       #endif
       cfg.spi_mode = 0;
       cfg.freq_write = 79999999;
-      cfg.freq_read = 15000000;
+      cfg.freq_read = 40000000;
       cfg.spi_3wire = false;
       cfg.use_lock = false;
-      cfg.dma_channel = SPI_DMA_CH_AUTO;
+      cfg.dma_channel = 2;
       cfg.pin_sclk = TFT_SPI_SCLK;
       cfg.pin_mosi = TFT_SPI_MOSI;
       cfg.pin_miso = TFT_SPI_MISO;

diff --git a/lib/storage/storage.cpp b/lib/storage/storage.cpp
@@ -20,10 +20,19 @@ extern const int SD_CLK;
  */
 void initSD()
 {
-  spiSD.begin(SD_CLK, SD_MISO, SD_MOSI, SD_CS);
+  bool SDInitOk = false;
   pinMode(SD_CS,OUTPUT);
   digitalWrite(SD_CS,LOW);
-  if (!SD.begin(SD_CS, spiSD)) //, sdFreq))
+
+  #ifdef SPI_SHARED
+  SDInitOk = SD.begin(SD_CS);
+  #endif
+  #ifndef SPI_SHARED
+  spiSD.begin(SD_CLK, SD_MISO, SD_MOSI, SD_CS);
+  SDInitOk = SD.begin(SD_CS, spiSD, sdFreq);
+  #endif
+
+  if (!SDInitOk)
   {
     log_e("SD Card Mount Failed");
     return;

diff --git a/lib/storage/storage.hpp b/lib/storage/storage.hpp
@@ -12,9 +12,11 @@
 #include <FS.h>
 #include <SD.h>
 #include <SPIFFS.h>
+#include <LovyanGFX.hpp>
+#include <tft.hpp>
 
 #ifdef ARDUINO_ESP32S3_DEV
-static SPIClass spiSD = SPIClass();
+static SPIClass spiSD = SPIClass(HSPI);
 static uint32_t sdFreq = 10000000;
 #endif
 #ifdef ARDUINO_ESP32_DEV
@@ -24,6 +26,7 @@ static uint32_t sdFreq = 40000000;
 
 extern bool isSdLoaded;
 
+
 void initSD();
 void initSPIFFS();