Tue 21 Jan 2020 06:39:51 EST - new process script

32teeth · 32teeth · commit bc379d808ed0 · 2020-01-21T06:39:51.000-05:00
diff --git a/.gitmodules b/.gitmodules
@@ -5,7 +5,7 @@
 [submodule "Odroid/odroid-go-firmware"]
 	path = Odroid/odroid-go-firmware
 	url = git@github.com:OtherCrashOverride/odroid-go-firmware.git
-	branch = esp-idf-v3.2   
+	branch = esp-idf-v3.2
 [submodule "Launchers/emulator-launcher-odroid-go"]
 	path = Launchers/emulator-launcher-odroid-go
 	url = git@github.com:IlyaMZP/emulator-launcher-odroid-go.git
@@ -34,3 +34,7 @@
 	path = Emulators/odroid-go-spectrum-emulator
 	url = git@github.com:pelle7/odroid-go-spectrum-emulator.git
 	branch = feature/goemu
+[submodule "Emulators/odroid-go-handy"]
+	path = Emulators/odroid-go-handy
+	url = git@github.com:pelle7/odroid-go-handy.git
+	branch = develop
diff --git a/Components/frodo-go/components/odroid/Kconfig.projbuild b/Components/frodo-go/components/odroid/Kconfig.projbuild
@@ -26,4 +26,18 @@ menu "Retro ESP32 Configuration"
         bool "START + SELECT as MENU button"
 
     endchoice
