IDF release/v4.0 acdba0eb4

platform.txt

@@ -35,7 +35,7 @@ compiler.S.flags=-c -g3 -x assembler-with-cpp -MMD -mlongcalls
 
 compiler.c.elf.cmd=xtensa-esp32-elf-gcc
 compiler.c.elf.flags=-nostdlib "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" -T esp32_out.ld -T esp32.project.ld -T esp32.peripherals.ld -T esp32.rom.ld -T esp32.rom.libgcc.ld -T esp32.rom.syscalls.ld -T esp32.rom.newlib-data.ld -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority -u call_user_start_cpu0 -u __cxa_guard_dummy -u ld_include_panic_highint_hdl -u newlib_include_locks_impl -u newlib_include_heap_impl -u newlib_include_syscalls_impl -u pthread_include_pthread_impl -u pthread_include_pthread_cond_impl -u pthread_include_pthread_local_storage_impl -fno-rtti -mfix-esp32-psram-cache-issue
-compiler.c.elf.libs=-lgcc -ltcpip_adapter -lmbedtls -lnet80211 -lsdmmc -lfd -lmesh -lapp_trace -lwpa_supplicant -ljsmn -lface_recognition -lmqtt -lapp_update -llwip -lsmartconfig -lesp_gdbstub -lopenssl -lbt -lconsole -ldl -lprotocomm -lasio -lspi_flash -lesp_http_server -lespcoredump -lcoexist -lesp_eth -lbtdm_app -lrtc -lnvs_flash -ltcp_transport -lesp32 -lesp32-camera -lfreertos -lxtensa -lvfs -lcoap -lpp -lwear_levelling -lcxx -lprotobuf-c -lcore -lfr -llog -limage_util -lulp -llibsodium -ldriver -lfreemodbus -lesp_https_ota -lheap -lspiffs -lhal -lesp_websocket_client -lesp_common -lfatfs -lespnow -ljson -lunity -lesp_wifi -lm -lfb_gfx -lesp_event -lesp-tls -lesp_local_ctrl -lesp_rom -lbootloader_support -lwifi_provisioning -lod -lpthread -lexpat -lface_detection -lmdns -lesp_http_client -lsoc -lesp_adc_cal -lnewlib -lefuse -lphy -lesp_ringbuf -lnghttp  -lc -lstdc++
+compiler.c.elf.libs=-lgcc -lexpat -ljson -lm -lmdns -lpthread -lrtc -lwear_levelling -limage_util -lfd -lmbedtls -lesp-tls -lnewlib -lhal -ltcpip_adapter -lesp_https_ota -lprotobuf-c -lesp_http_client -lesp_eth -lwifi_provisioning -lesp_common -lbt -lmesh -lvfs -lesp_websocket_client -lespcoredump -lasio -lheap -lesp_http_server -lnghttp -lcore -lsmartconfig -lxtensa -lcxx -lphy -lesp_gdbstub -lunity -lesp32 -lesp_local_ctrl -llwip -lcoap -lfreemodbus -llog -lprotocomm -lnet80211 -lmqtt -lesp_ringbuf -ldriver -lnvs_flash -lfreertos -lod -lfb_gfx -lsoc -lbootloader_support -lspiffs -lconsole -lesp_wifi -lesp_event -lfatfs -ltcp_transport -lesp32-camera -lspi_flash -lapp_update -llibsodium -lface_recognition -lpp -lbtdm_app -lfr -lespnow -lefuse -lsdmmc -lesp_adc_cal -lopenssl -lulp -lapp_trace -lwpa_supplicant -ljsmn -ldl -lcoexist -lface_detection -lesp_rom  -lc -lstdc++
 
 compiler.as.cmd=xtensa-esp32-elf-as
 

tools/platformio-build.py

