Mon 22 Jul 2019 09:48:12 EDT added Hot Key option to kconfig files

32teeth · 32teeth · commit e42e3dc3d437 · 2019-07-22T09:48:13.000-04:00
diff --git a/Components/emulator-launcher-odroid-go/components/hardware/Kconfig.projbuild b/Components/emulator-launcher-odroid-go/components/hardware/Kconfig.projbuild
@@ -14,4 +14,22 @@ menu "LCD Screen Driver"
 
     endchoice
 
+endmenu
+
+menu "Menu Hot Keys"
+
+    choice MENU_HOT_KEYS
+        prompt "Menu Hot Keys Option"
+        default DEFAULT_MENU_KEY
+        help
+            Select Hot Key (Menu Button)
+
+    config DEFAULT_MENU_KEY
+        bool "Default Odroid Go MENU Button"
+
+    config COMBO_MENU_KEY
+        bool "Use START + SELECT buttons for MENU"
+
+    endchoice
+
 endmenu
diff --git a/Components/frodo-go/components/odroid/Kconfig.projbuild b/Components/frodo-go/components/odroid/Kconfig.projbuild
@@ -14,4 +14,22 @@ menu "LCD Screen Driver"
 
     endchoice
 
+endmenu
+
+menu "Menu Hot Keys"
+
+    choice MENU_HOT_KEYS
+        prompt "Menu Hot Keys Option"
+        default DEFAULT_MENU_KEY
+        help
+            Select Hot Key (Menu Button)
+
+    config DEFAULT_MENU_KEY
+        bool "Default Odroid Go MENU Button"
+
+    config COMBO_MENU_KEY
+        bool "Use START + SELECT buttons for MENU"
+
+    endchoice
+
 endmenu
diff --git a/Components/frodo-go/components/odroid/odroid_input.c b/Components/frodo-go/components/odroid/odroid_input.c
@@ -78,8 +78,12 @@ odroid_gamepad_state odroid_input_read_raw()
     state.values[ODROID_INPUT_A] = !(gpio_get_level(ODROID_GAMEPAD_IO_A));
     state.values[ODROID_INPUT_B] = !(gpio_get_level(ODROID_GAMEPAD_IO_B));
 
-    //state.values[ODROID_INPUT_MENU] = !(gpio_get_level(ODROID_GAMEPAD_IO_MENU));
+#ifdef CONFIG_DEFAULT_MENU_KEY
+    state.values[ODROID_INPUT_MENU] = !(gpio_get_level(ODROID_GAMEPAD_IO_MENU));
+#endif    
+#ifdef CONFIG_COMBO_MENU_KEY
     state.values[ODROID_INPUT_MENU] = state.values[ODROID_INPUT_SELECT] && state.values[ODROID_INPUT_START];
+#endif    
     state.values[ODROID_INPUT_VOLUME] = !(gpio_get_level(ODROID_GAMEPAD_IO_VOLUME));
 
     return state;
diff --git a/Components/go-play/odroid-go-common/components/odroid/Kconfig.projbuild b/Components/go-play/odroid-go-common/components/odroid/Kconfig.projbuild
@@ -14,4 +14,22 @@ menu "LCD Screen Driver"
 
     endchoice
 
+endmenu
+
+menu "Menu Hot Keys"
+
+    choice MENU_HOT_KEYS
+        prompt "Menu Hot Keys Option"
+        default DEFAULT_MENU_KEY
+        help
+            Select Hot Key (Menu Button)
+
+    config DEFAULT_MENU_KEY
+        bool "Default Odroid Go MENU Button"
+
+    config COMBO_MENU_KEY
+        bool "Use START + SELECT buttons for MENU"
+
+    endchoice
+
 endmenu
diff --git a/Components/go-play/odroid-go-common/components/odroid/odroid_input.c b/Components/go-play/odroid-go-common/components/odroid/odroid_input.c
@@ -78,8 +78,12 @@ odroid_gamepad_state odroid_input_read_raw()
     state.values[ODROID_INPUT_A] = !(gpio_get_level(ODROID_GAMEPAD_IO_A));
     state.values[ODROID_INPUT_B] = !(gpio_get_level(ODROID_GAMEPAD_IO_B));
 
-    //state.values[ODROID_INPUT_MENU] = !(gpio_get_level(ODROID_GAMEPAD_IO_MENU));
+#ifdef CONFIG_DEFAULT_MENU_KEY
+    state.values[ODROID_INPUT_MENU] = !(gpio_get_level(ODROID_GAMEPAD_IO_MENU));
+#endif    
+#ifdef CONFIG_COMBO_MENU_KEY
     state.values[ODROID_INPUT_MENU] = state.values[ODROID_INPUT_SELECT] && state.values[ODROID_INPUT_START];
