more

bmorcelli · Jul 1, 2024 · 10382b8 · 10382b8
1 parent 7a08f1d
commit 10382b8
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 6 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,13 @@
 {
     "files.associations": {
-        "cmath": "cpp"
+        "cmath": "cpp",
+        "array": "cpp",
+        "deque": "cpp",
+        "string": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "string_view": "cpp",
+        "initializer_list": "cpp",
+        "regex": "cpp"
     }
 }
diff --git a/Launcher/Launcher_2.0_C.bin b/Launcher/Launcher_2.0_C.bin
diff --git a/Launcher/Launcher_2.0_Cardputer.bin b/Launcher/Launcher_2.0_Cardputer.bin
diff --git a/Launcher/Launcher_2.0_core2.bin b/Launcher/Launcher_2.0_core2.bin
diff --git a/Launcher/Launcher_2.0_core_16Mb.bin b/Launcher/Launcher_2.0_core_16Mb.bin
diff --git a/Launcher/Launcher_2.0_cplus1_1.bin b/Launcher/Launcher_2.0_cplus1_1.bin
diff --git a/Launcher/Launcher_2.0_cplus2.bin b/Launcher/Launcher_2.0_cplus2.bin
diff --git a/src/display.cpp b/src/display.cpp
@@ -349,13 +349,13 @@ void drawOptions(int index,const std::vector<std::pair<std::string, std::functio
     tft.setTextColor(fgcolor,bgcolor);
     tft.setTextSize(FONT_M);
     tft.setCursor(WIDTH*0.15+5,HEIGHT/2-menuSize*(FONT_M*8+4)/2);
-
+    
     int i=0;
     int init = 0;
     int cont = 1;
+    tft.fillRoundRect(WIDTH*0.15,HEIGHT/2-menuSize*(FONT_M*8+4)/2 -5,WIDTH*0.7,(FONT_M*8+4)*menuSize+10,5,bgcolor);
     menuSize = options.size();
     if(index>=MAX_MENU_SIZE) init=index-MAX_MENU_SIZE+1;
-    tft.fillRoundRect(WIDTH*0.15,HEIGHT/2-menuSize*(FONT_M*8+4)/2 -5,WIDTH*0.7,(FONT_M*8+4)*menuSize+10,5,bgcolor);
     for(i=0;i<menuSize;i++) {
       if(i>=init) {
         String text="";

diff --git a/src/main.cpp b/src/main.cpp
@@ -262,6 +262,8 @@ void get_partition_sizes() {
 *********************************************************************/
 void setup() {
   Serial.begin(115200);
+  tft.init();
+  tft.fillScreen(TFT_DARKGREEN);
 
   // declare variables
   size_t currentIndex=0;  
@@ -273,7 +275,6 @@ void setup() {
   esp_app_desc_t ota_desc;
   esp_err_t err = esp_ota_get_partition_description(esp_ota_get_next_update_partition(NULL), &ota_desc);  
 
-  tft.init();
   // Setup GPIOs and stuff
   #if defined(STICK_C_PLUS2)
     pinMode(UP_BTN, INPUT);

diff --git a/src/sd_functions.cpp b/src/sd_functions.cpp
@@ -299,7 +299,7 @@ void readFs(String folder, String result[][3]) {
       result[allFilesCount][1]="";
       result[allFilesCount][2]="";
       allFilesCount++;
-      if (allFilesCount<MAXFILES && result[allFilesCount][0]!="") break;
+      if (allFilesCount<MAXFILES && result[allFilesCount][2]!="") break;
     }
     allFilesCount=0;
 

diff --git a/src/webInterface.cpp b/src/webInterface.cpp
@@ -450,7 +450,7 @@ void startWebUi(String ssid, int encryptation, bool mode_ap) {
   setTftDisplay(7,26,TFT_WHITE,FONT_P,BGCOLOR);
 #endif
   tft.setTextSize(FONT_M);
-  tft.print("IP: ");   tftprintln(txt,10,1);
+  tft.print("IP ");   tftprintln(txt,10,1);
   tftprintln("Usr: " + String(default_httpuser),10,1);
   tftprintln("Pwd: " + String(default_httppassword),10,1);