@@ -186,7 +186,7 @@ env.Append(
     ],
 
     LIBS=[
-        "-lgcc", "-ltcpip_adapter", "-lmbedtls", "-lnet80211", "-lsdmmc", "-lfd", "-lmesh", "-lapp_trace", "-lwpa_supplicant", "-ljsmn", "-lface_recognition", "-lmqtt", "-lapp_update", "-llwip", "-lsmartconfig", "-lesp_gdbstub", "-lopenssl", "-lbt", "-lconsole", "-ldl", "-lprotocomm", "-lasio", "-lspi_flash", "-lesp_http_server", "-lespcoredump", "-lcoexist", "-lesp_eth", "-lbtdm_app", "-lrtc", "-lnvs_flash", "-ltcp_transport", "-lesp32", "-lesp32-camera", "-lfreertos", "-lxtensa", "-lvfs", "-lcoap", "-lpp", "-lwear_levelling", "-lcxx", "-lprotobuf-c", "-lcore", "-lfr", "-llog", "-limage_util", "-lulp", "-llibsodium", "-ldriver", "-lfreemodbus", "-lesp_https_ota", "-lheap", "-lspiffs", "-lhal", "-lesp_websocket_client", "-lesp_common", "-lfatfs", "-lespnow", "-ljson", "-lunity", "-lesp_wifi", "-lm", "-lfb_gfx", "-lesp_event", "-lesp-tls", "-lesp_local_ctrl", "-lesp_rom", "-lbootloader_support", "-lwifi_provisioning", "-lod", "-lpthread", "-lexpat", "-lface_detection", "-lmdns", "-lesp_http_client", "-lsoc", "-lesp_adc_cal", "-lnewlib", "-lefuse", "-lphy", "-lesp_ringbuf", "-lnghttp", "-lc", "-lstdc++"
+        "-lgcc", "-lexpat", "-ljson", "-lm", "-lmdns", "-lpthread", "-lrtc", "-lwear_levelling", "-limage_util", "-lfd", "-lmbedtls", "-lesp-tls", "-lnewlib", "-lhal", "-ltcpip_adapter", "-lesp_https_ota", "-lprotobuf-c", "-lesp_http_client", "-lesp_eth", "-lwifi_provisioning", "-lesp_common", "-lbt", "-lmesh", "-lvfs", "-lesp_websocket_client", "-lespcoredump", "-lasio", "-lheap", "-lesp_http_server", "-lnghttp", "-lcore", "-lsmartconfig", "-lxtensa", "-lcxx", "-lphy", "-lesp_gdbstub", "-lunity", "-lesp32", "-lesp_local_ctrl", "-llwip", "-lcoap", "-lfreemodbus", "-llog", "-lprotocomm", "-lnet80211", "-lmqtt", "-lesp_ringbuf", "-ldriver", "-lnvs_flash", "-lfreertos", "-lod", "-lfb_gfx", "-lsoc", "-lbootloader_support", "-lspiffs", "-lconsole", "-lesp_wifi", "-lesp_event", "-lfatfs", "-ltcp_transport", "-lesp32-camera", "-lspi_flash", "-lapp_update", "-llibsodium", "-lface_recognition", "-lpp", "-lbtdm_app", "-lfr", "-lespnow", "-lefuse", "-lsdmmc", "-lesp_adc_cal", "-lopenssl", "-lulp", "-lapp_trace", "-lwpa_supplicant", "-ljsmn", "-ldl", "-lcoexist", "-lface_detection", "-lesp_rom", "-lc", "-lstdc++"
     ],
 
     LIBSOURCE_DIRS=[

tools/sdk/include/config/sdkconfig.h

@@ -1987,5 +1987,5 @@
 #define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP
 #endif
 
-#define CONFIG_ARDUINO_IDF_COMMIT "a3f3c7bdc"
+#define CONFIG_ARDUINO_IDF_COMMIT "acdba0eb4"
 #define CONFIG_ARDUINO_IDF_BRANCH "release/v4.0"

tools/sdk/include/driver/driver/rtc_cntl.h

@@ -18,6 +18,10 @@
 #include "esp_err.h"
 #include "esp_intr_alloc.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @brief Register a handler for specific RTC_CNTL interrupts
  *
@@ -46,3 +50,7 @@ esp_err_t rtc_isr_register(intr_handler_t handler, void* handler_arg,
  *        handler_arg isn't registered
  */
 esp_err_t rtc_isr_deregister(intr_handler_t handler, void* handler_arg);
+
+#ifdef __cplusplus
+}
+#endif

tools/sdk/include/esp-face/dl_lib_matrix3d.h

@@ -7,8 +7,11 @@
 #include <math.h>
 #include <assert.h>
 
-#if CONFIG_ESP32_SPIRAM_SUPPORT
+#if CONFIG_SPIRAM_SUPPORT || CONFIG_ESP32_SPIRAM_SUPPORT
 #include "freertos/FreeRTOS.h"
+#define DL_SPIRAM_SUPPORT 1
+#else
+#define DL_SPIRAM_SUPPORT 0
 #endif
 
 #ifndef max
@@ -86,14 +89,14 @@ static void *dl_lib_calloc(int cnt, int size, int align)
     void *res = malloc(total_size);
     if (NULL == res)
     {
-#if CONFIG_ESP32_SPIRAM_SUPPORT
+#if DL_SPIRAM_SUPPORT
         res = heap_caps_malloc(total_size, MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM);
     }
     if (NULL == res)
     {
         printf("Item psram alloc failed. Size: %d x %d\n", cnt, size);
 #else
-        printf("Item alloc failed. Size: %d x %d, SPIRAM_FLAG: %d\n", cnt, size, CONFIG_ESP32_SPIRAM_SUPPORT);
+        printf("Item alloc failed. Size: %d x %d, SPIRAM_FLAG: %d\n", cnt, size, DL_SPIRAM_SUPPORT);
 #endif
         return NULL;
     }

tools/sdk/include/esp32/esp32/clk.h

@@ -15,6 +15,10 @@
 #pragma once
 #include <stdint.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @file esp32/clk.h
  *
@@ -85,3 +89,7 @@ int esp_clk_xtal_freq(void);
  * @return Value or RTC counter, expressed in microseconds
  */
 uint64_t esp_clk_rtc_time();
+
+#ifdef __cplusplus
+}
+#endif

tools/sdk/include/spi_flash/esp_flash_spi_init.h

@@ -17,6 +17,10 @@
 #include "hal/spi_types.h"
 #include "esp_flash.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /// Configurations for the SPI Flash to init
 typedef struct {
     spi_host_device_t host_id;      ///< Bus to use
@@ -53,3 +57,6 @@ esp_err_t spi_bus_add_flash_device(esp_flash_t **out_chip, const esp_flash_spi_d
  */
 esp_err_t spi_bus_remove_flash_device(esp_flash_t *chip);
 
+#ifdef __cplusplus
+}
+#endif