Thu 21 Nov 2019 16:23:54 EST - PC Engine - Bug Fix

EugeneAndruszczenko · EugeneAndruszczenko · commit f3030523289f · 2019-11-21T16:23:55.000-05:00
diff --git a/Components/go-play/odroid-go-common/components/odroid/Kconfig.projbuild b/Components/go-play/odroid-go-common/components/odroid/Kconfig.projbuild
@@ -29,7 +29,7 @@ menu "Retro ESP32 Configuration"
 
     choice IN_GAME_MENU
         prompt "In Game Menu"
-        default IN_GAME_MENU_NO
+        default IN_GAME_MENU_YES
         help
             Use Retro ESP32 - In Game Menu
 
@@ -40,4 +40,4 @@ menu "Retro ESP32 Configuration"
         bool "NO"
 
     endchoice
-endmenu
+endmenu
diff --git a/Components/handy-go/components/odroid/Kconfig.projbuild b/Components/handy-go/components/odroid/Kconfig.projbuild
@@ -29,7 +29,7 @@ menu "Retro ESP32 Configuration"
 
     choice IN_GAME_MENU
         prompt "In Game Menu"
-        default IN_GAME_MENU_NO
+        default IN_GAME_MENU_YES
         help
             Use Retro ESP32 - In Game Menu
 
@@ -40,4 +40,4 @@ menu "Retro ESP32 Configuration"
         bool "NO"
 
     endchoice
-endmenu
+endmenu
diff --git a/Components/odroid-go-pcengine-huexpress/odroid-go-common/components/odroid/Kconfig.projbuild b/Components/odroid-go-pcengine-huexpress/odroid-go-common/components/odroid/Kconfig.projbuild
@@ -29,7 +29,7 @@ menu "Retro ESP32 Configuration"
 
     choice IN_GAME_MENU
         prompt "In Game Menu"
-        default IN_GAME_MENU_NO
+        default IN_GAME_MENU_YES
         help
             Use Retro ESP32 - In Game Menu
 
@@ -40,4 +40,4 @@ menu "Retro ESP32 Configuration"
         bool "NO"
 
     endchoice
-endmenu
+endmenu
diff --git a/Components/odroid-go-spectrum-emulator/components/odroid/Kconfig.projbuild b/Components/odroid-go-spectrum-emulator/components/odroid/Kconfig.projbuild
@@ -29,7 +29,7 @@ menu "Retro ESP32 Configuration"
 
     choice IN_GAME_MENU
         prompt "In Game Menu"
-        default IN_GAME_MENU_NO
+        default IN_GAME_MENU_YES
         help
             Use Retro ESP32 - In Game Menu
 
@@ -40,4 +40,4 @@ menu "Retro ESP32 Configuration"
         bool "NO"
 
     endchoice
-endmenu
+endmenu
diff --git a/Components/pitpo/odroid-go-common/components/odroid/Kconfig.projbuild b/Components/pitpo/odroid-go-common/components/odroid/Kconfig.projbuild
@@ -29,7 +29,7 @@ menu "Retro ESP32 Configuration"
 
     choice IN_GAME_MENU
         prompt "In Game Menu"
-        default IN_GAME_MENU_NO
+        default IN_GAME_MENU_YES
         help
             Use Retro ESP32 - In Game Menu
 
@@ -40,4 +40,4 @@ menu "Retro ESP32 Configuration"
         bool "NO"
 
     endchoice
-endmenu
+endmenu
diff --git a/Components/prosystem-odroid-go/components/odroid/Kconfig.projbuild b/Components/prosystem-odroid-go/components/odroid/Kconfig.projbuild
@@ -29,7 +29,7 @@ menu "Retro ESP32 Configuration"
 
     choice IN_GAME_MENU
         prompt "In Game Menu"
-        default IN_GAME_MENU_NO
+        default IN_GAME_MENU_YES
         help
             Use Retro ESP32 - In Game Menu
 
@@ -39,5 +39,5 @@ menu "Retro ESP32 Configuration"
     config IN_GAME_MENU_NO
         bool "NO"
 
-    endchoice    
-endmenu    
+    endchoice
+endmenu
diff --git a/Components/stella-odroid-go/components/odroid/Kconfig.projbuild b/Components/stella-odroid-go/components/odroid/Kconfig.projbuild
@@ -29,7 +29,7 @@ menu "Retro ESP32 Configuration"
 
     choice IN_GAME_MENU
         prompt "In Game Menu"
-        default IN_GAME_MENU_NO
+        default IN_GAME_MENU_YES
         help
             Use Retro ESP32 - In Game Menu
 
@@ -40,4 +40,4 @@ menu "Retro ESP32 Configuration"
         bool "NO"
 
     endchoice