-endmenu    
+
+    choice IN_GAME_MENU
+        prompt "In Game Menu"
+        default IN_GAME_MENU_YES
+        help
+            Use Retro ESP32 - In Game Menu
+
+    config IN_GAME_MENU_YES
+        bool "YES"
+
+    config IN_GAME_MENU_NO
+        bool "NO"
+
+    endchoice
+endmenu
diff --git a/Components/super-go-play/nesemu-go/components/nofrendo-esp32/video_audio.c b/Components/super-go-play/nesemu-go/components/nofrendo-esp32/video_audio.c
@@ -298,8 +298,8 @@ static void vidTaskCallback(void *arg) {
            ili9341_blank_screen();
            previous_scaling_enabled = scaling_enabled;
            if (scaling_enabled) {
-               odroid_display_set_scale(NES_SCREEN_WIDTH, NES_VISIBLE_HEIGHT,
-                                        (80.f/72.f));
+               //odroid_display_set_scale(NES_SCREEN_WIDTH, NES_VISIBLE_HEIGHT,(80.f/72.f));
+               odroid_display_set_scale(NES_SCREEN_WIDTH, NES_VISIBLE_HEIGHT,(8.f/7.f));
            } else {
                odroid_display_reset_scale(NES_SCREEN_WIDTH, NES_VISIBLE_HEIGHT);
            }
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=n
 CONFIG_IN_GAME_MENU_YES=y
 CONFIG_IN_GAME_MENU_NO=
 
diff --git a/Emulators/odroid-go-handy b/Emulators/odroid-go-handy
@@ -0,0 +1 @@
+Subproject commit 8bbefe91d1eb20f2ea5818a03902ce34010d22ef
diff --git a/Launchers/.DS_Store b/Launchers/.DS_Store
diff --git a/Launchers/retro-esp32/main/main.c b/Launchers/retro-esp32/main/main.c
@@ -3,6 +3,8 @@
   #include "includes/definitions.h"
   #include "includes/structures.h"
   #include "includes/declarations.h"
+
+  #include "scandir.c"
 //}#pragma endregion Includes
 
 //{#pragma region Odroid
diff --git a/Launchers/retro-esp32/partitions.csv b/Launchers/retro-esp32/partitions.csv
@@ -57,15 +57,17 @@ data_0,     0x40,   0x00,       0x9E0000,   0x400000
 #   nvs,        data,   nvs,        0x9000,     0x4000
 #   otadata,    data,   ota,        0xd000,     0x2000
 #   phy_init,   data,   phy,        0xf000,     0x1000
-#   factory,    app,    factory,    0x10000,    0x100000
-#   storage,    data,   spiffs,     0x110000,   0x100000
-#   launcher,   0,      ota_0,      0x210000,   0x100000
-#   nes,        0,      ota_1,      0x310000,   0xc0000
-#   gb,         0,      ota_2,      0x3D0000,   0xb0000
-#   sms,        0,      ota_3,      0x480000,   0x160000
-#   a26,        0,      ota_4,      0x5E0000,   0x1a0000
-#   a78,        0,      ota_5,      0x780000,   0xc0000
-#   lnx,        0,      ota_6,      0x840000,   0xe0000
-#   pce,        0,      ota_7,      0x920000,   0xb0000
-#   data_0,     0x40,   0x00,       0x9D0000,   0x5D0000
+#   factory,    app,    factory,    0x10000,    0x80000
+#   storage,    data,   spiffs,     0x100000,   0x100000
+#   launcher,   0,      ota_0,      0x200000,   0x80000
+#   nes,        0,      ota_1,      0x280000,   0xc0000
+#   gb,         0,      ota_2,      0x340000,   0xb0000
+#   sms,        0,      ota_3,      0x3F0000,   0x160000
+#   spectrum,   0,      ota_4,      0x550000,   0x90000
+#   a26,        0,      ota_5,      0x5E0000,   0x1a0000
+#   a78,        0,      ota_6,      0x780000,   0xc0000
+#   lnx,        0,      ota_7,      0x840000,   0xe0000
+#   pce,        0,      ota_8,      0x920000,   0xc0000
+#   frodo,      0,      ota_9,      0x9E0000,   0x170000
+#   data_0,     0x40,   0x00,       0xB50000,   0x290000
 #   #########################################################
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=n
 
 #
 # 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=n
 
 #
 # Partition Table
diff --git a/SD Card/c64/1541.rom b/SD Card/c64/1541.rom
diff --git a/SD Card/c64/Basic.rom b/SD Card/c64/Basic.rom
diff --git a/SD Card/c64/Char.rom b/SD Card/c64/Char.rom
diff --git a/SD Card/c64/Kernal.rom b/SD Card/c64/Kernal.rom
diff --git a/Scripts/helpers/process b/Scripts/helpers/process
@@ -16,6 +16,30 @@ BIN=""
 TILE=""
 NAME=""
 
+# set_nes_option
+set_nes_option() {
+  clear
+  SUPER="n"
+  OPTION="${bomb}  Would you like to use ${magenta}'Super Go Play'? ${nc}[y/${bold}N${nc}]"
+  echo "--------------------------------------------------------------------------"
+  echo -e "${OPTION}"
+  echo "--------------------------------------------------------------------------"
+  read -n 1 -r response
+  if [[ "$response" = "y" ]]
+  then
+    SUPER="y"
+  fi
+  clear
+}
+
+# get_nes_option
+get_nes_option() {
+  if [[ "$SUPER" = "y" ]]
+  then
+    cd $SUPER_GOPLAY_PATH
+  fi
+}
+
 # set_config_option
 set_config_option() {
   clear
@@ -162,6 +186,7 @@ if [[ "$response" = "y" ]]
 then
   set_clean_option
   set_config_option
+  set_nes_option
 
   cd $SUPER_GOPLAY_PATH
 
@@ -177,6 +202,7 @@ then
 
   cd $GOPLAY_PATH
   #cd $SUPER_GOPLAY_PATH
+  get_nes_option
   clear
   echo "--------------------------------------------------------------------------"
   echo -e "${game}  ${green}Compiling ${cyan}nesemu-go${nc}"

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=n`
`90`	`90`	`CONFIG_IN_GAME_MENU_YES=y`
`91`	`91`	`CONFIG_IN_GAME_MENU_NO=`
`92`	`92`
Original file line number	Diff line number	Diff line change
`@@ -82,10 +82,10 @@ CONFIG_MONITOR_BAUD=115200`
`82`	`82`	`#`
`83`	`83`	`# Retro ESP32 Configuration`
`84`	`84`	`#`
`85`		`-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=`
`86`		`-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y`
`87`		`-CONFIG_DEFAULT_MENU_KEY=`
`88`		`-CONFIG_COMBO_MENU_KEY=y`
	`85`	`+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y`
	`86`	`+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=`
	`87`	`+CONFIG_DEFAULT_MENU_KEY=y`
	`88`	`+CONFIG_COMBO_MENU_KEY=n`
`89`	`89`
`90`	`90`	`#`
`91`	`91`	`# Partition Table`