Skip to content

Commit 34c81be

Browse files
me-no-devme-no-dev
committed
IDF master b86fe0c66c
1 parent 2fb2ef5 commit 34c81be

File tree

538 files changed

+17023
-4250
lines changed

Some content is hidden

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

538 files changed

+17023
-4250
lines changed

Diff for: ‎platform.txt

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

Diff for: ‎tools/platformio-build-esp32.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@
300300
"UNITY_INCLUDE_CONFIG_H",
301301
"WITH_POSIX",
302302
"_GNU_SOURCE",
303-
("IDF_VER", '\\"v4.4-dev-3235-g3e370c4296\\"'),
303+
("IDF_VER", '\\"v4.4-dev-3401-gb86fe0c66c\\"'),
304304
"ESP_PLATFORM",
305305
"ARDUINO_ARCH_ESP32",
306306
"ESP32",

Diff for: ‎tools/platformio-build-esp32c3.py

+11-2
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,15 @@
263263
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "wifi_provisioning", "include"),
264264
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp_littlefs", "src"),
265265
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp_littlefs", "include"),
266+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp-face", "include"),
267+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp-face", "include", "tool"),
268+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp-face", "include", "typedef"),
269+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp-face", "include", "image"),
270+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp-face", "include", "math"),
271+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp-face", "include", "nn"),
272+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp-face", "include", "layer"),
273+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp-face", "include", "detect"),
274+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp-face", "include", "model_zoo"),
266275
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "fb_gfx", "include"),
267276
join(FRAMEWORK_DIR, "cores", env.BoardConfig().get("build.core"))
268277
],
@@ -273,7 +282,7 @@
273282
],
274283