+#endif    
     state.values[ODROID_INPUT_VOLUME] = !(gpio_get_level(ODROID_GAMEPAD_IO_VOLUME));
 
     return state;
diff --git a/Components/gogo/components/odroid/Kconfig.projbuild b/Components/gogo/components/odroid/Kconfig.projbuild
@@ -14,4 +14,22 @@ menu "LCD Screen Driver"
 
     endchoice
 
+endmenu
+
+menu "Menu Hot Keys"
+
+    choice MENU_HOT_KEYS
+        prompt "Menu Hot Keys Option"
+        default DEFAULT_MENU_KEY
+        help
+            Select Hot Key (Menu Button)
+
+    config DEFAULT_MENU_KEY
+        bool "Default Odroid Go MENU Button"
+
+    config COMBO_MENU_KEY
+        bool "Use START + SELECT buttons for MENU"
+
+    endchoice
+
 endmenu
diff --git a/Components/gogo/components/odroid/odroid_input.c b/Components/gogo/components/odroid/odroid_input.c
@@ -78,8 +78,12 @@ odroid_gamepad_state odroid_input_read_raw()
     state.values[ODROID_INPUT_A] = !(gpio_get_level(ODROID_GAMEPAD_IO_A));
     state.values[ODROID_INPUT_B] = !(gpio_get_level(ODROID_GAMEPAD_IO_B));
 
-    //state.values[ODROID_INPUT_MENU] = !(gpio_get_level(ODROID_GAMEPAD_IO_MENU));
+#ifdef CONFIG_DEFAULT_MENU_KEY
+    state.values[ODROID_INPUT_MENU] = !(gpio_get_level(ODROID_GAMEPAD_IO_MENU));
+#endif    
+#ifdef CONFIG_COMBO_MENU_KEY
     state.values[ODROID_INPUT_MENU] = state.values[ODROID_INPUT_SELECT] && state.values[ODROID_INPUT_START];
+#endif    
     state.values[ODROID_INPUT_VOLUME] = !(gpio_get_level(ODROID_GAMEPAD_IO_VOLUME));
 
     return state;
diff --git a/Components/odroid-go-firmware/main/Kconfig.projbuild b/Components/odroid-go-firmware/main/Kconfig.projbuild
@@ -14,4 +14,22 @@ menu "LCD Screen Driver"
 
     endchoice
 
+endmenu
+
+menu "Menu Hot Keys"
+
+    choice MENU_HOT_KEYS
+        prompt "Menu Hot Keys Option"
+        default DEFAULT_MENU_KEY
+        help
+            Select Hot Key (Menu Button)
+
+    config DEFAULT_MENU_KEY
+        bool "Default Odroid Go MENU Button"
+
+    config COMBO_MENU_KEY
+        bool "Use START + SELECT buttons for MENU"
+
+    endchoice
+
 endmenu
diff --git a/Components/prosystem-odroid-go/components/odroid/Kconfig.projbuild b/Components/prosystem-odroid-go/components/odroid/Kconfig.projbuild
@@ -14,4 +14,22 @@ menu "LCD Screen Driver"
 
     endchoice
 
+endmenu
+
+menu "Menu Hot Keys"
+
+    choice MENU_HOT_KEYS
+        prompt "Menu Hot Keys Option"
+        default DEFAULT_MENU_KEY
+        help
+            Select Hot Key (Menu Button)
+
+    config DEFAULT_MENU_KEY
+        bool "Default Odroid Go MENU Button"
+
+    config COMBO_MENU_KEY
+        bool "Use START + SELECT buttons for MENU"
+
+    endchoice
+
 endmenu
diff --git a/Components/prosystem-odroid-go/components/odroid/odroid_input.c b/Components/prosystem-odroid-go/components/odroid/odroid_input.c
@@ -78,8 +78,12 @@ odroid_gamepad_state odroid_input_read_raw()
     state.values[ODROID_INPUT_A] = !(gpio_get_level(ODROID_GAMEPAD_IO_A));
     state.values[ODROID_INPUT_B] = !(gpio_get_level(ODROID_GAMEPAD_IO_B));
 
-    //state.values[ODROID_INPUT_MENU] = !(gpio_get_level(ODROID_GAMEPAD_IO_MENU));
+#ifdef CONFIG_DEFAULT_MENU_KEY
+    state.values[ODROID_INPUT_MENU] = !(gpio_get_level(ODROID_GAMEPAD_IO_MENU));
+#endif    
+#ifdef CONFIG_COMBO_MENU_KEY
     state.values[ODROID_INPUT_MENU] = state.values[ODROID_INPUT_SELECT] && state.values[ODROID_INPUT_START];