-endmenu
+endmenu
diff --git a/Components/super-go-play/odroid-go-common/components/odroid/Kconfig.projbuild b/Components/super-go-play/odroid-go-common/components/odroid/Kconfig.projbuild
@@ -29,7 +29,7 @@ menu "Retro ESP32 Configuration"
 
     choice IN_GAME_MENU
         prompt "In Game Menu"
-        default IN_GAME_MENU_NO
+        default IN_GAME_MENU_YES
         help
             Use Retro ESP32 - In Game Menu
 
@@ -40,4 +40,4 @@ menu "Retro ESP32 Configuration"
         bool "NO"
 
     endchoice
-endmenu
+endmenu
diff --git a/Emulators/handy-go/components/odroid/Kconfig.projbuild b/Emulators/handy-go/components/odroid/Kconfig.projbuild
@@ -29,7 +29,7 @@ menu "Retro ESP32 Configuration"
 
     choice IN_GAME_MENU
         prompt "In Game Menu"
-        default IN_GAME_MENU_NO
+        default IN_GAME_MENU_YES
         help
             Use Retro ESP32 - In Game Menu
 
@@ -40,4 +40,4 @@ menu "Retro ESP32 Configuration"
         bool "NO"
 
     endchoice
-endmenu
+endmenu
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=
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
-CONFIG_DEFAULT_MENU_KEY=
-CONFIG_COMBO_MENU_KEY=y
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
+CONFIG_DEFAULT_MENU_KEY=y
+CONFIG_COMBO_MENU_KEY=
 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/Firmware/Releases/retro-esp/Retro ESP32.fw b/Firmware/Releases/retro-esp/Retro ESP32.fw
diff --git a/Launchers/retro-esp32/main/main.c b/Launchers/retro-esp32/main/main.c
@@ -1503,22 +1503,28 @@
           draw_background();
           draw_systems();
           draw_text(16,16,EMULATORS[STEP],false,true);
-          STEP == 0 ? draw_settings() : draw_files();
-        }
-        if(FOLDER) {
-          FOLDER = false;
-          ROMS.offset = PREVIOUS;
-          ROMS.total = 0;
-          PREVIOUS = 0;
-          folder_path[0] = 0;
-          get_files();
-        }
-        if(SETTINGS) {
-          SETTINGS = false;
-          draw_background();
-          draw_systems();
-          draw_text(16,16,EMULATORS[STEP],false,true);
-          draw_settings();
+          if(FOLDER) {
+            printf("\n------\nfolder_path:%s\n-----\n", folder_path);
+            get_files();
+          } else {
+            STEP == 0 ? draw_settings() : draw_files();
+          }
+        } else {
+          if(FOLDER) {
+            FOLDER = false;
+            ROMS.offset = PREVIOUS;
+            ROMS.total = 0;
+            PREVIOUS = 0;
+            folder_path[0] = 0;
+            get_files();
+          }
+          if(SETTINGS) {
+            SETTINGS = false;
+            draw_background();
+            draw_systems();
+            draw_text(16,16,EMULATORS[STEP],false,true);
+            draw_settings();
+          }
         }
         debounce(ODROID_INPUT_B);
       }
diff --git a/Launchers/retro-esp32/sdkconfig b/Launchers/retro-esp32/sdkconfig
@@ -82,10 +82,10 @@ CONFIG_MONITOR_BAUD=115200
 #
 # Retro ESP32 Configuration
 #
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
-CONFIG_DEFAULT_MENU_KEY=
-CONFIG_COMBO_MENU_KEY=y
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
+CONFIG_DEFAULT_MENU_KEY=y
+CONFIG_COMBO_MENU_KEY=
 
 #
 # Partition Table
diff --git a/Launchers/retro-esp32/sdkconfig.old b/Launchers/retro-esp32/sdkconfig.old
@@ -82,10 +82,10 @@ CONFIG_MONITOR_BAUD=115200
 #
 # Retro ESP32 Configuration
 #
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
-CONFIG_DEFAULT_MENU_KEY=
-CONFIG_COMBO_MENU_KEY=y
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
+CONFIG_DEFAULT_MENU_KEY=y
+CONFIG_COMBO_MENU_KEY=
 
 #
 # Partition Table

Original file line number	Diff line number	Diff line change
`@@ -83,10 +83,10 @@ CONFIG_MONITOR_BAUD=115200`
`83`	`83`	`#`
`84`	`84`	`# Retro ESP32 Configuration`
`85`	`85`	`#`
`86`		`-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=`
`87`		`-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y`
`88`		`-CONFIG_DEFAULT_MENU_KEY=`
`89`		`-CONFIG_COMBO_MENU_KEY=y`
	`86`	`+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y`
	`87`	`+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=`
	`88`	`+CONFIG_DEFAULT_MENU_KEY=y`
	`89`	`+CONFIG_COMBO_MENU_KEY=`
`90`	`90`	`CONFIG_IN_GAME_MENU_YES=y`
`91`	`91`	`CONFIG_IN_GAME_MENU_NO=`
`92`	`92`