Fix Load Render Map - Avoid multiple File Reading

lib/gui/src/mainScr.cpp

@@ -13,7 +13,7 @@
 bool isMainScreen = false; // Flag to indicate main screen is selected
 bool isScrolled = true;    // Flag to indicate when tileview was scrolled
 bool isReady = false;      // Flag to indicate when tileview scroll was finished
-bool redrawMap = false;    // Flag to indicate when needs to redraw Map
+bool redrawMap = true;     // Flag to indicate when needs to redraw Map
 uint8_t activeTile = 0;    // Current active tile
 
 lv_obj_t *compassHeading;
@@ -146,7 +146,6 @@ void getActTile(lv_event_t *event)
   //  if (activeTile == MAP || activeTile == NAV)
     if (activeTile == MAP)
     {
-      createMapScrSprites();
       isPosMoved = true;
       redrawMap = true;
     }
@@ -169,6 +168,8 @@ void getActTile(lv_event_t *event)
   else
   {
     isReady = true;
+    redrawMap = false;
+    isPosMoved = false;
   }
 
   lv_obj_t *actTile = lv_tileview_get_tile_act(tilesScreen);
@@ -185,8 +186,9 @@ void scrollTile(lv_event_t *event)
 {
   isScrolled = false;
   isReady = false;
+  redrawMap = false;
 
-  deleteMapScrSprites();
+  //deleteMapScrSprites();
   deleteSatInfoSprites();
 }
 
@@ -254,35 +256,27 @@ void getZoomValue(lv_event_t *event)
  */
 void updateMap(lv_event_t *event)
 {
-  // if (!waitScreenRefresh)
-  // {
-  //  if (tft.getStartCount() == 0)
-  //    tft.startWrite();
-
-    if (isVectorMap)
+  if (isVectorMap)
+  {
+    getPosition(getLat(), getLon());
+    if (isPosMoved)
     {
-      getPosition(getLat(), getLon());
-      if (isPosMoved)
-      {
-
-        tileSize = VECTOR_TILE_SIZE;
-        viewPort.setCenter(point);
-        getMapBlocks(viewPort.bbox, memCache);
-        generateVectorMap(viewPort, memCache, mapTempSprite);
-        isPosMoved = false;
-      }
+
+      tileSize = VECTOR_TILE_SIZE;
+      viewPort.setCenter(point);
+      getMapBlocks(viewPort.bbox, memCache);
+      generateVectorMap(viewPort, memCache, mapTempSprite);
+      isPosMoved = false;
     }
-    else
-    {
-      tileSize = RENDER_TILE_SIZE;
+  }
+  else
+  {
+    tileSize = RENDER_TILE_SIZE;
       generateRenderMap();
-    }
+  }
 
+  if (redrawMap)
     displayMap(tileSize);
-
-   // if (tft.getStartCount() > 0)
-   //   tft.endWrite();
-/*   } */
 }
 
 /**

lib/maps/src/renderMaps.cpp

@@ -7,6 +7,7 @@
  */
 
 #include "renderMaps.hpp"
+#include "mapsDrawFunc.h"
 
 MapTile oldMapTile = {"", 0, 0, 0};     // Old Map tile coordinates and zoom
 MapTile currentMapTile = {"", 0, 0, 0}; // Curreng Map tile coordinates and zoom
@@ -86,8 +87,11 @@ void generateRenderMap()
   if (strcmp(currentMapTile.file, oldMapTile.file) != 0 ||
       currentMapTile.zoom != oldMapTile.zoom ||
       currentMapTile.tilex != oldMapTile.tilex ||
-      currentMapTile.tiley != oldMapTile.tiley || redrawMap)
+      currentMapTile.tiley != oldMapTile.tiley)
   {
+    deleteMapScrSprites();
+    createMapScrSprites();
+
     mapTempSprite.fillScreen(TFT_BLACK);
     isMapFound  = mapTempSprite.drawPngFile(SD, currentMapTile.file, tileSize, tileSize);
 
@@ -124,7 +128,7 @@ void generateRenderMap()
       oldMapTile.zoom = currentMapTile.zoom;
       oldMapTile.tilex = currentMapTile.tilex;
       oldMapTile.tiley = currentMapTile.tiley;
-      redrawMap = false;
+      redrawMap = true;
     }
 
     log_v("TILE: %s", oldMapTile.file);

src/main.cpp

@@ -50,6 +50,8 @@ extern xSemaphoreHandle guiMutex;
  */
 void setup()
 {
+  guiMutex = xSemaphoreCreateMutex();
+
   #ifdef ARDUINO_USB_CDC_ON_BOOT
     Serial.begin(115200);  
   #endif
@@ -78,8 +80,6 @@ void setup()
 
   initADC();
 
-  guiMutex = xSemaphoreCreateMutex();
-
   // Reserve PSRAM for buffer map
   mapTempSprite.deleteSprite();
   mapTempSprite.createSprite(TILE_WIDTH, TILE_HEIGHT);