+#endif    
     state.values[ODROID_INPUT_VOLUME] = !(gpio_get_level(ODROID_GAMEPAD_IO_VOLUME));
 
     return state;
diff --git a/Components/stella-odroid-go/components/odroid/Kconfig.projbuild b/Components/stella-odroid-go/components/odroid/Kconfig.projbuild
@@ -14,4 +14,22 @@ menu "LCD Screen Driver"
 
     endchoice
 
+endmenu
+
+menu "Menu Hot Keys"
+
+    choice MENU_HOT_KEYS
+        prompt "Menu Hot Keys Option"
+        default DEFAULT_MENU_KEY
+        help
+            Select Hot Key (Menu Button)
+
+    config DEFAULT_MENU_KEY
+        bool "Default Odroid Go MENU Button"
+
+    config COMBO_MENU_KEY
+        bool "Use START + SELECT buttons for MENU"
+
+    endchoice
+
 endmenu
diff --git a/Components/stella-odroid-go/components/odroid/odroid_input.c b/Components/stella-odroid-go/components/odroid/odroid_input.c
@@ -78,8 +78,12 @@ odroid_gamepad_state odroid_input_read_raw()
     state.values[ODROID_INPUT_A] = !(gpio_get_level(ODROID_GAMEPAD_IO_A));
     state.values[ODROID_INPUT_B] = !(gpio_get_level(ODROID_GAMEPAD_IO_B));
 
-    //state.values[ODROID_INPUT_MENU] = !(gpio_get_level(ODROID_GAMEPAD_IO_MENU));
+#ifdef CONFIG_DEFAULT_MENU_KEY
+    state.values[ODROID_INPUT_MENU] = !(gpio_get_level(ODROID_GAMEPAD_IO_MENU));
+#endif    
+#ifdef CONFIG_COMBO_MENU_KEY
     state.values[ODROID_INPUT_MENU] = state.values[ODROID_INPUT_SELECT] && state.values[ODROID_INPUT_START];
+#endif    
     state.values[ODROID_INPUT_VOLUME] = !(gpio_get_level(ODROID_GAMEPAD_IO_VOLUME));
 
     return state;
diff --git a/Firmware/Bins/bootloader.bin b/Firmware/Bins/bootloader.bin
diff --git a/Firmware/Bins/frodo-go.bin b/Firmware/Bins/frodo-go.bin
diff --git a/Firmware/Bins/gnuboy-go.bin b/Firmware/Bins/gnuboy-go.bin
diff --git a/Firmware/Bins/nesemu-go.bin b/Firmware/Bins/nesemu-go.bin
diff --git a/Firmware/Bins/prosystem-go.bin b/Firmware/Bins/prosystem-go.bin
diff --git a/Firmware/Bins/retro-esp32.bin b/Firmware/Bins/retro-esp32.bin
diff --git a/Firmware/Bins/smsplusgx-go.bin b/Firmware/Bins/smsplusgx-go.bin
diff --git a/Firmware/Bins/stella-go.bin b/Firmware/Bins/stella-go.bin
diff --git a/Firmware/Releases/odroid-go.zip b/Firmware/Releases/odroid-go.zip
diff --git a/Firmware/Releases/retro-esp.zip b/Firmware/Releases/retro-esp.zip
diff --git a/Launchers/gogo/components/odroid/Kconfig.projbuild b/Launchers/gogo/components/odroid/Kconfig.projbuild
@@ -14,4 +14,22 @@ menu "LCD Screen Driver"
 
     endchoice
 
+endmenu
+
+menu "Menu Hot Keys"
+
+    choice MENU_HOT_KEYS
+        prompt "Menu Hot Keys Option"
+        default DEFAULT_MENU_KEY
+        help
+            Select Hot Key (Menu Button)
+
+    config DEFAULT_MENU_KEY
+        bool "Default Odroid Go MENU Button"
+
+    config COMBO_MENU_KEY
+        bool "Use START + SELECT buttons for MENU"
+
+    endchoice
+
 endmenu
diff --git a/Launchers/gogo/components/odroid/odroid_input.c b/Launchers/gogo/components/odroid/odroid_input.c
@@ -78,8 +78,12 @@ odroid_gamepad_state odroid_input_read_raw()
     state.values[ODROID_INPUT_A] = !(gpio_get_level(ODROID_GAMEPAD_IO_A));
     state.values[ODROID_INPUT_B] = !(gpio_get_level(ODROID_GAMEPAD_IO_B));
 
