update esp-idf to latest v3.3 branch

pebri86 · Nov 22, 2019 · e7afb0d · e7afb0d
1 parent e445240
commit e7afb0d
Show file tree

Hide file tree

Showing 7 changed files with 187 additions and 12 deletions.
diff --git a/esplay-gnuboy/sdkconfig b/esplay-gnuboy/sdkconfig
@@ -3,6 +3,7 @@
 # Espressif IoT Development Framework Configuration
 #
 CONFIG_IDF_TARGET="esp32"
+CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
 #
 # SDK tool configuration
@@ -161,6 +162,7 @@ CONFIG_AWS_IOT_SDK=
 # Bluetooth
 #
 CONFIG_BT_ENABLED=
+CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
@@ -199,6 +201,12 @@ CONFIG_EFUSE_MAX_BLK_LEN=192
 # ESP32-specific
 #
 CONFIG_IDF_TARGET_ESP32=y
+CONFIG_ESP32_REV_MIN_0=y
+CONFIG_ESP32_REV_MIN_1=
+CONFIG_ESP32_REV_MIN_2=
+CONFIG_ESP32_REV_MIN_3=
+CONFIG_ESP32_REV_MIN=0
+CONFIG_ESP32_DPORT_WORKAROUND=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
@@ -226,7 +234,25 @@ CONFIG_SPIRAM_BANKSWITCH_RESERVE=8
 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=
 CONFIG_SPIRAM_OCCUPY_HSPI_HOST=
 CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y
+CONFIG_SPIRAM_OCCUPY_NO_HOST=
+
+#
+# PSRAM clock and cs IO for ESP32-DOWD
+#
+CONFIG_D0WD_PSRAM_CLK_IO=17
+CONFIG_D0WD_PSRAM_CS_IO=16
+
+#
+# PSRAM clock and cs IO for ESP32-D2WD
+#
+CONFIG_D2WD_PSRAM_CLK_IO=9
+CONFIG_D2WD_PSRAM_CS_IO=10
+
+#
+# PSRAM clock and cs IO for ESP32-PICO
+#
 CONFIG_PICO_PSRAM_CS_IO=10
+CONFIG_SPIRAM_SPIWP_SD3_PIN=7
 CONFIG_MEMMAP_TRACEMEM=
 CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
 CONFIG_ESP32_TRAX=
@@ -297,6 +323,7 @@ CONFIG_NO_BLOBS=
 CONFIG_ESP_TIMER_PROFILING=
 CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS=
 CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
+CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
 
 #
 # Wi-Fi
@@ -349,6 +376,7 @@ CONFIG_EVENT_LOOP_PROFILING=
 # ESP HTTP client
 #
 CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
+CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=
 
 #
 # HTTP Server
@@ -377,7 +405,7 @@ CONFIG_ESP32_ENABLE_COREDUMP=
 #
 CONFIG_DMA_RX_BUF_NUM=10
 CONFIG_DMA_TX_BUF_NUM=10
-CONFIG_EMAC_L2_TO_L3_RX_BUF_MODE=
+CONFIG_EMAC_L2_TO_L3_RX_BUF_MODE=y
 CONFIG_EMAC_CHECK_LINK_PERIOD_MS=2000
 CONFIG_EMAC_TASK_PRIORITY=20
 CONFIG_EMAC_TASK_STACK_SIZE=3072
@@ -504,7 +532,6 @@ CONFIG_LWIP_MAX_SOCKETS=4
 CONFIG_USE_ONLY_LWIP_SELECT=
 CONFIG_LWIP_SO_REUSE=
 CONFIG_LWIP_SO_RCVBUF=
-CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
 CONFIG_LWIP_IP_FRAG=
 CONFIG_LWIP_IP_REASSEMBLY=
 CONFIG_LWIP_STATS=
@@ -565,6 +592,12 @@ CONFIG_LWIP_BROADCAST_PING=
 #
 CONFIG_LWIP_MAX_RAW_PCBS=16
 
+#
+# SNTP
+#
+CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
+CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
+
 #
 # mbedTLS
 #
