Tue Jan 5 18:55:11 EST 2021 - 2.8 pre release

Author: 32teeth

Emulators/handy-go/sdkconfig

@@ -84,11 +84,11 @@ CONFIG_MONITOR_BAUD=115200
 # Retro ESP32 Configuration
 #
 CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32=
-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
 CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT=
-CONFIG_DEFAULT_MENU_KEY=y
-CONFIG_COMBO_MENU_KEY=
+CONFIG_DEFAULT_MENU_KEY=
+CONFIG_COMBO_MENU_KEY=y
 CONFIG_IN_GAME_MENU_YES=y
 CONFIG_IN_GAME_MENU_NO=
 

Launchers/retro-esp32/sdkconfig

@@ -84,11 +84,11 @@ CONFIG_MONITOR_BAUD=115200
 # Retro ESP32 Configuration
 #
 CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32=
-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
 CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT=
-CONFIG_DEFAULT_MENU_KEY=y
-CONFIG_COMBO_MENU_KEY=
+CONFIG_DEFAULT_MENU_KEY=
+CONFIG_COMBO_MENU_KEY=y
 
 #
 # Partition Table

Launchers/retro-esp32/sdkconfig.old

@@ -83,17 +83,12 @@ CONFIG_MONITOR_BAUD=115200
 #
 # Retro ESP32 Configuration
 #
-CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32=y
+CONFIG_LCD_DRIVER_CHIP_CUTE_ESP32=
 CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
 CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT=
-<<<<<<< HEAD
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32_NEXT=y
 CONFIG_DEFAULT_MENU_KEY=
 CONFIG_COMBO_MENU_KEY=y
-=======
-CONFIG_DEFAULT_MENU_KEY=y
-CONFIG_COMBO_MENU_KEY=
->>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
 
 #
 # Partition Table
@@ -171,11 +166,7 @@ CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
-<<<<<<< HEAD
-CONFIG_SPIRAM_SUPPORT=
-=======
 CONFIG_SPIRAM_SUPPORT=y
->>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
 
 #
 # SPI RAM config
@@ -185,23 +176,13 @@ CONFIG_SPIRAM_IGNORE_NOTFOUND=
 CONFIG_SPIRAM_USE_MEMMAP=
 CONFIG_SPIRAM_USE_CAPS_ALLOC=y
 CONFIG_SPIRAM_USE_MALLOC=
-<<<<<<< HEAD
 CONFIG_SPIRAM_TYPE_AUTO=y
 CONFIG_SPIRAM_TYPE_ESPPSRAM32=
 CONFIG_SPIRAM_TYPE_ESPPSRAM64=
 CONFIG_SPIRAM_SIZE=-1
 CONFIG_SPIRAM_SPEED_40M=
 CONFIG_SPIRAM_SPEED_80M=y
 CONFIG_SPIRAM_MEMTEST=
-=======
-CONFIG_SPIRAM_TYPE_AUTO=
-CONFIG_SPIRAM_TYPE_ESPPSRAM32=
-CONFIG_SPIRAM_TYPE_ESPPSRAM64=y
-CONFIG_SPIRAM_SIZE=8388608
-CONFIG_SPIRAM_SPEED_40M=
-CONFIG_SPIRAM_SPEED_80M=y
-CONFIG_SPIRAM_MEMTEST=y
->>>>>>> 0b1961eab7afb0f56eda4c185c294e827853aa35
 CONFIG_SPIRAM_CACHE_WORKAROUND=
 CONFIG_SPIRAM_BANKSWITCH_ENABLE=
 CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=

Scripts/helpers/version

@@ -44,13 +44,13 @@ replace() {
   echo -e "${robot}  ${green}Replacing ${cyan}EMULATORS${nc} files"
   echo "--------------------------------------------------------------------------"
   cp -R $SOURCE/Emulators/* $EMULATORS
-  sleep 0.25
+  sleep 1
   clear
   echo "--------------------------------------------------------------------------"
   echo -e "${unicorn}  ${green}Replacing ${cyan}LAUNCHERS${nc} files"
   echo "--------------------------------------------------------------------------"
   cp -R $SOURCE/Launchers/* $LAUNCHERS
-  sleep 0.25
+  sleep 1
   clear
 }