Fri 20 Dec 2019 12:11:06 EST - preparing for v1.7

retro-esp32 · Dec 20, 2019 · 8d21ac1 · 8d21ac1
1 parent 21c5c08
commit 8d21ac1
Show file tree

Hide file tree

Showing 12 changed files with 269 additions and 119 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Emulators/handy-go/sdkconfig b/Emulators/handy-go/sdkconfig
@@ -83,10 +83,10 @@ CONFIG_MONITOR_BAUD=115200
 #
 # Retro ESP32 Configuration
 #
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
-CONFIG_DEFAULT_MENU_KEY=y
-CONFIG_COMBO_MENU_KEY=
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
+CONFIG_DEFAULT_MENU_KEY=
+CONFIG_COMBO_MENU_KEY=y
 CONFIG_IN_GAME_MENU_YES=y
 CONFIG_IN_GAME_MENU_NO=
 

diff --git a/Firmware/Releases/odroid-go.zip b/Firmware/Releases/odroid-go.zip
diff --git a/Firmware/Releases/odroid-go/Retro ESP32.fw b/Firmware/Releases/odroid-go/Retro ESP32.fw
diff --git a/Firmware/Releases/retro-esp.zip b/Firmware/Releases/retro-esp.zip
diff --git a/Launchers/retro-esp32-beta/main/main.c b/Launchers/retro-esp32-beta/main/main.c
@@ -904,14 +904,14 @@
     strcat(&path[strlen(path) - 1],folder_path);
     strcpy(ROM.path, path);
 
-    DIR *directory = opendir(path);  
-    
+    DIR *directory = opendir(path);
+
     if(directory == NULL) {
       draw_mask(0,132,320,10);
       char message[100] = "rom folder not found";
       int center = ceil((320/2)-((strlen(message)*5)/2));
       draw_text(center,134,message,false,false);
-    } else {              
+    } else {
       struct dirent *file;
       while ((file = readdir(directory)) != NULL) {
         int rom_length = strlen(file->d_name);
@@ -923,7 +923,7 @@
       }
       ROMS.pages = ROMS.total/ROMS.limit;
       if(ROMS.offset > ROMS.total) { ROMS.offset = 0;}
-      closedir(directory); 
+      closedir(directory);
     }
 
     draw_mask(0,132,320,10);
@@ -938,7 +938,7 @@
 
   void seek_files() {
     free(FILES);
-    FILES = (char**)malloc(ROMS.limit * sizeof(void*)); 
+    FILES = (char**)malloc(ROMS.limit * sizeof(void*));
 
     ///*
     printf("\n-----------");
@@ -949,20 +949,20 @@
     printf("\nROMS.pages:%d", ROMS.pages);
     printf("\n-----------");
     printf("\n");
-    //*/                          
+    //*/
 
     char path[256] = "/sd/roms/";
     strcat(&path[strlen(path) - 1], DIRECTORIES[STEP]);
     strcat(&path[strlen(path) - 1],folder_path);
-    strcpy(ROM.path, path); 
-    
-    DIR *directory = opendir(path); 
+    strcpy(ROM.path, path);
+
+    DIR *directory = opendir(path);
 
     if(directory == NULL) {
       char message[100] = "rom folder not found";
       int center = ceil((320/2)-((strlen(message)*5)/2));
       draw_text(center,134,message,false,false);
-    } else {              
+    } else {
       rewinddir(directory);
       seekdir(directory, ROMS.offset);
       struct dirent *file;
@@ -985,11 +985,11 @@
             strcpy(FILES[n], dir);
           } else {
             strcpy(FILES[n], file->d_name);
-          }          
+          }
           n++;
         }
       }
-      closedir(directory); 
+      closedir(directory);
     }
   }
 
@@ -1000,11 +1000,11 @@
     ROMS.page = ROMS.offset/ROMS.limit;
 
     seek_files();
-    
+
     for (int i = 0; i < 4; i++) draw_mask(0, y+(i*40)-6, 320, 40);
 
-    int limit = ROMS.total < ROMS.limit ? ROMS.total : ROMS.limit;                                                 
-    for(int n = 0; n < limit; n++) {                                   
+    int limit = ROMS.total < ROMS.limit ? ROMS.total : ROMS.limit;
+    for(int n = 0; n < limit; n++) {
       //printf("\n%d:%s", n, FILES[n]);
       draw_text(x+24,y,FILES[n],true,n == 0 ? true : false);
       bool directory = strcmp(&FILES[n][strlen(FILES[n]) - 3], "dir") == 0;

diff --git a/Launchers/retro-esp32-beta/sdkconfig b/Launchers/retro-esp32-beta/sdkconfig
@@ -82,10 +82,10 @@ CONFIG_MONITOR_BAUD=115200
 #
 # Retro ESP32 Configuration
 #
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
-CONFIG_DEFAULT_MENU_KEY=y
-CONFIG_COMBO_MENU_KEY=
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
+CONFIG_DEFAULT_MENU_KEY=
+CONFIG_COMBO_MENU_KEY=y
 
 #
 # Partition Table

diff --git a/Launchers/retro-esp32-beta/sdkconfig.old b/Launchers/retro-esp32-beta/sdkconfig.old
@@ -82,10 +82,10 @@ CONFIG_MONITOR_BAUD=115200
 #
 # Retro ESP32 Configuration
 #
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
-CONFIG_DEFAULT_MENU_KEY=y
-CONFIG_COMBO_MENU_KEY=
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
+CONFIG_DEFAULT_MENU_KEY=
+CONFIG_COMBO_MENU_KEY=y
 
 #
 # Partition Table

diff --git a/Launchers/retro-esp32/main/includes/declarations.h b/Launchers/retro-esp32/main/includes/declarations.h
@@ -7,7 +7,7 @@ void debounce(int key);
  Text
 */
 int get_letter(char letter);
-void draw_text(short x, short y, char *string, bool ext, bool current);
+void draw_text(short x, short y, char *string, bool ext, bool current, bool remove);
 
 /*
  Mask
@@ -73,12 +73,15 @@ void draw_battery();
 void draw_speaker();
 void draw_contrast();
 void draw_numbers();
+void delete_numbers();
 void draw_launcher();
 void draw_launcher_options();
 
 /*
   Files
 */
+void count_files();
+void seek_files();
 void get_files();
 void sort_files(char** files);
 void draw_files();