@@ -575,6 +608,8 @@ CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC=
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=
 CONFIG_MBEDTLS_DEBUG=
+CONFIG_MBEDTLS_ECP_RESTARTABLE=
+CONFIG_MBEDTLS_CMAC_C=
 CONFIG_MBEDTLS_HARDWARE_AES=y
 CONFIG_MBEDTLS_HARDWARE_MPI=
 CONFIG_MBEDTLS_HARDWARE_SHA=

diff --git a/esplay-launcher/main/main.c b/esplay-launcher/main/main.c
@@ -541,6 +541,16 @@ void app_main(void)
         }
         else if (doRefresh)
         {
+            char *path = malloc(strlen(base_path) + strlen(emu_dir[menuItem]) + 1);
+            strcpy(path, base_path);
+            strcat(path, emu_dir[menuItem]);
+            int count = sdcard_get_files_count(path);
+            char text[320];
+            sprintf(text, "%i games available", count);
+            ui_clear_screen();
+            drawHomeScreen();
+            UG_PutString((320/2) - (strlen(text) * 9 / 2), 64, text);
+            ui_flush();
             scrollGfx(0, 78, 0, (56 * menuItem) + 24, 320, 56);
             doRefresh = 0;
         }

diff --git a/esplay-launcher/sdkconfig b/esplay-launcher/sdkconfig
@@ -3,6 +3,7 @@
 # Espressif IoT Development Framework Configuration
 #
 CONFIG_IDF_TARGET="esp32"
+CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
 #
 # SDK tool configuration
@@ -161,6 +162,7 @@ CONFIG_AWS_IOT_SDK=
 # Bluetooth
 #
 CONFIG_BT_ENABLED=
+CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
@@ -199,6 +201,12 @@ CONFIG_EFUSE_MAX_BLK_LEN=192
 # ESP32-specific
 #
 CONFIG_IDF_TARGET_ESP32=y
+CONFIG_ESP32_REV_MIN_0=y
+CONFIG_ESP32_REV_MIN_1=
+CONFIG_ESP32_REV_MIN_2=
+CONFIG_ESP32_REV_MIN_3=
+CONFIG_ESP32_REV_MIN=0
+CONFIG_ESP32_DPORT_WORKAROUND=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
@@ -230,7 +238,25 @@ CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=
 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=
 CONFIG_SPIRAM_OCCUPY_HSPI_HOST=
 CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y
+CONFIG_SPIRAM_OCCUPY_NO_HOST=
+
+#
+# PSRAM clock and cs IO for ESP32-DOWD
+#
+CONFIG_D0WD_PSRAM_CLK_IO=17
+CONFIG_D0WD_PSRAM_CS_IO=16
+
+#
+# PSRAM clock and cs IO for ESP32-D2WD
+#
+CONFIG_D2WD_PSRAM_CLK_IO=9
+CONFIG_D2WD_PSRAM_CS_IO=10
+
+#
+# PSRAM clock and cs IO for ESP32-PICO
+#
 CONFIG_PICO_PSRAM_CS_IO=10
+CONFIG_SPIRAM_SPIWP_SD3_PIN=7
 CONFIG_MEMMAP_TRACEMEM=
 CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
 CONFIG_ESP32_TRAX=
@@ -291,6 +317,7 @@ CONFIG_NO_BLOBS=
 CONFIG_ESP_TIMER_PROFILING=
 CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS=
 CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
+CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
 
 #
 # Wi-Fi
@@ -342,6 +369,7 @@ CONFIG_EVENT_LOOP_PROFILING=
 # ESP HTTP client
 #
 CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
+CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=
 
 #
 # HTTP Server
@@ -370,7 +398,7 @@ CONFIG_ESP32_ENABLE_COREDUMP=
 #
 CONFIG_DMA_RX_BUF_NUM=10
 CONFIG_DMA_TX_BUF_NUM=10
-CONFIG_EMAC_L2_TO_L3_RX_BUF_MODE=
+CONFIG_EMAC_L2_TO_L3_RX_BUF_MODE=y
 CONFIG_EMAC_CHECK_LINK_PERIOD_MS=2000
 CONFIG_EMAC_TASK_PRIORITY=20
 CONFIG_EMAC_TASK_STACK_SIZE=3072