275284
LIBS=[
276-
"-lesp_ringbuf", "-lefuse", "-lesp_ipc", "-ldriver", "-lesp_pm", "-lmbedtls", "-lapp_update", "-lbootloader_support", "-lspi_flash", "-lnvs_flash", "-lpthread", "-lesp_gdbstub", "-lespcoredump", "-lesp_phy", "-lesp_system", "-lesp_rom", "-lhal", "-lvfs", "-lesp_eth", "-ltcpip_adapter", "-lesp_netif", "-lesp_event", "-lwpa_supplicant", "-lesp_wifi", "-llwip", "-llog", "-lheap", "-lsoc", "-lesp_hw_support", "-lriscv", "-lesp_common", "-lesp_timer", "-lfreertos", "-lnewlib", "-lcxx", "-lapp_trace", "-lasio", "-lbt", "-lcbor", "-lunity", "-lcmock", "-lcoap", "-lconsole", "-lnghttp", "-lesp-tls", "-lesp_adc_cal", "-lesp_hid", "-ltcp_transport", "-lesp_http_client", "-lesp_http_server", "-lesp_https_ota", "-lesp_https_server", "-lesp_lcd", "-lprotobuf-c", "-lprotocomm", "-lmdns", "-lesp_local_ctrl", "-lsdmmc", "-lesp_serial_slave_link", "-lesp_websocket_client", "-lexpat", "-lwear_levelling", "-lfatfs", "-lfreemodbus", "-ljsmn", "-ljson", "-llibsodium", "-lmqtt", "-lopenssl", "-lspiffs", "-lwifi_provisioning", "-lesp_littlefs", "-lfb_gfx", "-lasio", "-lcbor", "-lcmock", "-lunity", "-lcoap", "-lesp_lcd", "-lesp_local_ctrl", "-lesp_https_server", "-lesp_websocket_client", "-lexpat", "-lfreemodbus", "-ljsmn", "-llibsodium", "-lmqtt", "-lesp_adc_cal", "-lesp_hid", "-lfatfs", "-lwear_levelling", "-lopenssl", "-lspiffs", "-lwifi_provisioning", "-lprotocomm", "-lbt", "-lbtdm_app", "-lprotobuf-c", "-lmdns", "-lconsole", "-ljson", "-lesp_ringbuf", "-lefuse", "-lesp_ipc", "-ldriver", "-lesp_pm", "-lmbedtls", "-lapp_update", "-lbootloader_support", "-lspi_flash", "-lnvs_flash", "-lpthread", "-lesp_gdbstub", "-lespcoredump", "-lesp_phy", "-lesp_system", "-lesp_rom", "-lhal", "-lvfs", "-lesp_eth", "-ltcpip_adapter", "-lesp_netif", "-lesp_event", "-lwpa_supplicant", "-lesp_wifi", "-llwip", "-llog", "-lheap", "-lsoc", "-lesp_hw_support", "-lriscv", "-lesp_common", "-lesp_timer", "-lfreertos", "-lnewlib", "-lcxx", "-lapp_trace", "-lnghttp", "-lesp-tls", "-ltcp_transport", "-lesp_http_client", "-lesp_http_server", "-lesp_https_ota", "-lsdmmc", "-lesp_serial_slave_link", "-lmbedtls", "-lmbedcrypto", "-lmbedx509", "-lcoexist", "-lcore", "-lespnow", "-lmesh", "-lnet80211", "-lpp", "-lsmartconfig", "-lwapi", "-lesp_ringbuf", "-lefuse", "-lesp_ipc", "-ldriver", "-lesp_pm", "-lmbedtls", "-lapp_update", "-lbootloader_support", "-lspi_flash", "-lnvs_flash", "-lpthread", "-lesp_gdbstub", "-lespcoredump", "-lesp_phy", "-lesp_system", "-lesp_rom", "-lhal", "-lvfs", "-lesp_eth", "-ltcpip_adapter", "-lesp_netif", "-lesp_event", "-lwpa_supplicant", "-lesp_wifi", "-llwip", "-llog", "-lheap", "-lsoc", "-lesp_hw_support", "-lriscv", "-lesp_common", "-lesp_timer", "-lfreertos", "-lnewlib", "-lcxx", "-lapp_trace", "-lnghttp", "-lesp-tls", "-ltcp_transport", "-lesp_http_client", "-lesp_http_server", "-lesp_https_ota", "-lsdmmc", "-lesp_serial_slave_link", "-lmbedtls", "-lmbedcrypto", "-lmbedx509", "-lcoexist", "-lcore", "-lespnow", "-lmesh", "-lnet80211", "-lpp", "-lsmartconfig", "-lwapi", "-lesp_ringbuf", "-lefuse", "-lesp_ipc", "-ldriver", "-lesp_pm", "-lmbedtls", "-lapp_update", "-lbootloader_support", "-lspi_flash", "-lnvs_flash", "-lpthread", "-lesp_gdbstub", "-lespcoredump", "-lesp_phy", "-lesp_system", "-lesp_rom", "-lhal", "-lvfs", "-lesp_eth", "-ltcpip_adapter", "-lesp_netif", "-lesp_event", "-lwpa_supplicant", "-lesp_wifi", "-llwip", "-llog", "-lheap", "-lsoc", "-lesp_hw_support", "-lriscv", "-lesp_common", "-lesp_timer", "-lfreertos", "-lnewlib", "-lcxx", "-lapp_trace", "-lnghttp", "-lesp-tls", "-ltcp_transport", "-lesp_http_client", "-lesp_http_server", "-lesp_https_ota", "-lsdmmc", "-lesp_serial_slave_link", "-lmbedtls", "-lmbedcrypto", "-lmbedx509", "-lcoexist", "-lcore", "-lespnow", "-lmesh", "-lnet80211", "-lpp", "-lsmartconfig", "-lwapi", "-lesp_ringbuf", "-lefuse", "-lesp_ipc", "-ldriver", "-lesp_pm", "-lmbedtls", "-lapp_update", "-lbootloader_support", "-lspi_flash", "-lnvs_flash", "-lpthread", "-lesp_gdbstub", "-lespcoredump", "-lesp_phy", "-lesp_system", "-lesp_rom", "-lhal", "-lvfs", "-lesp_eth", "-ltcpip_adapter", "-lesp_netif", "-lesp_event", "-lwpa_supplicant", "-lesp_wifi", "-llwip", "-llog", "-lheap", "-lsoc", "-lesp_hw_support", "-lriscv", "-lesp_common", "-lesp_timer", "-lfreertos", "-lnewlib", "-lcxx", "-lapp_trace", "-lnghttp", "-lesp-tls", "-ltcp_transport", "-lesp_http_client", "-lesp_http_server", "-lesp_https_ota", "-lsdmmc", "-lesp_serial_slave_link", "-lmbedtls", "-lmbedcrypto", "-lmbedx509", "-lcoexist", "-lcore", "-lespnow", "-lmesh", "-lnet80211", "-lpp", "-lsmartconfig", "-lwapi", "-lesp_ringbuf", "-lefuse", "-lesp_ipc", "-ldriver", "-lesp_pm", "-lmbedtls", "-lapp_update", "-lbootloader_support", "-lspi_flash", "-lnvs_flash", "-lpthread", "-lesp_gdbstub", "-lespcoredump", "-lesp_phy", "-lesp_system", "-lesp_rom", "-lhal", "-lvfs", "-lesp_eth", "-ltcpip_adapter", "-lesp_netif", "-lesp_event", "-lwpa_supplicant", "-lesp_wifi", "-llwip", "-llog", "-lheap", "-lsoc", "-lesp_hw_support", "-lriscv", "-lesp_common", "-lesp_timer", "-lfreertos", "-lnewlib", "-lcxx", "-lapp_trace", "-lnghttp", "-lesp-tls", "-ltcp_transport", "-lesp_http_client", "-lesp_http_server", "-lesp_https_ota", "-lsdmmc", "-lesp_serial_slave_link", "-lmbedtls", "-lmbedcrypto", "-lmbedx509", "-lcoexist", "-lcore", "-lespnow", "-lmesh", "-lnet80211", "-lpp", "-lsmartconfig", "-lwapi", "-lesp_ringbuf", "-lefuse", "-lesp_ipc", "-ldriver", "-lesp_pm", "-lmbedtls", "-lapp_update", "-lbootloader_support", "-lspi_flash", "-lnvs_flash", "-lpthread", "-lesp_gdbstub", "-lespcoredump", "-lesp_phy", "-lesp_system", "-lesp_rom", "-lhal", "-lvfs", "-lesp_eth", "-ltcpip_adapter", "-lesp_netif", "-lesp_event", "-lwpa_supplicant", "-lesp_wifi", "-llwip", "-llog", "-lheap", "-lsoc", "-lesp_hw_support", "-lriscv", "-lesp_common", "-lesp_timer", "-lfreertos", "-lnewlib", "-lcxx", "-lapp_trace", "-lnghttp", "-lesp-tls", "-ltcp_transport", "-lesp_http_client", "-lesp_http_server", "-lesp_https_ota", "-lsdmmc", "-lesp_serial_slave_link", "-lmbedtls", "-lmbedcrypto", "-lmbedx509", "-lcoexist", "-lcore", "-lespnow", "-lmesh", "-lnet80211", "-lpp", "-lsmartconfig", "-lwapi", "-lphy", "-lbtbb", "-lesp_phy", "-lphy", "-lbtbb", "-lesp_phy", "-lphy", "-lbtbb", "-lm", "-lnewlib", "-lstdc++", "-lpthread", "-lgcc", "-lcxx", "-lapp_trace", "-lgcov", "-lapp_trace", "-lgcov", "-lc"
285+
"-lesp_ringbuf", "-lefuse", "-lesp_ipc", "-ldriver", "-lesp_pm", "-lmbedtls", "-lapp_update", "-lbootloader_support", "-lspi_flash", "-lnvs_flash", "-lpthread", "-lesp_gdbstub", "-lespcoredump", "-lesp_phy", "-lesp_system", "-lesp_rom", "-lhal", "-lvfs", "-lesp_eth", "-ltcpip_adapter", "-lesp_netif", "-lesp_event", "-lwpa_supplicant", "-lesp_wifi", "-llwip", "-llog", "-lheap", "-lsoc", "-lesp_hw_support", "-lriscv", "-lesp_common", "-lesp_timer", "-lfreertos", "-lnewlib", "-lcxx", "-lapp_trace", "-lasio", "-lbt", "-lcbor", "-lunity", "-lcmock", "-lcoap", "-lconsole", "-lnghttp", "-lesp-tls", "-lesp_adc_cal", "-lesp_hid", "-ltcp_transport", "-lesp_http_client", "-lesp_http_server", "-lesp_https_ota", "-lesp_https_server", "-lesp_lcd", "-lprotobuf-c", "-lprotocomm", "-lmdns", "-lesp_local_ctrl", "-lsdmmc", "-lesp_serial_slave_link", "-lesp_websocket_client", "-lexpat", "-lwear_levelling", "-lfatfs", "-lfreemodbus", "-ljsmn", "-ljson", "-llibsodium", "-lmqtt", "-lopenssl", "-lspiffs", "-lwifi_provisioning", "-lesp_littlefs", "-lfb_gfx", "-lasio", "-lcbor", "-lcmock", "-lunity", "-lcoap", "-lesp_lcd", "-lesp_local_ctrl", "-lesp_https_server", "-lesp_websocket_client", "-lexpat", "-lfreemodbus", "-ljsmn", "-llibsodium", "-lmqtt", "-lesp_adc_cal", "-lesp_hid", "-lfatfs", "-lwear_levelling", "-lopenssl", "-lspiffs", "-lwifi_provisioning", "-lprotocomm", "-lbt", "-lbtdm_app", "-lprotobuf-c", "-lmdns", "-lconsole", "-ljson", "-lcat_face_detect", "-lhuman_face_detect", "-ldl", "-lesp_ringbuf", "-lefuse", "-lesp_ipc", "-ldriver", "-lesp_pm", "-lmbedtls", "-lapp_update", "-lbootloader_support", "-lspi_flash", "-lnvs_flash", "-lpthread", "-lesp_gdbstub", "-lespcoredump", "-lesp_phy", "-lesp_system", "-lesp_rom", "-lhal", "-lvfs", "-lesp_eth", "-ltcpip_adapter", "-lesp_netif", "-lesp_event", "-lwpa_supplicant", "-lesp_wifi", "-llwip", "-llog", "-lheap", "-lsoc", "-lesp_hw_support", "-lriscv", "-lesp_common", "-lesp_timer", "-lfreertos", "-lnewlib", "-lcxx", "-lapp_trace", "-lnghttp", "-lesp-tls", "-ltcp_transport", "-lesp_http_client", "-lesp_http_server", "-lesp_https_ota", "-lsdmmc", "-lesp_serial_slave_link", "-lmbedtls", "-lmbedcrypto", "-lmbedx509", "-lcoexist", "-lcore", "-lespnow", "-lmesh", "-lnet80211", "-lpp", "-lsmartconfig", "-lwapi", "-lesp_ringbuf", "-lefuse", "-lesp_ipc", "-ldriver", "-lesp_pm", "-lmbedtls", "-lapp_update", "-lbootloader_support", "-lspi_flash", "-lnvs_flash", "-lpthread", "-lesp_gdbstub", "-lespcoredump", "-lesp_phy", "-lesp_system", "-lesp_rom", "-lhal", "-lvfs", "-lesp_eth", "-ltcpip_adapter", "-lesp_netif", "-lesp_event", "-lwpa_supplicant", "-lesp_wifi", "-llwip", "-llog", "-lheap", "-lsoc", "-lesp_hw_support", "-lriscv", "-lesp_common", "-lesp_timer", "-lfreertos", "-lnewlib", "-lcxx", "-lapp_trace", "-lnghttp", "-lesp-tls", "-ltcp_transport", "-lesp_http_client", "-lesp_http_server", "-lesp_https_ota", "-lsdmmc", "-lesp_serial_slave_link", "-lmbedtls", "-lmbedcrypto", "-lmbedx509", "-lcoexist", "-lcore", "-lespnow", "-lmesh", "-lnet80211", "-lpp", "-lsmartconfig", "-lwapi", "-lesp_ringbuf", "-lefuse", "-lesp_ipc", "-ldriver", "-lesp_pm", "-lmbedtls", "-lapp_update", "-lbootloader_support", "-lspi_flash", "-lnvs_flash", "-lpthread", "-lesp_gdbstub", "-lespcoredump", "-lesp_phy", "-lesp_system", "-lesp_rom", "-lhal", "-lvfs", "-lesp_eth", "-ltcpip_adapter", "-lesp_netif", "-lesp_event", "-lwpa_supplicant", "-lesp_wifi", "-llwip", "-llog", "-lheap", "-lsoc", "-lesp_hw_support", "-lriscv", "-lesp_common", "-lesp_timer", "-lfreertos", "-lnewlib", "-lcxx", "-lapp_trace", "-lnghttp", "-lesp-tls", "-ltcp_transport", "-lesp_http_client", "-lesp_http_server", "-lesp_https_ota", "-lsdmmc", "-lesp_serial_slave_link", "-lmbedtls", "-lmbedcrypto", "-lmbedx509", "-lcoexist", "-lcore", "-lespnow", "-lmesh", "-lnet80211", "-lpp", "-lsmartconfig", "-lwapi", "-lesp_ringbuf", "-lefuse", "-lesp_ipc", "-ldriver", "-lesp_pm", "-lmbedtls", "-lapp_update", "-lbootloader_support", "-lspi_flash", "-lnvs_flash", "-lpthread", "-lesp_gdbstub", "-lespcoredump", "-lesp_phy", "-lesp_system", "-lesp_rom", "-lhal", "-lvfs", "-lesp_eth", "-ltcpip_adapter", "-lesp_netif", "-lesp_event", "-lwpa_supplicant", "-lesp_wifi", "-llwip", "-llog", "-lheap", "-lsoc", "-lesp_hw_support", "-lriscv", "-lesp_common", "-lesp_timer", "-lfreertos", "-lnewlib", "-lcxx", "-lapp_trace", "-lnghttp", "-lesp-tls", "-ltcp_transport", "-lesp_http_client", "-lesp_http_server", "-lesp_https_ota", "-lsdmmc", "-lesp_serial_slave_link", "-lmbedtls", "-lmbedcrypto", "-lmbedx509", "-lcoexist", "-lcore", "-lespnow", "-lmesh", "-lnet80211", "-lpp", "-lsmartconfig", "-lwapi", "-lesp_ringbuf", "-lefuse", "-lesp_ipc", "-ldriver", "-lesp_pm", "-lmbedtls", "-lapp_update", "-lbootloader_support", "-lspi_flash", "-lnvs_flash", "-lpthread", "-lesp_gdbstub", "-lespcoredump", "-lesp_phy", "-lesp_system", "-lesp_rom", "-lhal", "-lvfs", "-lesp_eth", "-ltcpip_adapter", "-lesp_netif", "-lesp_event", "-lwpa_supplicant", "-lesp_wifi", "-llwip", "-llog", "-lheap", "-lsoc", "-lesp_hw_support", "-lriscv", "-lesp_common", "-lesp_timer", "-lfreertos", "-lnewlib", "-lcxx", "-lapp_trace", "-lnghttp", "-lesp-tls", "-ltcp_transport", "-lesp_http_client", "-lesp_http_server", "-lesp_https_ota", "-lsdmmc", "-lesp_serial_slave_link", "-lmbedtls", "-lmbedcrypto", "-lmbedx509", "-lcoexist", "-lcore", "-lespnow", "-lmesh", "-lnet80211", "-lpp", "-lsmartconfig", "-lwapi", "-lesp_ringbuf", "-lefuse", "-lesp_ipc", "-ldriver", "-lesp_pm", "-lmbedtls", "-lapp_update", "-lbootloader_support", "-lspi_flash", "-lnvs_flash", "-lpthread", "-lesp_gdbstub", "-lespcoredump", "-lesp_phy", "-lesp_system", "-lesp_rom", "-lhal", "-lvfs", "-lesp_eth", "-ltcpip_adapter", "-lesp_netif", "-lesp_event", "-lwpa_supplicant", "-lesp_wifi", "-llwip", "-llog", "-lheap", "-lsoc", "-lesp_hw_support", "-lriscv", "-lesp_common", "-lesp_timer", "-lfreertos", "-lnewlib", "-lcxx", "-lapp_trace", "-lnghttp", "-lesp-tls", "-ltcp_transport", "-lesp_http_client", "-lesp_http_server", "-lesp_https_ota", "-lsdmmc", "-lesp_serial_slave_link", "-lmbedtls", "-lmbedcrypto", "-lmbedx509", "-lcoexist", "-lcore", "-lespnow", "-lmesh", "-lnet80211", "-lpp", "-lsmartconfig", "-lwapi", "-lphy", "-lbtbb", "-lesp_phy", "-lphy", "-lbtbb", "-lesp_phy", "-lphy", "-lbtbb", "-lm", "-lnewlib", "-lstdc++", "-lpthread", "-lgcc", "-lcxx", "-lapp_trace", "-lgcov", "-lapp_trace", "-lgcov", "-lc"
277286
],
278287

