Skip to content

Commit 442c63a

Browse files
authored
IDF release/v3.3 b4c075169 (#4604)
esp-face: master 420fc7e esp32-camera: master 0107093
1 parent d1a4b3b commit 442c63a

Some content is hidden

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

76 files changed

+35
-28
lines changed

Diff for: platform.txt

+1-1
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.project.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 -lapp_trace -lconsole -lulp -lwpa_supplicant -lfreertos -lbt -lmicro-ecc -lesp32-camera -lcxx -lxtensa-debug-module -ltcp_transport -lod -lmdns -ldetection -lvfs -lpe -lesp_websocket_client -lespcoredump -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 -ldl -lspiffs -lface_detection -lefuse -lunity -lesp_https_server -lespnow -lnvs_flash -lesp_adc_cal -llog -ldetection_cat_face -lsmartconfig_ack -lexpat -lm -lfr -lmqtt -lc -lheap -lmbedtls -llwip -lnet80211 -lesp_http_server -lpthread -ljson -lesp_https_ota -lfd -lstdc++
38+
compiler.c.elf.libs=-lgcc -lespcoredump -lesp_event -lheap -lpe -lmesh -lm -lesp_http_client -lfb_gfx -lface_detection -lesp_adc_cal -ldetection_cat_face -lmbedtls -lunity -lspiffs -lod -lapp_trace -llog -lesp_websocket_client -lexpat -lwpa2 -lxtensa-debug-module -lnet80211 -lhal -lvfs -lwps -lmqtt -lasio -lbt -lwpa_supplicant -lpp -lmdns -llwip -lnvs_flash -lc -lbootloader_support -lnewlib -lsdmmc -lapp_update -lethernet -lefuse -lprotobuf-c -ldetection -lfreemodbus -lcore -lface_recognition -lfd -lcoap -ljsmn -lesp_https_ota -ltcp_transport -lbtdm_app -lesp_ringbuf -ldriver -lwifi_provisioning -llibsodium -lopenssl -lfatfs -lnghttp -lespnow -lprotocomm -lspi_flash -lc_nano -lulp -lesp_http_server -lesp32-camera -lsmartconfig -lsmartconfig_ack -lesp-tls -lcoexist -lmicro-ecc -lesp_https_server -lwpa -ltcpip_adapter -lwear_levelling -lfreertos -lsoc -ljson -lesp32 -lpthread -lcxx -lfr -ldl -lphy -limage_util -lrtc -lconsole -lstdc++
3939

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

Diff for: tools/platformio-build.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171
],
172172

173173
LIBS=[
174-
"-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", "-lod", "-lmdns", "-ldetection", "-lvfs", "-lpe", "-lesp_websocket_client", "-lespcoredump", "-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", "-ldl", "-lspiffs", "-lface_detection", "-lefuse", "-lunity", "-lesp_https_server", "-lespnow", "-lnvs_flash", "-lesp_adc_cal", "-llog", "-ldetection_cat_face", "-lsmartconfig_ack", "-lexpat", "-lm", "-lfr", "-lmqtt", "-lc", "-lheap", "-lmbedtls", "-llwip", "-lnet80211", "-lesp_http_server", "-lpthread", "-ljson", "-lesp_https_ota", "-lfd", "-lstdc++"
174+
"-lgcc", "-lespcoredump", "-lesp_event", "-lheap", "-lpe", "-lmesh", "-lm", "-lesp_http_client", "-lfb_gfx", "-lface_detection", "-lesp_adc_cal", "-ldetection_cat_face", "-lmbedtls", "-lunity", "-lspiffs", "-lod", "-lapp_trace", "-llog", "-lesp_websocket_client", "-lexpat", "-lwpa2", "-lxtensa-debug-module", "-lnet80211", "-lhal", "-lvfs", "-lwps", "-lmqtt", "-lasio", "-lbt", "-lwpa_supplicant", "-lpp", "-lmdns", "-llwip", "-lnvs_flash", "-lc", "-lbootloader_support", "-lnewlib", "-lsdmmc", "-lapp_update", "-lethernet", "-lefuse", "-lprotobuf-c", "-ldetection", "-lfreemodbus", "-lcore", "-lface_recognition", "-lfd", "-lcoap", "-ljsmn", "-lesp_https_ota", "-ltcp_transport", "-lbtdm_app", "-lesp_ringbuf", "-ldriver", "-lwifi_provisioning", "-llibsodium", "-lopenssl", "-lfatfs", "-lnghttp", "-lespnow", "-lprotocomm", "-lspi_flash", "-lc_nano", "-lulp", "-lesp_http_server", "-lesp32-camera", "-lsmartconfig", "-lsmartconfig_ack", "-lesp-tls", "-lcoexist", "-lmicro-ecc", "-lesp_https_server", "-lwpa", "-ltcpip_adapter", "-lwear_levelling", "-lfreertos", "-lsoc", "-ljson", "-lesp32", "-lpthread", "-lcxx", "-lfr", "-ldl", "-lphy", "-limage_util", "-lrtc", "-lconsole", "-lstdc++"
175175
],
176176

