Mon 10 Feb 2020 06:33:14 EST - cover art load from png tests

Author: 32teeth

Emulators/handy-go/sdkconfig

@@ -83,10 +83,10 @@ CONFIG_MONITOR_BAUD=115200
 #
 # Retro ESP32 Configuration
 #
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
-CONFIG_DEFAULT_MENU_KEY=y
-CONFIG_COMBO_MENU_KEY=
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
+CONFIG_DEFAULT_MENU_KEY=
+CONFIG_COMBO_MENU_KEY=y
 CONFIG_IN_GAME_MENU_YES=y
 CONFIG_IN_GAME_MENU_NO=
 

Launchers/retro-esp32/main/includes/declarations.h

@@ -91,6 +91,7 @@ void has_save_file(char *save_name);
   Cover
 */
 void get_cover();
+void preview_cover(bool error);
 void draw_cover();
 
 /*

Launchers/retro-esp32/main/main.c

@@ -803,6 +803,7 @@
     y += 48;
     draw_media(x,y-6,true);
     draw_launcher_options();
+    get_cover();
   }
 
   void draw_launcher_options() {
@@ -851,8 +852,6 @@
       ili9341_write_frame_rectangleLE(x, y, w, h, buffer);
       draw_text(x+10,y,"Run",false,true, false);
     }
-
-    get_cover();
   }
 //}#pragma endregion GUI
 
@@ -1128,7 +1127,9 @@
 
 //{#pragma region Cover
   void get_cover() {
-    //debounce(ODROID_INPUT_A);
+
+    preview_cover(false);
+
     char file[256] = "";
     sprintf(file, "%s/%s", ROM.path, ROM.name);
 
@@ -1149,7 +1150,8 @@
         while (true)
         {
           odroid_input_gamepad_read(&gamepad);
-          if (gamepad.values[ODROID_INPUT_A] ||
+          if (//gamepad.values[ODROID_INPUT_A] ||
+              gamepad.values[ODROID_INPUT_B] ||
               gamepad.values[ODROID_INPUT_START] ||
               gamepad.values[ODROID_INPUT_SELECT] ||
               gamepad.values[ODROID_INPUT_LEFT] ||
@@ -1158,6 +1160,7 @@
               gamepad.values[ODROID_INPUT_DOWN]) {
               abort = true;
               break;
+              get_cover();
           }
           int count = fread(cover, 1, buf_size, f);
           crc_tmp = crc32_le(crc_tmp, (const uint8_t*)cover, count);
@@ -1181,7 +1184,27 @@
 
     if(ROM.crc > 1) {
       draw_cover();
+    } else {
+      preview_cover(true);      
+    }
+  }
+
+  void preview_cover(bool error) {
+    /*
+    */
+    int bw = 112;
+    int bh = 168;
+    int i = 0;
+
+    printf("\n----- %s -----\n", __func__);
+    for(int h = 0; h < bh; h++) {
+      for(int w = 0; w < bw; w++) {
+        buffer[i] = (h == 0) || (h == bh -1) ? WHITE : (w == 0) ||  (w == bw -1) ? WHITE : GUI.bg;
+        i++;
+      }
     }
+    ili9341_write_frame_rectangleLE(SCREEN.w-bw-24, POS.y+8, bw, bh, buffer);   
+    draw_text(SCREEN.w-bw-24+32, POS.y+8+(168/2)-2, error ? "NO PREVIEW" : "PREVIEW", false, false, false); 
   }
 
   void draw_cover() {
@@ -1210,7 +1233,7 @@
       if (width<=320 && height<=176) {
         uint16_t *img = (uint16_t*)heap_caps_malloc(width*height*2, MALLOC_CAP_SPIRAM);
         fread(img, 2, width*height, f);
-        ili9341_write_frame_rectangleLE(SCREEN.w-width-16,POS.y, width, height, img);
+        ili9341_write_frame_rectangleLE(SCREEN.w-width-24,POS.y+8, width, height, img);
         heap_caps_free(img);
       }
       fclose(f);

Launchers/retro-esp32/sdkconfig

@@ -37,7 +37,7 @@ CONFIG_FLASH_ENCRYPTION_ENABLED=
 #
 # Serial flasher config
 #
-CONFIG_ESPTOOLPY_PORT="/dev/cu.SLAB_USBtoUART"
+CONFIG_ESPTOOLPY_PORT="/dev/cu.usbserial-AB0JECDV"
 CONFIG_ESPTOOLPY_BAUD_115200B=
 CONFIG_ESPTOOLPY_BAUD_230400B=
 CONFIG_ESPTOOLPY_BAUD_921600B=y
@@ -82,10 +82,10 @@ CONFIG_MONITOR_BAUD=115200
 #
 # Retro ESP32 Configuration
 #
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
-CONFIG_DEFAULT_MENU_KEY=y
-CONFIG_COMBO_MENU_KEY=
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
+CONFIG_DEFAULT_MENU_KEY=
+CONFIG_COMBO_MENU_KEY=y
 
 #
 # Partition Table

Launchers/retro-esp32/sdkconfig.old

@@ -37,7 +37,7 @@ CONFIG_FLASH_ENCRYPTION_ENABLED=
 #
 # Serial flasher config
 #
-CONFIG_ESPTOOLPY_PORT="/dev/cu.SLAB_USBtoUART"
+CONFIG_ESPTOOLPY_PORT="/dev/cu.usbserial-A1015RV2"
 CONFIG_ESPTOOLPY_BAUD_115200B=
 CONFIG_ESPTOOLPY_BAUD_230400B=
 CONFIG_ESPTOOLPY_BAUD_921600B=y
@@ -82,10 +82,10 @@ CONFIG_MONITOR_BAUD=115200
 #
 # Retro ESP32 Configuration
 #
-CONFIG_LCD_DRIVER_CHIP_ODROID_GO=y
-CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=
-CONFIG_DEFAULT_MENU_KEY=y
-CONFIG_COMBO_MENU_KEY=
+CONFIG_LCD_DRIVER_CHIP_ODROID_GO=
+CONFIG_LCD_DRIVER_CHIP_RETRO_ESP32=y
+CONFIG_DEFAULT_MENU_KEY=
+CONFIG_COMBO_MENU_KEY=y
 
 #
 # Partition Table
@@ -170,8 +170,8 @@ CONFIG_SPIRAM_SUPPORT=y
 #
 CONFIG_SPIRAM_BOOT_INIT=y
 CONFIG_SPIRAM_IGNORE_NOTFOUND=
-CONFIG_SPIRAM_USE_MEMMAP=y
-CONFIG_SPIRAM_USE_CAPS_ALLOC=
+CONFIG_SPIRAM_USE_MEMMAP=
+CONFIG_SPIRAM_USE_CAPS_ALLOC=y
 CONFIG_SPIRAM_USE_MALLOC=
 CONFIG_SPIRAM_TYPE_AUTO=y
 CONFIG_SPIRAM_TYPE_ESPPSRAM32=
@@ -183,6 +183,7 @@ CONFIG_SPIRAM_MEMTEST=y
 CONFIG_SPIRAM_CACHE_WORKAROUND=y
 CONFIG_SPIRAM_BANKSWITCH_ENABLE=y
 CONFIG_SPIRAM_BANKSWITCH_RESERVE=8
+CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST=
 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=
 CONFIG_MEMMAP_TRACEMEM=
 CONFIG_MEMMAP_TRACEMEM_TWOBANKS=