@@ -498,7 +526,6 @@ CONFIG_USE_ONLY_LWIP_SELECT=
 CONFIG_LWIP_SO_REUSE=y
 CONFIG_LWIP_SO_REUSE_RXTOALL=y
 CONFIG_LWIP_SO_RCVBUF=
-CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
 CONFIG_LWIP_IP_FRAG=
 CONFIG_LWIP_IP_REASSEMBLY=
 CONFIG_LWIP_STATS=
@@ -559,6 +586,12 @@ CONFIG_LWIP_BROADCAST_PING=
 #
 CONFIG_LWIP_MAX_RAW_PCBS=16
 
+#
+# SNTP
+#
+CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
+CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
+
 #
 # mbedTLS
 #
@@ -569,6 +602,8 @@ CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC=
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=
 CONFIG_MBEDTLS_DEBUG=
+CONFIG_MBEDTLS_ECP_RESTARTABLE=
+CONFIG_MBEDTLS_CMAC_C=
 CONFIG_MBEDTLS_HARDWARE_AES=y
 CONFIG_MBEDTLS_HARDWARE_MPI=
 CONFIG_MBEDTLS_HARDWARE_SHA=
@@ -689,7 +724,9 @@ CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y
 CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y
 CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS=
 CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED=
-CONFIG_SPI_FLASH_YIELD_DURING_ERASE=
+CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y
+CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=20
+CONFIG_SPI_FLASH_ERASE_YIELD_TICKS=1
 
 #
 # SPIFFS Configuration

diff --git a/esplay-nofrendo/sdkconfig b/esplay-nofrendo/sdkconfig
@@ -3,6 +3,7 @@
 # Espressif IoT Development Framework Configuration
 #
 CONFIG_IDF_TARGET="esp32"
+CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
 #
 # SDK tool configuration
@@ -161,6 +162,7 @@ CONFIG_AWS_IOT_SDK=
 # Bluetooth
 #
 CONFIG_BT_ENABLED=
+CONFIG_BTDM_CTRL_BR_EDR_SCO_DATA_PATH_EFF=0
 CONFIG_BTDM_CONTROLLER_BLE_MAX_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_ACL_CONN_EFF=0
 CONFIG_BTDM_CONTROLLER_BR_EDR_MAX_SYNC_CONN_EFF=0
@@ -199,6 +201,12 @@ CONFIG_EFUSE_MAX_BLK_LEN=192
 # ESP32-specific
 #
 CONFIG_IDF_TARGET_ESP32=y
+CONFIG_ESP32_REV_MIN_0=y
+CONFIG_ESP32_REV_MIN_1=
+CONFIG_ESP32_REV_MIN_2=
+CONFIG_ESP32_REV_MIN_3=
+CONFIG_ESP32_REV_MIN=0
+CONFIG_ESP32_DPORT_WORKAROUND=y
 CONFIG_ESP32_DEFAULT_CPU_FREQ_80=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_160=
 CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
@@ -224,9 +232,27 @@ CONFIG_SPIRAM_CACHE_WORKAROUND=y
 CONFIG_SPIRAM_BANKSWITCH_ENABLE=y
 CONFIG_SPIRAM_BANKSWITCH_RESERVE=8
 CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=
-CONFIG_SPIRAM_OCCUPY_HSPI_HOST=
-CONFIG_SPIRAM_OCCUPY_VSPI_HOST=y
+CONFIG_SPIRAM_OCCUPY_HSPI_HOST=y
+CONFIG_SPIRAM_OCCUPY_VSPI_HOST=
+CONFIG_SPIRAM_OCCUPY_NO_HOST=
+
+#
+# PSRAM clock and cs IO for ESP32-DOWD
+#
+CONFIG_D0WD_PSRAM_CLK_IO=17
+CONFIG_D0WD_PSRAM_CS_IO=16
+
+#
+# PSRAM clock and cs IO for ESP32-D2WD
+#
+CONFIG_D2WD_PSRAM_CLK_IO=9
+CONFIG_D2WD_PSRAM_CS_IO=10
+
+#
+# PSRAM clock and cs IO for ESP32-PICO
+#
 CONFIG_PICO_PSRAM_CS_IO=10