177177
LIBSOURCE_DIRS=[

Diff for: tools/sdk/bin/bootloader_dio_40m.bin

128 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_dio_80m.bin

144 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_dout_40m.bin

128 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_dout_80m.bin

144 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_qio_40m.bin

128 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_qio_80m.bin

128 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_qout_40m.bin

128 Bytes
Binary file not shown.

Diff for: tools/sdk/bin/bootloader_qout_80m.bin

128 Bytes
Binary file not shown.

Diff for: tools/sdk/include/config/sdkconfig.h

+3-1
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
#define CONFIG_MBEDTLS_PSK_MODES 1
145145
#define CONFIG_GATTS_SEND_SERVICE_CHANGE_AUTO 1
146146
#define CONFIG_LWIP_DHCPS_LEASE_UNIT 60
147+
#define CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION 1
147148
#define CONFIG_EFUSE_MAX_BLK_LEN 192
148149
#define CONFIG_SPIFFS_USE_MAGIC 1
149150
#define CONFIG_OV7725_SUPPORT 1
@@ -171,6 +172,7 @@
171172
#define CONFIG_ESP32_REV_MIN_0 1
172173
#define CONFIG_LOG_DEFAULT_LEVEL 1
173174
#define CONFIG_TIMER_QUEUE_LENGTH 10
175+
#define CONFIG_ARDUINO_LOOP_STACK_SIZE 8192
174176
#define CONFIG_ESP32_REV_MIN 0
175177
#define CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT 1
176178
#define CONFIG_GATTS_SEND_SERVICE_CHANGE_MODE 0
@@ -393,5 +395,5 @@
393395
#define CONFIG_BTDM_MODEM_SLEEP_MODE_ORIG 1
394396
#define CONFIG_ARDUHAL_LOG_DEFAULT_LEVEL_ERROR 1
395397
#define CONFIG_FATFS_API_ENCODING_ANSI_OEM 1
396-
#define CONFIG_ARDUINO_IDF_COMMIT "c33fc7821"
398+
#define CONFIG_ARDUINO_IDF_COMMIT "b4c075169"
397399
#define CONFIG_ARDUINO_IDF_BRANCH "release/v3.3"

Diff for: tools/sdk/include/wpa_supplicant/wpa/wpa_debug.h

+24-22
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,11 @@ void wpa_debug_close_file(void);
4747
*/
4848
void wpa_debug_print_timestamp(void);
4949

50+
#if CONFIG_WPA_DEBUG_PRINT
51+
#define DEBUG_PRINT
52+
#endif
53+
54+
#ifdef DEBUG_PRINT
5055
/**
5156
* wpa_printf - conditional printf
5257
* @level: priority level (MSG_*) of the message
@@ -58,21 +63,7 @@ void wpa_debug_print_timestamp(void);
5863
*
5964
* Note: New line '\n' is added to the end of the text when printing to stdout.
6065
*/
61-
#define DEBUG_PRINT
62-
#define MSG_PRINT
6366

64-
/**
65-
* wpa_hexdump - conditional hex dump
66-
* @level: priority level (MSG_*) of the message
67-
* @title: title of for the message
68-
* @buf: data buffer to be dumped
69-
* @len: length of the buf
70-
*
71-
* This function is used to print conditional debugging and error messages. The
72-
* output may be directed to stdout, stderr, and/or syslog based on
73-
* configuration. The contents of buf is printed out has hex dump.
74-
*/
75-
#ifdef DEBUG_PRINT
7667
#define wpa_printf(level,fmt, args...) ESP_LOG_LEVEL_LOCAL(level, TAG, fmt, ##args)
7768

7869
static inline void wpa_hexdump_ascii(int level, const char *title, const u8 *buf, size_t len)
@@ -84,7 +75,17 @@ static inline void wpa_hexdump_ascii_key(int level, const char *title, const u8
8475
{
8576
}
8677

87-
78+
/**
79+
* wpa_hexdump - conditional hex dump
80+
* @level: priority level (MSG_*) of the message
81+
* @title: title of for the message
82+
* @buf: data buffer to be dumped
83+
* @len: length of the buf
84+
*
85+
* This function is used to print conditional debugging and error messages. The
86+
* output may be directed to stdout, stderr, and/or syslog based on
87+
* configuration. The contents of buf is printed out has hex dump.
88+
*/
8889
void wpa_hexdump(int level, const char *title, const u8 *buf, size_t len);
8990

9091
static inline void wpa_hexdump_buf(int level, const char *title,
@@ -148,13 +149,14 @@ void wpa_hexdump_ascii(int level, const char *title, const u8 *buf,
148149
void wpa_hexdump_ascii_key(int level, const char *title, const u8 *buf,
149150
size_t len);
150151
#else
151-
#define wpa_printf(level,fmt, args...)
152-
#define wpa_hexdump(...)
153-
#define wpa_hexdump_buf(...)
154-
#define wpa_hexdump_key(...)
155-
#define wpa_hexdump_buf_key(...)
156-
#define wpa_hexdump_ascii(...)
157-
#define wpa_hexdump_ascii_key(...)
152+
#define wpa_printf(level,fmt, args...) do {} while(0)
153+
#define wpa_hexdump(...) do {} while(0)
154+
#define wpa_dump_mem(...) do {} while(0)
155+
#define wpa_hexdump_buf(...) do {} while(0)
156+
#define wpa_hexdump_key(...) do {} while(0)
157+
#define wpa_hexdump_buf_key(...) do {} while(0)
158+
#define wpa_hexdump_ascii(...) do {} while(0)
159+
#define wpa_hexdump_ascii_key(...) do {} while(0)
158160
#endif
159161

160162
#define wpa_auth_logger

Diff for: tools/sdk/ld/esp32.project.ld

+3-3
Large diffs are not rendered by default.

Diff for: tools/sdk/lib/libapp_trace.a

360 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libapp_update.a

528 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libasio.a

1.04 KB
Binary file not shown.

Diff for: tools/sdk/lib/libbootloader_support.a

3.25 KB
Binary file not shown.

Diff for: tools/sdk/lib/libbt.a

61.2 KB
Binary file not shown.

Diff for: tools/sdk/lib/libcoap.a

3.25 KB
Binary file not shown.

Diff for: tools/sdk/lib/libconsole.a

736 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libcxx.a

1.03 KB
Binary file not shown.

Diff for: tools/sdk/lib/libdriver.a

7.63 KB
Binary file not shown.

Diff for: tools/sdk/lib/libefuse.a

1.05 KB
Binary file not shown.

Diff for: tools/sdk/lib/libesp-tls.a

452 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libesp32-camera.a

2.74 KB
Binary file not shown.

Diff for: tools/sdk/lib/libesp32.a

11.3 KB
Binary file not shown.

Diff for: tools/sdk/lib/libesp_adc_cal.a

240 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libesp_event.a

824 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libesp_http_client.a

1.08 KB
Binary file not shown.

Diff for: tools/sdk/lib/libesp_http_server.a

2.08 KB
Binary file not shown.

Diff for: tools/sdk/lib/libesp_https_ota.a

396 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libesp_https_server.a

368 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libesp_ringbuf.a

276 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libesp_websocket_client.a

388 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libespcoredump.a

512 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libethernet.a

1.64 KB
Binary file not shown.

Diff for: tools/sdk/lib/libexpat.a

456 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libface_detection.a

196 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libface_recognition.a

460 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libfatfs.a

2.31 KB
Binary file not shown.

Diff for: tools/sdk/lib/libfb_gfx.a

136 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libfreemodbus.a

2.6 KB
Binary file not shown.

Diff for: tools/sdk/lib/libfreertos.a

2.74 KB
Binary file not shown.

Diff for: tools/sdk/lib/libheap.a

1.41 KB
Binary file not shown.

Diff for: tools/sdk/lib/libimage_util.a

208 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libjsmn.a

124 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libjson.a

268 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/liblibsodium.a

11.9 KB
Binary file not shown.

Diff for: tools/sdk/lib/liblog.a

276 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/liblwip.a

18.3 KB
Binary file not shown.

Diff for: tools/sdk/lib/libmbedtls.a

11.3 KB
Binary file not shown.

Diff for: tools/sdk/lib/libmdns.a

1.16 KB
Binary file not shown.

Diff for: tools/sdk/lib/libmicro-ecc.a

116 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libmqtt.a

1.16 KB
Binary file not shown.

Diff for: tools/sdk/lib/libnewlib.a

1.9 KB
Binary file not shown.

Diff for: tools/sdk/lib/libnghttp.a

4.45 KB
Binary file not shown.

Diff for: tools/sdk/lib/libnvs_flash.a

4.33 KB
Binary file not shown.

Diff for: tools/sdk/lib/libopenssl.a

1.34 KB
Binary file not shown.

Diff for: tools/sdk/lib/libprotobuf-c.a

180 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libprotocomm.a

3.32 KB
Binary file not shown.

Diff for: tools/sdk/lib/libpthread.a

824 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libsdmmc.a

1.91 KB
Binary file not shown.

Diff for: tools/sdk/lib/libsmartconfig_ack.a

364 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libsoc.a

2.67 KB
Binary file not shown.

Diff for: tools/sdk/lib/libspi_flash.a

1.42 KB
Binary file not shown.

Diff for: tools/sdk/lib/libspiffs.a

1.41 KB
Binary file not shown.

Diff for: tools/sdk/lib/libtcp_transport.a

1.57 KB
Binary file not shown.

Diff for: tools/sdk/lib/libtcpip_adapter.a

444 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libulp.a

560 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libunity.a

624 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libvfs.a

868 Bytes
Binary file not shown.

Diff for: tools/sdk/lib/libwear_levelling.a

1.84 KB
Binary file not shown.

Diff for: tools/sdk/lib/libwifi_provisioning.a

3.13 KB
Binary file not shown.

Diff for: tools/sdk/lib/libwpa_supplicant.a

-79.9 KB
Binary file not shown.

Diff for: tools/sdk/lib/libxtensa-debug-module.a

300 Bytes
Binary file not shown.

Diff for: tools/sdk/sdkconfig

+3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ CONFIG_ARDUINO_RUN_CORE0=
2929
CONFIG_ARDUINO_RUN_CORE1=y
3030
CONFIG_ARDUINO_RUN_NO_AFFINITY=
3131
CONFIG_ARDUINO_RUNNING_CORE=1
32+
CONFIG_ARDUINO_LOOP_STACK_SIZE=8192
3233
CONFIG_ARDUINO_EVENT_RUN_CORE0=
3334
CONFIG_ARDUINO_EVENT_RUN_CORE1=y
3435
CONFIG_ARDUINO_EVENT_RUN_NO_AFFINITY=
@@ -693,6 +694,7 @@ CONFIG_LWIP_LOOPBACK_MAX_PBUFS=8
693694
CONFIG_LWIP_TCP_ISN_HOOK=y
694695
CONFIG_LWIP_MAX_ACTIVE_TCP=16
695696
CONFIG_LWIP_MAX_LISTENING_TCP=16
697+
CONFIG_LWIP_TCP_HIGH_SPEED_RETRANSMISSION=y
696698
CONFIG_TCP_MAXRTX=12
697699
CONFIG_TCP_SYNMAXRTX=6
698700
CONFIG_TCP_MSS=1436
@@ -951,3 +953,4 @@ CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
951953
# Supplicant
952954
#
953955
CONFIG_WPA_WPS_WARS=
956+
CONFIG_WPA_DEBUG_PRINT=

0 commit comments

Comments
 (0)