-    //state.values[ODROID_INPUT_MENU] = !(gpio_get_level(ODROID_GAMEPAD_IO_MENU));
+#ifdef CONFIG_DEFAULT_MENU_KEY
+    state.values[ODROID_INPUT_MENU] = !(gpio_get_level(ODROID_GAMEPAD_IO_MENU));
+#endif    
+#ifdef CONFIG_COMBO_MENU_KEY
     state.values[ODROID_INPUT_MENU] = state.values[ODROID_INPUT_SELECT] && state.values[ODROID_INPUT_START];
+#endif    
     state.values[ODROID_INPUT_VOLUME] = !(gpio_get_level(ODROID_GAMEPAD_IO_VOLUME));
 
     return state;
diff --git a/Launchers/gogo/sdkconfig b/Launchers/gogo/sdkconfig
@@ -83,8 +83,8 @@ CONFIG_MONITOR_BAUD=115200
 #
 # LCD Screen Driver
 #
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
 
 #
 # Partition Table
diff --git a/Launchers/retro-esp32/components/odroid/Kconfig.projbuild b/Launchers/retro-esp32/components/odroid/Kconfig.projbuild
@@ -14,4 +14,22 @@ menu "LCD Screen Driver"
 
     endchoice
 
+endmenu
+
+menu "Menu Hot Keys"
+
+    choice MENU_HOT_KEYS
+        prompt "Menu Hot Keys Option"
+        default DEFAULT_MENU_KEY
+        help
+            Select Hot Key (Menu Button)
+
+    config DEFAULT_MENU_KEY
+        bool "Default Odroid Go MENU Button"
+
+    config COMBO_MENU_KEY
+        bool "Use START + SELECT buttons for MENU"
+
+    endchoice
+
 endmenu
diff --git a/Launchers/retro-esp32/components/odroid/odroid_input.c b/Launchers/retro-esp32/components/odroid/odroid_input.c
@@ -78,8 +78,12 @@ odroid_gamepad_state odroid_input_read_raw()
     state.values[ODROID_INPUT_A] = !(gpio_get_level(ODROID_GAMEPAD_IO_A));
     state.values[ODROID_INPUT_B] = !(gpio_get_level(ODROID_GAMEPAD_IO_B));
 
-    //state.values[ODROID_INPUT_MENU] = !(gpio_get_level(ODROID_GAMEPAD_IO_MENU));
+#ifdef CONFIG_DEFAULT_MENU_KEY
+    state.values[ODROID_INPUT_MENU] = !(gpio_get_level(ODROID_GAMEPAD_IO_MENU));
+#endif    
+#ifdef CONFIG_COMBO_MENU_KEY
     state.values[ODROID_INPUT_MENU] = state.values[ODROID_INPUT_SELECT] && state.values[ODROID_INPUT_START];
+#endif    
     state.values[ODROID_INPUT_VOLUME] = !(gpio_get_level(ODROID_GAMEPAD_IO_VOLUME));
 
     return state;
diff --git a/Launchers/retro-esp32/main/main.c b/Launchers/retro-esp32/main/main.c
@@ -755,6 +755,7 @@
 
   void restart() {
     draw_background();
+    
     char message[100] = "restarting";
     int h = 5;
     int w = strlen(message)*h;  
@@ -937,7 +938,7 @@
             draw_options();
           }
         }
-        usleep(100000);
+        usleep(200000);
         //debounce(ODROID_INPUT_UP);
       }
       /*
@@ -963,7 +964,7 @@
           } 
         }
 
-        usleep(100000);
+        usleep(200000);
         //debounce(ODROID_INPUT_DOWN);       
       }
 
diff --git a/Launchers/retro-esp32/sdkconfig b/Launchers/retro-esp32/sdkconfig
@@ -82,8 +82,14 @@ CONFIG_MONITOR_BAUD=115200
 #
 # LCD Screen Driver
 #
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
+
+#
+# Menu Hot Keys
+#
+CONFIG_DEFAULT_MENU_KEY=
+CONFIG_COMBO_MENU_KEY=y
 
 #
 # Partition Table
diff --git a/README.md b/README.md
@@ -146,4 +146,6 @@ make menuconfig inside Launchers/retro-esp32
 
 |   Splash   |   Navigation   |   ROM State Management   |   Run   |
 | ---- | ---- | ---- | ---- |
-|  ![](Assets/launcher/splash.jpg)    | ![](Assets/launcher/games.jpg)    | ![](Assets/launcher/manager.jpg)    | ![](Assets/launcher/run.jpg)    |
+|  ![](Assets/launcher/splash.jpg)    | ![](Assets/launcher/games.jpg)    | ![](Assets/launcher/manager.jpg)    | ![](Assets/launcher/run.jpg)    |
+
+- [ ] 