279288
CPPDEFINES=[
@@ -282,7 +291,7 @@
282291
"UNITY_INCLUDE_CONFIG_H",
283292
"WITH_POSIX",
284293
"_GNU_SOURCE",
285-
("IDF_VER", '\\"v4.4-dev-3235-g3e370c4296\\"'),
294+
("IDF_VER", '\\"v4.4-dev-3401-gb86fe0c66c\\"'),
286295
"ESP_PLATFORM",
287296
"ARDUINO_ARCH_ESP32",
288297
"ESP32",

Diff for: ‎tools/platformio-build-esp32s2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@
286286
"UNITY_INCLUDE_CONFIG_H",
287287
"WITH_POSIX",
288288
"_GNU_SOURCE",
289-
("IDF_VER", '\\"v4.4-dev-3235-g3e370c4296\\"'),
289+
("IDF_VER", '\\"v4.4-dev-3401-gb86fe0c66c\\"'),
290290
"ESP_PLATFORM",
291291
"ARDUINO_ARCH_ESP32",
292292
"ESP32",

Diff for: ‎tools/sdk/esp32/include/asio/port/include/esp_asio_config.h

+5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@
1818
# define ASIO_NO_TYPEID
1919
# endif // CONFIG_COMPILER_RTTI
2020

21+
//
22+
// Supress OpenSSL deprecation warning, when building ASIO
23+
//
24+
#define ESP_OPENSSL_SUPPRESS_LEGACY_WARNING
25+
2126
//
2227
// LWIP compatibility inet and address macros/functions
2328
//

Diff for: ‎tools/sdk/esp32/include/coap/libcoap/include/coap3/coap_block_internal.h

+3
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,9 @@ int coap_handle_response_get_block(coap_context_t *context,
191191
void coap_block_delete_lg_xmit(coap_session_t *session,
192192
coap_lg_xmit_t *lg_xmit);
193193

194+
coap_tick_t coap_block_check_lg_xmit_timeouts(coap_session_t *session,
195+
coap_tick_t now);
196+
194197
/**
195198
* The function that does all the work for the coap_add_data_large*()
196199
* functions.

Diff for: ‎tools/sdk/esp32/include/coap/libcoap/include/coap3/coap_dtls.h

+6
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ typedef struct coap_dtls_pki_t coap_dtls_pki_t;
2727
#ifndef COAP_DTLS_HINT_LENGTH
2828
#define COAP_DTLS_HINT_LENGTH 128
2929
#endif
30+
#ifndef COAP_DTLS_MAX_PSK_IDENTITY
31+
#define COAP_DTLS_MAX_PSK_IDENTITY 64
32+
#endif
33+
#ifndef COAP_DTLS_MAX_PSK
34+
#define COAP_DTLS_MAX_PSK 64
35+
#endif
3036

3137
typedef enum coap_dtls_role_t {
3238
COAP_DTLS_ROLE_CLIENT, /**< Internal function invoked for client */

Diff for: ‎tools/sdk/esp32/include/coap/libcoap/include/coap3/coap_event.h

+14-14
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,34 @@
2424
* Scalar type to represent different events, e.g. DTLS events or
2525
* retransmission timeouts.
2626
*/
27-
typedef unsigned int coap_event_t;
28-
27+
typedef enum coap_event_t {
2928
/**
3029
* (D)TLS events for COAP_PROTO_DTLS and COAP_PROTO_TLS
3130
*/
32-
#define COAP_EVENT_DTLS_CLOSED 0x0000
33-
#define COAP_EVENT_DTLS_CONNECTED 0x01DE
34-
#define COAP_EVENT_DTLS_RENEGOTIATE 0x01DF
35-
#define COAP_EVENT_DTLS_ERROR 0x0200
31+
COAP_EVENT_DTLS_CLOSED = 0x0000,
32+
COAP_EVENT_DTLS_CONNECTED = 0x01DE,
33+
COAP_EVENT_DTLS_RENEGOTIATE = 0x01DF,
34+
COAP_EVENT_DTLS_ERROR = 0x0200,
3635

3736
/**
3837
* TCP events for COAP_PROTO_TCP and COAP_PROTO_TLS
3938
*/
40-
#define COAP_EVENT_TCP_CONNECTED 0x1001
41-
#define COAP_EVENT_TCP_CLOSED 0x1002
42-
#define COAP_EVENT_TCP_FAILED 0x1003
39+
COAP_EVENT_TCP_CONNECTED = 0x1001,
40+
COAP_EVENT_TCP_CLOSED = 0x1002,
41+
COAP_EVENT_TCP_FAILED = 0x1003,
4342

4443
/**
4544
* CSM exchange events for reliable protocols only
4645
*/
47-
#define COAP_EVENT_SESSION_CONNECTED 0x2001
48-
#define COAP_EVENT_SESSION_CLOSED 0x2002
49-
#define COAP_EVENT_SESSION_FAILED 0x2003
46+
COAP_EVENT_SESSION_CONNECTED = 0x2001,
47+
COAP_EVENT_SESSION_CLOSED = 0x2002,
48+
COAP_EVENT_SESSION_FAILED = 0x2003,
5049

5150
/**
52-
* BLOCK2 receive errors
51+
* (Q-)BLOCK receive errors
5352
*/
54-
#define COAP_EVENT_PARTIAL_BLOCK 0x3001
53+
COAP_EVENT_PARTIAL_BLOCK = 0x3001
54+
} coap_event_t;
5555

5656
/**
5757
* Type for event handler functions that can be registered with a CoAP

Diff for: ‎tools/sdk/esp32/include/coap/libcoap/include/coap3/coap_time.h

+4
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,11 @@ COAP_STATIC_INLINE uint64_t coap_ticks_to_rt_us(coap_tick_t t) {
8888
#elif defined(RIOT_VERSION)
8989
#include <xtimer.h>
9090

91+
#ifdef XTIMER_HZ
9192
#define COAP_TICKS_PER_SECOND (XTIMER_HZ)
93+
#else /* XTIMER_HZ */
94+
#define COAP_TICKS_PER_SECOND (XTIMER_HZ_BASE)
95+
#endif /* XTIMER_HZ */
9296

9397
typedef uint64_t coap_tick_t;
9498
typedef int64_t coap_tick_diff_t;

Diff for: ‎tools/sdk/esp32/include/coap/libcoap/include/coap3/net.h

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <stdlib.h>
1616
#include <string.h>
1717
#ifndef _WIN32
18+
#include <sys/select.h>
1819
#include <sys/time.h>
1920
#endif
2021
#include <time.h>

Diff for: ‎tools/sdk/esp32/include/coap/libcoap/include/coap3/pdu.h

-1
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ typedef enum coap_pdu_code_t {
299299
COAP_REQUEST_CODE_PATCH = COAP_REQUEST_PATCH,
300300
COAP_REQUEST_CODE_IPATCH = COAP_REQUEST_IPATCH,
301301

302-
COAP_RESPONSE_CODE_OK = COAP_RESPONSE_CODE(200),
303302
COAP_RESPONSE_CODE_CREATED = COAP_RESPONSE_CODE(201),
304303
COAP_RESPONSE_CODE_DELETED = COAP_RESPONSE_CODE(202),
305304
COAP_RESPONSE_CODE_VALID = COAP_RESPONSE_CODE(203),

Diff for: ‎tools/sdk/esp32/include/coap/libcoap/include/coap3/resource.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ typedef void (*coap_method_handler_t)
8383
* variable of coap_str_const_t has to point to constant text, or point to data
8484
* within the allocated coap_str_const_t parameter.
8585
*
86-
* @param uri_path The string URI path of the new resource.
86+
* @param uri_path The string URI path of the new resource. The leading '/' is
87+
* not normally required - e.g. just "full/path/for/resource".
8788
* @param flags Flags for memory management (in particular release of
8889
* memory). Possible values:@n
8990
*

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

+4-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#define CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT 1
2727
#define CONFIG_ESPTOOLPY_BAUD_OTHER_VAL 115200
2828
#define CONFIG_ESPTOOLPY_FLASHMODE_DIO 1
29+
#define CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR 1
2930
#define CONFIG_ESPTOOLPY_FLASHMODE "dio"
3031
#define CONFIG_ESPTOOLPY_FLASHFREQ_40M 1
3132
#define CONFIG_ESPTOOLPY_FLASHFREQ "40m"
@@ -369,6 +370,7 @@
369370
#define CONFIG_LWIP_GARP_TMR_INTERVAL 60
370371
#define CONFIG_LWIP_TCPIP_RECVMBOX_SIZE 32
371372
#define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
373+
#define CONFIG_LWIP_DHCP_OPTIONS_LEN 68
372374
#define CONFIG_LWIP_DHCPS 1
373375
#define CONFIG_LWIP_DHCPS_LEASE_UNIT 60
374376
#define CONFIG_LWIP_DHCPS_MAX_STATION_NUM 8
@@ -480,6 +482,7 @@
480482
#define CONFIG_MDNS_TASK_AFFINITY 0x0
481483
#define CONFIG_MDNS_SERVICE_ADD_TIMEOUT_MS 2000
482484
#define CONFIG_MDNS_TIMER_PERIOD_MS 100
485+
#define CONFIG_MDNS_MULTIPLE_INSTANCE 1
483486
#define CONFIG_MQTT_PROTOCOL_311 1
484487
#define CONFIG_MQTT_TRANSPORT_SSL 1
485488
#define CONFIG_MQTT_TRANSPORT_WEBSOCKET 1
@@ -675,5 +678,5 @@
675678
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
676679
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
677680
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
678-
#define CONFIG_ARDUINO_IDF_COMMIT "3e370c4296"
681+
#define CONFIG_ARDUINO_IDF_COMMIT "b86fe0c66c"
679682
#define CONFIG_ARDUINO_IDF_BRANCH "master"

0 commit comments

Comments
 (0)