+CONFIG_SPIRAM_SPIWP_SD3_PIN=7
 CONFIG_MEMMAP_TRACEMEM=
 CONFIG_MEMMAP_TRACEMEM_TWOBANKS=
 CONFIG_ESP32_TRAX=
@@ -297,6 +323,7 @@ CONFIG_NO_BLOBS=
 CONFIG_ESP_TIMER_PROFILING=
 CONFIG_COMPATIBLE_PRE_V2_1_BOOTLOADERS=
 CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
+CONFIG_ESP32_DPORT_DIS_INTERRUPT_LVL=5
 
 #
 # Wi-Fi
@@ -349,6 +376,7 @@ CONFIG_EVENT_LOOP_PROFILING=
 # ESP HTTP client
 #
 CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
+CONFIG_ESP_HTTP_CLIENT_ENABLE_BASIC_AUTH=
 
 #
 # HTTP Server
@@ -503,7 +531,6 @@ CONFIG_LWIP_MAX_SOCKETS=4
 CONFIG_USE_ONLY_LWIP_SELECT=
 CONFIG_LWIP_SO_REUSE=
 CONFIG_LWIP_SO_RCVBUF=
-CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
 CONFIG_LWIP_IP_FRAG=
 CONFIG_LWIP_IP_REASSEMBLY=
 CONFIG_LWIP_STATS=
@@ -564,6 +591,12 @@ CONFIG_LWIP_BROADCAST_PING=
 #
 CONFIG_LWIP_MAX_RAW_PCBS=16
 
+#
+# SNTP
+#
+CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
+CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
+
 #
 # mbedTLS
 #
@@ -574,6 +607,8 @@ CONFIG_MBEDTLS_CUSTOM_MEM_ALLOC=
 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
 CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN=
 CONFIG_MBEDTLS_DEBUG=
+CONFIG_MBEDTLS_ECP_RESTARTABLE=
+CONFIG_MBEDTLS_CMAC_C=
 CONFIG_MBEDTLS_HARDWARE_AES=y
 CONFIG_MBEDTLS_HARDWARE_MPI=
 CONFIG_MBEDTLS_HARDWARE_SHA=

diff --git a/esplay-sdk/esplay-components/esplay-hal/include/sdcard.h b/esplay-sdk/esplay-components/esplay-hal/include/sdcard.h
@@ -6,6 +6,7 @@ int sdcard_files_get(const char *path, const char *extension, char ***filesOut);
 void sdcard_files_free(char **files, int count);
 esp_err_t sdcard_open();
 esp_err_t sdcard_close();
+int sdcard_get_files_count(const char *path);
 size_t sdcard_get_filesize(const char *path);
 size_t sdcard_copy_file_to_memory(const char *path, void *ptr);
 char *sdcard_create_savefile_path(const char *base_path, const char *fileName);
diff --git a/esplay-sdk/esplay-components/esplay-hal/sdcard.c b/esplay-sdk/esplay-components/esplay-hal/sdcard.c
@@ -68,9 +68,31 @@ static void sort_files(char **files, int count)
     }
 }
 
+int sdcard_get_files_count(const char *path)
+{
+    int file_count = 0;
+    DIR * dirp;
+    struct dirent * entry;
+
+    dirp = opendir(path); /* There should be error handling after this */
+    if (dirp == NULL)
+    {
+        printf("opendir failed.\n");
+        return 0;
+    }
+    while ((entry = readdir(dirp)) != NULL) {
+        if (entry->d_type == DT_REG) { /* If the entry is a regular file */
+            file_count++;
+        }
+    }
+    closedir(dirp);
+
+    return file_count;
+}
+
 int sdcard_files_get(const char *path, const char *extension, char ***filesOut)
 {
-    const int MAX_FILES = 1024;
+    const int MAX_FILES = 2048;
 
     int count = 0;
     char **result = (char **)malloc(MAX_FILES * sizeof(void *));