Merge branch 'v4.2' into add-custom-board-partition-bootloader

Author: hathach

cores/esp32/esp32-hal-adc.c

@@ -183,7 +183,7 @@ uint32_t __analogReadMilliVolts(uint8_t pin){
             __analogVRef = DEFAULT_VREF;
             if(__analogVRefPin){
                 esp_adc_cal_characteristics_t chars;
-                if(adc2_vref_to_gpio(__analogVRefPin) == ESP_OK){
+                if(adc_vref_to_gpio(ADC_UNIT_2, __analogVRefPin) == ESP_OK){
                     __analogVRef = __analogRead(__analogVRefPin);
                     esp_adc_cal_characterize(1, __analogAttenuation, __analogWidth, DEFAULT_VREF, &chars);
                     __analogVRef = esp_adc_cal_raw_to_voltage(__analogVRef, &chars);

cores/esp32/esp32-hal-psram.c

@@ -51,6 +51,11 @@ bool psramInit(){
         log_w("PSRAM not supported!");
         return false;
     }
+#elif CONFIG_IDF_TARGET_ESP32S2
+    extern void esp_config_data_cache_mode(void);
+    esp_config_data_cache_mode();
+    Cache_Enable_DCache(0);
+#endif
     if (esp_spiram_init() != ESP_OK) {
         spiramFailed = true;
         log_w("PSRAM init failed!");
@@ -61,11 +66,6 @@ bool psramInit(){
         return false;
     }
     esp_spiram_init_cache();
-#elif CONFIG_IDF_TARGET_ESP32S2
-    extern void esp_config_data_cache_mode(void);
-    esp_config_data_cache_mode();
-    Cache_Enable_DCache(0);
-#endif
     if (!esp_spiram_test()) {
         spiramFailed = true;
         log_e("PSRAM test failed!");

cores/esp32/esp32-hal-tinyusb.c

@@ -30,6 +30,8 @@
 
 #include "esp32-hal-tinyusb.h"
 #include "esp32s2/rom/usb/usb_persist.h"
+#include "esp32s2/rom/usb/usb_dc.h"
+#include "esp32s2/rom/usb/chip_usb_dw_wrapper.h"
 
 typedef char tusb_str_t[127];
 
@@ -457,27 +459,22 @@ static void IRAM_ATTR usb_persist_shutdown_handler(void)
 {
     if(usb_persist_mode != RESTART_NO_PERSIST){
         if (usb_persist_enabled) {
-            REG_SET_BIT(RTC_CNTL_USB_CONF_REG, RTC_CNTL_IO_MUX_RESET_DISABLE);
-            REG_SET_BIT(RTC_CNTL_USB_CONF_REG, RTC_CNTL_USB_RESET_DISABLE);
+            usb_dc_prepare_persist();
         }
         if (usb_persist_mode == RESTART_BOOTLOADER) {
             //USB CDC Download
             if (usb_persist_enabled) {
-                USB_WRAP.date.val = USBDC_PERSIST_ENA;
+                chip_usb_set_persist_flags(USBDC_PERSIST_ENA);
             }
             REG_WRITE(RTC_CNTL_OPTION1_REG, RTC_CNTL_FORCE_DOWNLOAD_BOOT);
-            periph_module_disable(PERIPH_TIMG1_MODULE);
         } else if (usb_persist_mode == RESTART_BOOTLOADER_DFU) {
             //DFU Download
-            USB_WRAP.date.val = USBDC_BOOT_DFU;
+            chip_usb_set_persist_flags(USBDC_BOOT_DFU);
             REG_WRITE(RTC_CNTL_OPTION1_REG, RTC_CNTL_FORCE_DOWNLOAD_BOOT);
-            periph_module_disable(PERIPH_TIMG0_MODULE);
-            periph_module_disable(PERIPH_TIMG1_MODULE);
         } else if (usb_persist_enabled) {
             //USB Persist reboot
-            USB_WRAP.date.val = USBDC_PERSIST_ENA;
+            chip_usb_set_persist_flags(USBDC_PERSIST_ENA);
         }
-        SET_PERI_REG_MASK(RTC_CNTL_OPTIONS0_REG, RTC_CNTL_SW_PROCPU_RST);
     }
 }
 
@@ -531,7 +528,7 @@ esp_err_t tinyusb_init(tinyusb_device_config_t *config) {
         periph_module_enable(PERIPH_USB_MODULE);
     }
 
-    if (usb_persist_enabled && esp_register_shutdown_handler(usb_persist_shutdown_handler) != ESP_OK) {
+    if (esp_register_shutdown_handler(usb_persist_shutdown_handler) != ESP_OK) {
         initialized = false;
         return ESP_FAIL;
     }
@@ -550,11 +547,9 @@ esp_err_t tinyusb_init(tinyusb_device_config_t *config) {
 
 void usb_persist_restart(restart_type_t mode)
 {
-    if (usb_persist_enabled && mode < RESTART_TYPE_MAX) {
+    if (mode < RESTART_TYPE_MAX) {
         usb_persist_mode = mode;
         esp_restart();
-    } else {
-        log_e("Persistence is not enabled");
     }
 }
 

libraries/FFat/src/FFat.cpp

@@ -135,6 +135,21 @@ size_t F_Fat::totalBytes()
     return tot_sect * sect_size;
 }
 
+size_t F_Fat::usedBytes()
+{
+    FATFS *fs;
+    DWORD free_clust, used_sect, sect_size;
+
+    BYTE pdrv = ff_diskio_get_pdrv_wl(_wl_handle);
+    char drv[3] = {(char)(48+pdrv), ':', 0};
+    if ( f_getfree(drv, &free_clust, &fs) != FR_OK){
+        return 0;
+    }
+    used_sect = (fs->n_fatent - 2 - free_clust) * fs->csize;
+    sect_size = CONFIG_WL_SECTOR_SIZE;
+    return used_sect * sect_size;
+}
+
 size_t F_Fat::freeBytes()
 {
 

libraries/FFat/src/FFat.h

@@ -31,6 +31,7 @@ class F_Fat : public FS
     bool begin(bool formatOnFail=false, const char * basePath="/ffat", uint8_t maxOpenFiles=10, const char * partitionLabel = (char*)FFAT_PARTITION_LABEL);
     bool format(bool full_wipe = FFAT_WIPE_QUICK, char* partitionLabel = (char*)FFAT_PARTITION_LABEL);
     size_t totalBytes();
+    size_t usedBytes();
     size_t freeBytes();
     void end();
     bool exists(const char* path);

libraries/SD_MMC/src/SD_MMC.cpp

@@ -43,22 +43,21 @@ bool SDMMCFS::begin(const char * mountpoint, bool mode1bit)
     }
     //mount
     sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT();
-    sdmmc_host_t host = {
-        .flags = SDMMC_HOST_FLAG_4BIT,
-        .slot = SDMMC_HOST_SLOT_1,
-        .max_freq_khz = SDMMC_FREQ_DEFAULT,
-        .io_voltage = 3.3f,
-        .init = &sdmmc_host_init,
-        .set_bus_width = &sdmmc_host_set_bus_width,
-        .get_bus_width = &sdmmc_host_get_slot_width,
-        .set_bus_ddr_mode = &sdmmc_host_set_bus_ddr_mode,
-        .set_card_clk = &sdmmc_host_set_card_clk,
-        .do_transaction = &sdmmc_host_do_transaction,
-        .deinit = &sdmmc_host_deinit,
-        .io_int_enable = &sdmmc_host_io_int_enable,
-        .io_int_wait = &sdmmc_host_io_int_wait,
-        .command_timeout_ms = 0
-    };
+    sdmmc_host_t host;
+    host.flags = SDMMC_HOST_FLAG_4BIT;
+    host.slot = SDMMC_HOST_SLOT_1;
+    host.max_freq_khz = SDMMC_FREQ_DEFAULT;
+    host.io_voltage = 3.3f;
+    host.init = &sdmmc_host_init;
+    host.set_bus_width = &sdmmc_host_set_bus_width;
+    host.get_bus_width = &sdmmc_host_get_slot_width;
+    host.set_bus_ddr_mode = &sdmmc_host_set_bus_ddr_mode;
+    host.set_card_clk = &sdmmc_host_set_card_clk;
+    host.do_transaction = &sdmmc_host_do_transaction;
+    host.deinit_p = &sdspi_host_remove_device;
+    host.io_int_enable = &sdmmc_host_io_int_enable;
+    host.io_int_wait = &sdmmc_host_io_int_wait;
+    host.command_timeout_ms = 0;
     host.max_freq_khz = SDMMC_FREQ_HIGHSPEED;
 #ifdef BOARD_HAS_1BIT_SDMMC
     mode1bit = true;

libraries/WebServer/src/WebServer.cpp

@@ -313,11 +313,12 @@ void WebServer::handleClient() {
           _contentLength = CONTENT_LENGTH_NOT_SET;
           _handleRequest();
 
-          if (_currentClient.connected()) {
-            _currentStatus = HC_WAIT_CLOSE;
-            _statusChange = millis();
-            keepCurrentClient = true;
-          }
+// Fix for issue with Chrome based browsers: https://github.com/espressif/arduino-esp32/issues/3652
+//           if (_currentClient.connected()) {
+//             _currentStatus = HC_WAIT_CLOSE;
+//             _statusChange = millis();
+//             keepCurrentClient = true;
+//           }
         }
       } else { // !_currentClient.available()
         if (millis() - _statusChange <= HTTP_MAX_DATA_WAIT) {

libraries/WiFi/examples/WiFiProv/WiFiProv.ino

@@ -45,8 +45,11 @@ void setup() {
   /* uint8_t uuid[16] = {0xb4, 0xdf, 0x5a, 0x1c, 0x3f, 0x6b, 0xf4, 0xbf,
                    0xea, 0x4a, 0x82, 0x03, 0x04, 0x90, 0x1a, 0x02 };*/
   WiFi.onEvent(SysProvEvent);
-  //WiFi.beginProvision(WIFI_PROV_SCHEME_BLE, WIFI_PROV_SCHEME_BLE_EVENT_HANDLER_FREE_BTDM, WIFI_PROV_SECURITY_1, "abcd1234");
-  WiFi.beginProvision(WIFI_PROV_SCHEME_SOFTAP, WIFI_PROV_SCHEME_HANDLER_NONE, WIFI_PROV_SECURITY_1, "abcd1234");
+#if CONFIG_IDF_TARGET_ESP32 && CONFIG_BLUEDROID_ENABLED
+    WiFi.beginProvision(WIFI_PROV_SCHEME_BLE, WIFI_PROV_SCHEME_HANDLER_FREE_BTDM, WIFI_PROV_SECURITY_1, "abcd1234", "Prov_123");
+#else
+    WiFi.beginProvision(WIFI_PROV_SCHEME_SOFTAP, WIFI_PROV_SCHEME_HANDLER_NONE, WIFI_PROV_SECURITY_1, "abcd1234", "Prov_123");
+#endif
 }
 
 void loop() {

libraries/WiFi/src/WiFiProv.cpp

@@ -35,6 +35,9 @@
 #include <wifi_provisioning/manager.h>
 #undef IPADDR_NONE
 #include "WiFi.h"
+#if CONFIG_IDF_TARGET_ESP32
+#include "SimpleBLE.h"
+#endif
 
 bool wifiLowLevelInit(bool persistent);
 
@@ -114,7 +117,8 @@ void WiFiProvClass :: beginProvision(prov_scheme_t prov_scheme, scheme_handler_t
     	return;
     }
 #endif
-
+    config.app_event_handler.event_cb = NULL;
+    config.app_event_handler.user_data = NULL;
     wifiLowLevelInit(true);
     if(wifi_prov_mgr_init(config) != ESP_OK){
     	log_e("wifi_prov_mgr_init failed!");
@@ -154,28 +158,19 @@ void WiFiProvClass :: beginProvision(prov_scheme_t prov_scheme, scheme_handler_t
 #if CONFIG_BLUEDROID_ENABLED
         }
 #endif
-
-        if(wifi_prov_mgr_endpoint_create("custom-data") != ESP_OK){
-        	log_e("wifi_prov_mgr_endpoint_create failed!");
-        	return;
-        }
         if(wifi_prov_mgr_start_provisioning(security, pop, service_name, service_key) != ESP_OK){
         	log_e("wifi_prov_mgr_start_provisioning failed!");
         	return;
         }
-        if(wifi_prov_mgr_endpoint_register("custom-data", custom_prov_data_handler, NULL) != ESP_OK){
-        	log_e("wifi_prov_mgr_endpoint_register failed!");
-        	return;
-        }
     } else {
-        wifi_prov_mgr_deinit();
-        log_i("Aleardy Provisioned");
+        log_i("Already Provisioned");
 #if ARDUHAL_LOG_LEVEL >= ARDUHAL_LOG_LEVEL_INFO
         static wifi_config_t conf;
         esp_wifi_get_config(WIFI_IF_STA,&conf);
         log_i("Attempting connect to AP: %s\n",conf.sta.ssid);
 #endif
-        esp_wifi_start();
+        esp_wifi_start();        
+        wifi_prov_mgr_deinit();
         WiFi.begin();
     }
 }

package/package_esp32_index.template.json

@@ -41,7 +41,7 @@
             {
               "packager": "esp32",
               "name": "esptool_py",
-              "version": "2.6.1"
+              "version": "3.0.0"
             },
             {
               "packager": "esp32",