Tue 29 Oct 2019 07:58:51 EDT - fix for #34

retro-esp32 · Oct 29, 2019 · 682d758 · 682d758
1 parent fcf6301
commit 682d758
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/Components/odroid-go-pcengine-huexpress/pcengine-go/main/main.c b/Components/odroid-go-pcengine-huexpress/pcengine-go/main/main.c
@@ -26,6 +26,7 @@ extern char *syscard_filename;
 #include "../components/odroid/odroid_display.h"
 #include "../components/odroid/odroid_sdcard.h"
 #include "../components/odroid/odroid_ui.h"
+#include "../components/odroid/odroid_ui_choosefile.h"
 
 #include <dirent.h>
 #include <stdarg.h>
@@ -38,7 +39,7 @@ extern char *syscard_filename;
     #include "../components/odroid/odroid_hud.h"
     int ACTION;
 #endif
-
+    
 #define NOINLINE  __attribute__ ((noinline))
 
 const char* SD_BASE_PATH = "/sd";
@@ -332,7 +333,7 @@ void DoMenuHome(bool save)
 
     #ifdef CONFIG_IN_GAME_MENU_YES 
         //odroid_display_lock();
-        //EmuAudio(false);
+        EmuAudio(false);
         hud_menu();
         printf("\nACTION:%d\n", ACTION); 
         switch(ACTION) {
@@ -349,7 +350,7 @@ void DoMenuHome(bool save)
             break;   
         }               
         ili9341_clear(0);  
-        //EmuAudio(true);
+        EmuAudio(true);
         odroid_display_unlock();    
     #else
         // Clear audio to prevent studdering
@@ -489,7 +490,7 @@ NOINLINE void app_loop(void)
 {
    printf("up and running\n");
    //if (!(*osd_gfx_driver_list[video_driver].init) ())
-   odroid_ui_debug_enter_loop();
+   odroid_ui_enter_loop();
    RunPCE();
    abort();
 }

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/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
@@ -37,7 +37,7 @@ CONFIG_FLASH_ENCRYPTION_ENABLED=
 #
 # Serial flasher config
 #
-CONFIG_ESPTOOLPY_PORT="/dev/cu.usbserial-A1015RV2"
+CONFIG_ESPTOOLPY_PORT="/dev/cu.SLAB_USBtoUART"
 CONFIG_ESPTOOLPY_BAUD_115200B=
 CONFIG_ESPTOOLPY_BAUD_230400B=
 CONFIG_ESPTOOLPY_BAUD_921600B=y