8000 Update IDF to v3.2 977854975 (#2771) · Girgitt/arduino-esp32@0acf19a · GitHub
[go: up one dir, main page]
Skip to content

Commit 0acf19a

Browse files
me-no-devme-no-dev
authored
Update IDF to v3.2 977854975 (espressif#2771)
* Update IDF to v3.2 977854975 * Update app_httpd.cpp
1 parent aff2e42 commit 0acf19a
  • esp32
  • esp_http_client
  • idf_test
  • newlib/sys
  • soc/soc
  • tcp_transport
  • vfs
  • lib
  • sdkconfig

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    105 files changed

    +518
    -1050
    lines changed

    ‎libraries/ESP32/examples/Camera/CameraWebServer/app_httpd.cpp

    Lines changed: 0 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -20,7 +20,6 @@
    2020

    2121
    #include "fb_gfx.h"
    2222
    #include "fd_forward.h"
    23-
    #include "dl_lib.h"
    2423
    #include "fr_forward.h"
    2524

    2625
    #define ENROLL_CONFIRM_TIMES 5

    ‎platform.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -35,7 +35,7 @@ compiler.S.flags=-c -g3 -x assembler-with-cpp -MMD -mlongcalls
    3535

    3636
    compiler.c.elf.cmd=xtensa-esp32-elf-gcc
    3737
    compiler.c.elf.flags=-nostdlib "-L{compiler.sdk.path}/lib" "-L{compiler.sdk.path}/ld" -T esp32_out.ld -T esp32.common.ld -T esp32.rom.ld -T esp32.peripherals.ld -T esp32.rom.libgcc.ld -T esp32.rom.spiram_incompatible_fns.ld -u ld_include_panic_highint_hdl -u call_user_start_cpu0 -Wl,--gc-sections -Wl,-static -Wl,--undefined=uxTopUsedPriority -u __cxa_guard_dummy -u __cxx_fatal_exception
    38-
    compiler.c.elf.libs=-lgcc -lopenssl -lbtdm_app -lfatfs -lwps -lcoexist -lwear_levelling -lesp_http_client -lprotobuf-c -lhal -lnewlib -ldriver -lbootloader_support -lpp -lfreemodbus -lmesh -lsmartconfig -ljsmn -lwpa -lethernet -lphy -lfrmn -lapp_trace -lfr_coefficients -lconsole -lulp -lwpa_supplicant -lfreertos -lbt -lmicro-ecc -lesp32-camera -lcxx -lxtensa-debug-module -ltcp_transport -lmdns -lvfs -lmtmn -lesp_ringbuf -lsoc -lcore -lfb_gfx -lsdmmc -llibsodium -lcoap -ltcpip_adapter -lprotocomm -lesp_event -limage_util -lc_nano -lesp-tls -lasio -lrtc -lspi_flash -lwpa2 -lwifi_provisioning -lesp32 -lface_recognition -lapp_update -lnghttp -lspiffs -lface_detection -lespnow -lnvs_flash -lesp_adc_cal -llog -ldl_lib -lsmartconfig_ack -lexpat -lfd_coefficients -lm -lmqtt -lc -lheap -lmbedtls -llwip -lnet80211 -lesp_http_server -lpthread -ljson -lesp_https_ota -lstdc++
    38+
    compiler.c.elf.libs=-lgcc -lopenssl -lbtdm_app -lfatfs -lwps -lcoexist -lwear_levelling -lesp_http_client -lprotobuf-c -lhal -lnewlib -ldriver -lbootloader_support -lpp -lfreemodbus -lmesh -lsmartconfig -ljsmn -lwpa -lethernet -lphy -lapp_trace -lconsole -lulp -lwpa_supplicant -lfreertos -lbt -lmicro-ecc -lesp32-camera -lcxx -lxtensa-debug-module -ltcp_transport -lmdns -lvfs -lesp_ringbuf -lsoc -lcore -lfb_gfx -lsdmmc -llibsodium -lcoap -ltcpip_adapter -lprotocomm -lesp_event -limage_util -lc_nano -lesp-tls -lasio -lrtc -lspi_flash -lwpa2 -lwifi_provisioning -lesp32 -lface_recognition -lapp_update -lnghttp -lspiffs -lface_detection -lespnow -lnvs_flash -lesp_adc_cal -llog -ldl_lib -lsmartconfig_ack -lexpat -lm -lfr -lmqtt -lc -lheap -lmbedtls -llwip -lnet80211 -lesp_http_server -lpthread -ljson -lesp_https_ota -lfd -lstdc++
    3939

    4040
    compiler.as.cmd=xtensa-esp32-elf-as
    4141

    ‎tools/platformio-build.py

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -99,7 +99,7 @@
    9999
    ],
    100100

    101101
    CPPPATH=[
    102-
    join(FRAMEWORK_DIR, "tools", "sdk", "include", "config"),
    102+
    join(FRAMEWORK_DIR, "tools", "sdk", "include", "config"),
    103103
    join(FRAMEWORK_DIR, "tools", "sdk", "include", "app_trace"),
    104104
    join(FRAMEWORK_DIR, "tools", "sdk", "include", "app_update"),
    105105
    join(FRAMEWORK_DIR, "tools", "sdk", "include", "asio"),
    @@ -164,7 +164,7 @@
    164164
    ],
    165165

    166166
    LIBS=[
    167-
    "-lgcc", "-lopenssl", "-lbtdm_app", "-lfatfs", "-lwps", "-lcoexist", "-lwear_levelling", "-lesp_http_client", "-lprotobuf-c", "-lhal", "-lnewlib", "-ldriver", "-lbootloader_support", "-lpp", "-lfreemodbus", "-lmesh", "-lsmartconfig", "-ljsmn", "-lwpa", "-lethernet", "-lphy", "-lfrmn", "-lapp_trace", "-lfr_coefficients", "-lconsole", "-lulp", "-lwpa_supplicant", "-lfreertos", "-lbt", "-lmicro-ecc", "-lesp32-camera", "-lcxx", "-lxtensa-debug-module", "-ltcp_transport", "-lmdns", "-lvfs", "-lmtmn", "-lesp_ringbuf", "-lsoc", "-lcore", "-lfb_gfx", "-lsdmmc", "-llibsodium", "-lcoap", "-ltcpip_adapter", "-lprotocomm", "-lesp_event", "-limage_util", "-lc_nano", "-lesp-tls", "-lasio", "-lrtc", "-lspi_flash", "-lwpa2", "-lwifi_provisioning", "-lesp32", "-lface_recognition", "-lapp_update", "-lnghttp", "-lspiffs", "-lface_detection", "-lespnow", "-lnvs_flash", "-lesp_adc_cal", "-llog", "-ldl_lib", "-lsmartconfig_ack", "-lexpat", "-lfd_coefficients", "-lm", "-lmqtt", "-lc", "-lheap", "-lmbedtls", "-llwip", "-lnet80211", "-lesp_http_server", "-lpthread", "-ljson", "-lesp_https_ota", "-lstdc++"
    167+
    "-lgcc", "-lopenssl", "-lbtdm_app", "-lfatfs", "-lwps", "-lcoexist", "-lwear_levelling", "-lesp_http_client", "-lprotobuf-c", "-lhal", "-lnewlib", "-ldriver", "-lbootloader_support", "-lpp", "-lfreemodbus", "-lmesh", "-lsmartconfig", "-ljsmn", "-lwpa", "-lethernet", "-lphy", "-lapp_trace", "-lconsole", "-lulp", "-lwpa_supplicant", "-lfreertos", "-lbt", "-lmicro-ecc", "-lesp32-camera", "-lcxx", "-lxtensa-debug-module", "-ltcp_transport", "-lmdns", "-lvfs", "-lesp_ringbuf", "-lsoc", "-lcore", "-lfb_gfx", "-lsdmmc", "-llibsodium", "-lcoap", "-ltcpip_adapter", "-lprotocomm", "-lesp_event", "-limage_util", "-lc_nano", "-lesp-tls", "-lasio", "-lrtc", "-lspi_flash", "-lwpa2", "-lwifi_provisioning", "-lesp32", "-lface_recognition", "-lapp_update", "-lnghttp", "-lspiffs", "-lface_detection", "-lespnow", "-lnvs_flash", "-lesp_adc_cal", "-llog", "-ldl_lib", "-lsmartconfig_ack", "-lexpat", "-lm", "-lfr", "-lmqtt", "-lc", "-lheap", "-lmbedtls", "-llwip", "-lnet80211", "-lesp_http_server", "-lpthread", "-ljson", "-lesp_https_ota", "-lfd", "-lstdc++"
    168168
    ],
    169169

    170170
    LIBSOURCE_DIRS=[

    ‎tools/sdk/bin/bootloader_dio_40m.bin

    -1.48 KB
    Binary file not shown.

    ‎tools/sdk/bin/bootloader_qout_40m.bin

    0 Bytes
    Binary file not shown.

    ‎tools/sdk/include/bt/esp_gap_ble_api.h

    Lines changed: 11 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -584,12 +584,18 @@ typedef enum {
    584584
    typedef enum {
    585585
    ESP_BLE_DUPLICATE_SCAN_EXCEPTIONAL_INFO_ADV_ADDR = 0, /*!< BLE advertising address , device info will be added into ESP_BLE_DUPLICATE_SCAN_EXCEPTIONAL_ADDR_LIST */
    586586
    ESP_BLE_DUPLICATE_SCAN_EXCEPTIONAL_INFO_MESH_LINK_ID, /*!< BLE mesh link ID, it is for BLE mesh, device info will be added into ESP_BLE_DUPLICATE_SCAN_EXCEPTIONAL_MESH_LINK_ID_LIST */
    587+
    ESP_BLE_DUPLICATE_SCAN_EXCEPTIONAL_INFO_MESH_BEACON_TYPE, /*!< BLE mesh beacon AD type, the format is | Len | 0x2B | Beacon Type | Beacon Data | */
    588+
    ESP_BLE_DUPLICATE_SCAN_EXCEPTIONAL_INFO_MESH_PROV_SRV_ADV, /*!< BLE mesh provisioning service uuid, the format is | 0x02 | 0x01 | flags | 0x03 | 0x03 | 0x1827 | .... |` */
    589+
    ESP_BLE_DUPLICATE_SCAN_EXCEPTIONAL_INFO_MESH_PROXY_SRV_ADV, /*!< BLE mesh adv with proxy service uuid, the format is | 0x02 | 0x01 | flags | 0x03 | 0x03 | 0x1828 | .... |` */
    587590
    } esp_ble_duplicate_exceptional_info_type_t;
    588591

    589592
    typedef enum {
    590-
    ESP_BLE_DUPLICATE_SCAN_EXCEPTIONAL_ADDR_LIST = BLE_BIT(0), /*!< duplicate scan exceptional addr list */
    591-
    ESP_BLE_DUPLICATE_SCAN_EXCEPTIONAL_MESH_LINK_ID_LIST = BLE_BIT(1), /*!< duplicate scan exceptional mesh link ID list */
    592-
    ESP_BLE_DUPLICATE_SCAN_EXCEPTIONAL_ALL_LIST = (BLE_BIT(0) | BLE_BIT(1)), /*!< duplicate scan exceptional all list */
    593+
    ESP_BLE_DUPLICATE_SCAN_EXCEPTIONAL_ADDR_LIST = BLE_BIT(0), /*!< duplicate scan exceptional addr list */
    594+
    ESP_BLE_DUPLICATE_SCAN_EXCEPTIONAL_MESH_LINK_ID_LIST = BLE_BIT(1), /*!< duplicate scan exceptional mesh link ID list */
    595+
    ESP_BLE_DUPLICATE_SCAN_EXCEPTIONAL_MESH_BEACON_TYPE_LIST = BLE_BIT(2), /*!< duplicate scan exceptional mesh beacon type list */
    596+
    ESP_BLE_DUPLICATE_SCAN_EXCEPTIONAL_MESH_PROV_SRV_ADV_LIST = BLE_BIT(3), /*!< duplicate scan exceptional mesh adv with provisioning service uuid */
    597+
    ESP_BLE_DUPLICATE_SCAN_EXCEPTIONAL_MESH_PROXY_SRV_ADV_LIST = BLE_BIT(4), /*!< duplicate scan exceptional mesh adv with provisioning service uuid */
    598+
    ESP_BLE_DUPLICATE_SCAN_EXCEPTIONAL_ALL_LIST = 0xFFFF, /*!< duplicate scan exceptional all list */
    593599
    } esp_duplicate_scan_exceptional_list_type_t;
    594600

    595601
    typedef uint8_t esp_duplicate_info_t[ESP_BD_ADDR_LEN];
    @@ -1046,6 +1052,7 @@ esp_err_t esp_ble_gap_read_rssi(esp_bd_addr_t remote_addr);
    10461052
    *
    10471053
    *
    10481054
    * @param[in] type: device info type, it is defined in esp_ble_duplicate_exceptional_info_type_t
    1055+
    * when type is MESH_BEACON_TYPE, MESH_PROV_SRV_ADV or MESH_PROXY_SRV_ADV , device_info is invalid.
    10491056
    * @param[in] device_info: the device information.
    10501057
    * @return
    10511058
    * - ESP_OK : success
    @@ -1058,6 +1065,7 @@ esp_err_t esp_ble_gap_add_duplicate_scan_exceptional_device(esp_ble_duplicate_ex
    10581065
    *
    10591066
    *
    10601067
    * @param[in] type: device info type, it is defined in esp_ble_duplicate_exceptional_info_type_t
    1068+
    * when type is MESH_BEACON_TYPE, MESH_PROV_SRV_ADV or MESH_PROXY_SRV_ADV , device_info is invalid.
    10611069
    * @param[in] device_info: the device information.
    10621070
    * @return
    10631071
    * - ESP_OK : success

    ‎tools/sdk/include/config/sdkconfig.h

    Lines changed: 2 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -190,8 +190,8 @@
    190190
    #define CONFIG_MBEDTLS_SSL_PROTO_TLS1_1 1
    191191
    #define CONFIG_LWIP_SO_REUSE_RXTOALL 1
    192192
    #define CONFIG_MB_CONTROLLER_NOTIFY_TIMEOUT 20
    193+
    #define CONFIG_ESP32_WIFI_MGMT_SBUF_NUM 32
    193194
    #define CONFIG_PARTITION_TABLE_SINGLE_APP 1
    194-
    #define CONFIG_XTENSA_IMPL 1
    195195
    #define CONFIG_ESP32_WIFI_RX_BA_WIN 16
    196196
    #define CONFIG_MBEDTLS_X509_CSR_PARSE_C 1
    197197
    #define CONFIG_SPIFFS_USE_MTIME 1
    @@ -278,6 +278,7 @@
    278278
    #define CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED 1
    279279
    #define CONFIG_MONITOR_BAUD 115200
    280280
    #define CONFIG_ESP32_DEBUG_STUBS_ENABLE 1
    281+
    #define CONFIG_BLE_ESTABLISH_LINK_CONNECTION_TIMEOUT 30
    281282
    #define CONFIG_TCPIP_LWIP 1
    282283
    #define CONFIG_WIFI_LWIP_ALLOCATION_FROM_SPIRAM_FIRST 1
    283284
    #define CONFIG_REDUCE_PHY_TX_POWER 1

    0 commit comments

    Comments
     (0)
    0