Merge pull request #733 from justcallmekoko/develop

Fix LVGL for CYD

Author: justcallmekoko

esp32_marauder/MenuFunctions.cpp

@@ -49,7 +49,7 @@ MenuFunctions::MenuFunctions()
 
     uint16_t touchX, touchY;
 
-    bool touched = display_obj.tft.getTouch(&touchX, &touchY, 600);
+    bool touched = display_obj.updateTouch(&touchX, &touchY, 600);
 
     if(!touched)
     {
@@ -672,11 +672,6 @@ void MenuFunctions::main(uint32_t currentTime)
       this->orientDisplay();
       wifi_scan_obj.orient_display = false;
     }
-    /*#ifdef HAS_ILI9341
-      if ((wifi_scan_obj.currentScanMode != LV_JOIN_WIFI) &&
-          (wifi_scan_obj.currentScanMode != LV_ADD_SSID))
-        display_obj.updateBanner(current_menu->name);
-    #endif*/
   }
 
   if (currentTime != 0) {

esp32_marauder/WiFiScan.cpp

@@ -1682,7 +1682,7 @@ void WiFiScan::RunAPScan(uint8_t scan_mode, uint16_t color)
         display_obj.tft.setTouch(calData);
       #endif
     #else
-      display_obj.touchscreen.setRotation(1);
+      //display_obj.touchscreen.setRotation(1);
     #endif
 
 
@@ -2377,7 +2377,7 @@ void WiFiScan::RunEapolScan(uint8_t scan_mode, uint16_t color)
         #endif
         display_obj.tft.setTouch(calData);
       #else
-        display_obj.touchscreen.setRotation(1);
+        //display_obj.touchscreen.setRotation(1);
       #endif
 
       display_obj.tft.setFreeFont(NULL);