Merge branch 'Software' of github.com:retro-esp32/RetroESP32 into Software

EugeneAndruszczenko · EugeneAndruszczenko · commit f39c5ed8358b · 2019-09-26T14:24:24.000-04:00
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/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`
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=`
`89`	`89`
`90`	`90`	`#`
`91`	`91`	`# Partition Table`