Skip to content

Commit 78b08ac

Browse files
committed
IDF release/v4.4 0c0d7bb1a3
1 parent 43c9bb2 commit 78b08ac

File tree

158 files changed

+171
-51
lines changed

Some content is hidden

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

158 files changed

+171
-51
lines changed

platform.txt

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

tools/platformio-build-esp32.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@
329329
"UNITY_INCLUDE_CONFIG_H",
330330
"WITH_POSIX",
331331
"_GNU_SOURCE",
332-
("IDF_VER", '\\"v4.4.4-235-gfee50c208a\\"'),
332+
("IDF_VER", '\\"v4.4.4-251-g0c0d7bb1a3\\"'),
333333
"ESP_PLATFORM",
334334
"_POSIX_READER_WRITER_LOCKS",
335335
"ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32c3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@
324324
"UNITY_INCLUDE_CONFIG_H",
325325
"WITH_POSIX",
326326
"_GNU_SOURCE",
327-
("IDF_VER", '\\"v4.4.4-235-gfee50c208a\\"'),
327+
("IDF_VER", '\\"v4.4.4-251-g0c0d7bb1a3\\"'),
328328
"ESP_PLATFORM",
329329
"_POSIX_READER_WRITER_LOCKS",
330330
"ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32s2.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@
310310
"UNITY_INCLUDE_CONFIG_H",
311311
"WITH_POSIX",
312312
"_GNU_SOURCE",
313-
("IDF_VER", '\\"v4.4.4-235-gfee50c208a\\"'),
313+
("IDF_VER", '\\"v4.4.4-251-g0c0d7bb1a3\\"'),
314314
"ESP_PLATFORM",
315315
"_POSIX_READER_WRITER_LOCKS",
316316
"ARDUINO_ARCH_ESP32",

tools/platformio-build-esp32s3.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@
328328
"UNITY_INCLUDE_CONFIG_H",
329329
"WITH_POSIX",
330330
"_GNU_SOURCE",
331-
("IDF_VER", '\\"v4.4.4-235-gfee50c208a\\"'),
331+
("IDF_VER", '\\"v4.4.4-251-g0c0d7bb1a3\\"'),
332332
"ESP_PLATFORM",
333333
"_POSIX_READER_WRITER_LOCKS",
334334
"ARDUINO_ARCH_ESP32",

tools/sdk/esp32/dio_qspi/include/sdkconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,8 @@
444444
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
445445
#define CONFIG_LWIP_ESP_GRATUITOUS_ARP 1
446446
#define CONFIG_LWIP_GARP_TMR_INTERVAL 60
447+
#define CONFIG_LWIP_ESP_MLDV6_REPORT 1
448+
#define CONFIG_LWIP_MLDV6_TMR_INTERVAL 40
447449
#define CONFIG_LWIP_TCPIP_RECVMBOX_SIZE 32
448450
#define CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID 1
449451
#define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
@@ -826,5 +828,5 @@
826828
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
827829
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
828830
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
829-
#define CONFIG_ARDUINO_IDF_COMMIT "fee50c208a"
831+
#define CONFIG_ARDUINO_IDF_COMMIT "0c0d7bb1a3"
830832
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32/dout_qspi/include/sdkconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,8 @@
444444
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
445445
#define CONFIG_LWIP_ESP_GRATUITOUS_ARP 1
446446
#define CONFIG_LWIP_GARP_TMR_INTERVAL 60
447+
#define CONFIG_LWIP_ESP_MLDV6_REPORT 1
448+
#define CONFIG_LWIP_MLDV6_TMR_INTERVAL 40
447449
#define CONFIG_LWIP_TCPIP_RECVMBOX_SIZE 32
448450
#define CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID 1
449451
#define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
@@ -826,5 +828,5 @@
826828
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
827829
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
828830
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
829-
#define CONFIG_ARDUINO_IDF_COMMIT "fee50c208a"
831+
#define CONFIG_ARDUINO_IDF_COMMIT "0c0d7bb1a3"
830832
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32/include/bt/host/bluedroid/api/include/api/esp_gap_ble_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1461,7 +1461,7 @@ esp_err_t esp_ble_gap_config_local_privacy (bool privacy_enable);
14611461
*
14621462
*
14631463
* @param[in] icon - External appearance value, these values are defined by the Bluetooth SIG, please refer to
1464-
* https://specificationrefs.bluetooth.com/assigned-values/Appearance%20Values.pdf
1464+
* https://www.bluetooth.com/specifications/assigned-numbers/
14651465
*
14661466
* @return
14671467
* - ESP_OK : success

tools/sdk/esp32/include/esp_netif/include/esp_netif_defaults.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,15 @@ extern "C" {
1717
// Macros to assemble master configs with partial configs from netif, stack and driver
1818
//
1919

20+
#ifdef CONFIG_LWIP_ESP_MLDV6_REPORT
21+
#define ESP_NETIF_DEFAULT_MLDV6_REPORT_FLAGS (ESP_NETIF_FLAG_MLDV6_REPORT)
22+
#else
23+
#define ESP_NETIF_DEFAULT_MLDV6_REPORT_FLAGS (0)
24+
#endif
25+
2026
#define ESP_NETIF_INHERENT_DEFAULT_WIFI_STA() \
2127
{ \
22-
.flags = (esp_netif_flags_t)(ESP_NETIF_DHCP_CLIENT | ESP_NETIF_FLAG_GARP | ESP_NETIF_FLAG_EVENT_IP_MODIFIED), \
28+
.flags = (esp_netif_flags_t)(ESP_NETIF_DHCP_CLIENT | ESP_NETIF_FLAG_GARP | ESP_NETIF_DEFAULT_MLDV6_REPORT_FLAGS | ESP_NETIF_FLAG_EVENT_IP_MODIFIED), \
2329
ESP_COMPILER_DESIGNATED_INIT_AGGREGATE_TYPE_EMPTY(mac) \
2430
ESP_COMPILER_DESIGNATED_INIT_AGGREGATE_TYPE_EMPTY(ip_info) \
2531
.get_ip_event = IP_EVENT_STA_GOT_IP, \

tools/sdk/esp32/include/esp_netif/include/esp_netif_types.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ extern "C" {
3333
#define ESP_ERR_ESP_NETIF_DNS_NOT_CONFIGURED ESP_ERR_ESP_NETIF_BASE + 0x0A
3434
#define ESP_ERR_ESP_NETIF_MLD6_FAILED ESP_ERR_ESP_NETIF_BASE + 0x0B
3535
#define ESP_ERR_ESP_NETIF_IP6_ADDR_FAILED ESP_ERR_ESP_NETIF_BASE + 0x0C
36+
#define ESP_ERR_ESP_NETIF_DHCPS_START_FAILED ESP_ERR_ESP_NETIF_BASE + 0x0D
3637

3738

3839
/** @brief Type of esp_netif_object server */
@@ -154,6 +155,7 @@ typedef enum esp_netif_flags {
154155
ESP_NETIF_FLAG_EVENT_IP_MODIFIED = 1 << 4,
155156
ESP_NETIF_FLAG_IS_PPP = 1 << 5,
156157
ESP_NETIF_FLAG_IS_SLIP = 1 << 6,
158+
ESP_NETIF_FLAG_MLDV6_REPORT = 1 << 7,
157159
} esp_netif_flags_t;
158160

159161
typedef enum esp_netif_ip_event_type {

tools/sdk/esp32/include/lwip/include/apps/dhcpserver/dhcpserver.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "sdkconfig.h"
1818
#include "lwip/ip_addr.h"
19+
#include "lwip/err.h"
1920

2021
#ifdef __cplusplus
2122
extern "C" {
@@ -86,7 +87,7 @@ static inline bool dhcps_dns_enabled (dhcps_offer_t offer)
8687
return (offer & OFFER_DNS) != 0;
8788
}
8889

89-
void dhcps_start(struct netif *netif, ip4_addr_t ip);
90+
err_t dhcps_start(struct netif *netif, ip4_addr_t ip);
9091
void dhcps_stop(struct netif *netif);
9192
void *dhcps_option_info(u8_t op_id, u32_t opt_len);
9293
void dhcps_set_option_info(u8_t op_id, void *opt_info, u32_t opt_len);

tools/sdk/esp32/include/lwip/port/esp32/include/lwipopts.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,6 +822,16 @@ static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
822822
*/
823823
#define LWIP_ND6_NUM_NEIGHBORS CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS
824824

825+
826+
/**
827+
* ESP_MLDV6_REPORT==1: This option allows to send mldv6 report periodically.
828+
*/
829+
#ifdef CONFIG_LWIP_ESP_MLDV6_REPORT
830+
#define ESP_MLDV6_REPORT 1
831+
#else
832+
#define ESP_MLDV6_REPORT 0
833+
#endif
834+
825835
/*
826836
---------------------------------------
827837
---------- Hook options ---------------

tools/sdk/esp32/ld/sections.ld

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

tools/sdk/esp32/lib/libapp_update.a

0 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libesp_common.a

100 Bytes
Binary file not shown.
132 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libesp_eth.a

88 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libesp_event.a

224 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libesp_hid.a

664 Bytes
Binary file not shown.
48 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libesp_insights.a

184 Bytes
Binary file not shown.
48 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libesp_netif.a

4.42 KB
Binary file not shown.

tools/sdk/esp32/lib/libesp_phy.a

48 Bytes
Binary file not shown.
964 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libesp_system.a

0 Bytes
Binary file not shown.
44 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libesp_wifi.a

312 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libfreemodbus.a

96 Bytes
Binary file not shown.

tools/sdk/esp32/lib/liblwip.a

3.94 KB
Binary file not shown.

tools/sdk/esp32/lib/libmdns.a

220 Bytes
Binary file not shown.

tools/sdk/esp32/lib/libmqtt.a

92 Bytes
Binary file not shown.
276 Bytes
Binary file not shown.

tools/sdk/esp32/lib/librtc_store.a

48 Bytes
Binary file not shown.
48 Bytes
Binary file not shown.
284 Bytes
Binary file not shown.
788 Bytes
Binary file not shown.

tools/sdk/esp32/qio_qspi/include/sdkconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,8 @@
444444
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
445445
#define CONFIG_LWIP_ESP_GRATUITOUS_ARP 1
446446
#define CONFIG_LWIP_GARP_TMR_INTERVAL 60
447+
#define CONFIG_LWIP_ESP_MLDV6_REPORT 1
448+
#define CONFIG_LWIP_MLDV6_TMR_INTERVAL 40
447449
#define CONFIG_LWIP_TCPIP_RECVMBOX_SIZE 32
448450
#define CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID 1
449451
#define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
@@ -826,5 +828,5 @@
826828
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
827829
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
828830
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
829-
#define CONFIG_ARDUINO_IDF_COMMIT "fee50c208a"
831+
#define CONFIG_ARDUINO_IDF_COMMIT "0c0d7bb1a3"
830832
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32/qout_qspi/include/sdkconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,8 @@
444444
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
445445
#define CONFIG_LWIP_ESP_GRATUITOUS_ARP 1
446446
#define CONFIG_LWIP_GARP_TMR_INTERVAL 60
447+
#define CONFIG_LWIP_ESP_MLDV6_REPORT 1
448+
#define CONFIG_LWIP_MLDV6_TMR_INTERVAL 40
447449
#define CONFIG_LWIP_TCPIP_RECVMBOX_SIZE 32
448450
#define CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID 1
449451
#define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
@@ -826,5 +828,5 @@
826828
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
827829
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
828830
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
829-
#define CONFIG_ARDUINO_IDF_COMMIT "fee50c208a"
831+
#define CONFIG_ARDUINO_IDF_COMMIT "0c0d7bb1a3"
830832
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32/sdkconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1227,6 +1227,8 @@ CONFIG_LWIP_IP6_FRAG=y
12271227
CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
12281228
CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
12291229
CONFIG_LWIP_GARP_TMR_INTERVAL=60
1230+
CONFIG_LWIP_ESP_MLDV6_REPORT=y
1231+
CONFIG_LWIP_MLDV6_TMR_INTERVAL=40
12301232
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
12311233
# CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
12321234
# CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set

tools/sdk/esp32c3/dio_qspi/include/sdkconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,8 @@
436436
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
437437
#define CONFIG_LWIP_ESP_GRATUITOUS_ARP 1
438438
#define CONFIG_LWIP_GARP_TMR_INTERVAL 60
439+
#define CONFIG_LWIP_ESP_MLDV6_REPORT 1
440+
#define CONFIG_LWIP_MLDV6_TMR_INTERVAL 40
439441
#define CONFIG_LWIP_TCPIP_RECVMBOX_SIZE 32
440442
#define CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID 1
441443
#define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
@@ -830,5 +832,5 @@
830832
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
831833
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
832834
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
833-
#define CONFIG_ARDUINO_IDF_COMMIT "fee50c208a"
835+
#define CONFIG_ARDUINO_IDF_COMMIT "0c0d7bb1a3"
834836
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32c3/dout_qspi/include/sdkconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,8 @@
436436
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
437437
#define CONFIG_LWIP_ESP_GRATUITOUS_ARP 1
438438
#define CONFIG_LWIP_GARP_TMR_INTERVAL 60
439+
#define CONFIG_LWIP_ESP_MLDV6_REPORT 1
440+
#define CONFIG_LWIP_MLDV6_TMR_INTERVAL 40
439441
#define CONFIG_LWIP_TCPIP_RECVMBOX_SIZE 32
440442
#define CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID 1
441443
#define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
@@ -830,5 +832,5 @@
830832
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
831833
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
832834
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
833-
#define CONFIG_ARDUINO_IDF_COMMIT "fee50c208a"
835+
#define CONFIG_ARDUINO_IDF_COMMIT "0c0d7bb1a3"
834836
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32c3/include/bt/host/bluedroid/api/include/api/esp_gap_ble_api.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1461,7 +1461,7 @@ esp_err_t esp_ble_gap_config_local_privacy (bool privacy_enable);
14611461
*
14621462
*
14631463
* @param[in] icon - External appearance value, these values are defined by the Bluetooth SIG, please refer to
1464-
* https://specificationrefs.bluetooth.com/assigned-values/Appearance%20Values.pdf
1464+
* https://www.bluetooth.com/specifications/assigned-numbers/
14651465
*
14661466
* @return
14671467
* - ESP_OK : success

tools/sdk/esp32c3/include/esp_netif/include/esp_netif_defaults.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,15 @@ extern "C" {
1717
// Macros to assemble master configs with partial configs from netif, stack and driver
1818
//
1919

20+
#ifdef CONFIG_LWIP_ESP_MLDV6_REPORT
21+
#define ESP_NETIF_DEFAULT_MLDV6_REPORT_FLAGS (ESP_NETIF_FLAG_MLDV6_REPORT)
22+
#else
23+
#define ESP_NETIF_DEFAULT_MLDV6_REPORT_FLAGS (0)
24+
#endif
25+
2026
#define ESP_NETIF_INHERENT_DEFAULT_WIFI_STA() \
2127
{ \
22-
.flags = (esp_netif_flags_t)(ESP_NETIF_DHCP_CLIENT | ESP_NETIF_FLAG_GARP | ESP_NETIF_FLAG_EVENT_IP_MODIFIED), \
28+
.flags = (esp_netif_flags_t)(ESP_NETIF_DHCP_CLIENT | ESP_NETIF_FLAG_GARP | ESP_NETIF_DEFAULT_MLDV6_REPORT_FLAGS | ESP_NETIF_FLAG_EVENT_IP_MODIFIED), \
2329
ESP_COMPILER_DESIGNATED_INIT_AGGREGATE_TYPE_EMPTY(mac) \
2430
ESP_COMPILER_DESIGNATED_INIT_AGGREGATE_TYPE_EMPTY(ip_info) \
2531
.get_ip_event = IP_EVENT_STA_GOT_IP, \

tools/sdk/esp32c3/include/esp_netif/include/esp_netif_types.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ extern "C" {
3333
#define ESP_ERR_ESP_NETIF_DNS_NOT_CONFIGURED ESP_ERR_ESP_NETIF_BASE + 0x0A
3434
#define ESP_ERR_ESP_NETIF_MLD6_FAILED ESP_ERR_ESP_NETIF_BASE + 0x0B
3535
#define ESP_ERR_ESP_NETIF_IP6_ADDR_FAILED ESP_ERR_ESP_NETIF_BASE + 0x0C
36+
#define ESP_ERR_ESP_NETIF_DHCPS_START_FAILED ESP_ERR_ESP_NETIF_BASE + 0x0D
3637

3738

3839
/** @brief Type of esp_netif_object server */
@@ -154,6 +155,7 @@ typedef enum esp_netif_flags {
154155
ESP_NETIF_FLAG_EVENT_IP_MODIFIED = 1 << 4,
155156
ESP_NETIF_FLAG_IS_PPP = 1 << 5,
156157
ESP_NETIF_FLAG_IS_SLIP = 1 << 6,
158+
ESP_NETIF_FLAG_MLDV6_REPORT = 1 << 7,
157159
} esp_netif_flags_t;
158160

159161
typedef enum esp_netif_ip_event_type {

tools/sdk/esp32c3/include/lwip/include/apps/dhcpserver/dhcpserver.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include "sdkconfig.h"
1818
#include "lwip/ip_addr.h"
19+
#include "lwip/err.h"
1920

2021
#ifdef __cplusplus
2122
extern "C" {
@@ -86,7 +87,7 @@ static inline bool dhcps_dns_enabled (dhcps_offer_t offer)
8687
return (offer & OFFER_DNS) != 0;
8788
}
8889

89-
void dhcps_start(struct netif *netif, ip4_addr_t ip);
90+
err_t dhcps_start(struct netif *netif, ip4_addr_t ip);
9091
void dhcps_stop(struct netif *netif);
9192
void *dhcps_option_info(u8_t op_id, u32_t opt_len);
9293
void dhcps_set_option_info(u8_t op_id, void *opt_info, u32_t opt_len);

tools/sdk/esp32c3/include/lwip/port/esp32/include/lwipopts.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -822,6 +822,16 @@ static inline uint32_t timeout_from_offered(uint32_t lease, uint32_t min)
822822
*/
823823
#define LWIP_ND6_NUM_NEIGHBORS CONFIG_LWIP_IPV6_ND6_NUM_NEIGHBORS
824824

825+
826+
/**
827+
* ESP_MLDV6_REPORT==1: This option allows to send mldv6 report periodically.
828+
*/
829+
#ifdef CONFIG_LWIP_ESP_MLDV6_REPORT
830+
#define ESP_MLDV6_REPORT 1
831+
#else
832+
#define ESP_MLDV6_REPORT 0
833+
#endif
834+
825835
/*
826836
---------------------------------------
827837
---------- Hook options ---------------

tools/sdk/esp32c3/lib/libapp_update.a

0 Bytes
Binary file not shown.

tools/sdk/esp32c3/lib/libesp_common.a

152 Bytes
Binary file not shown.
216 Bytes
Binary file not shown.

tools/sdk/esp32c3/lib/libesp_eth.a

140 Bytes
Binary file not shown.

tools/sdk/esp32c3/lib/libesp_event.a

348 Bytes
Binary file not shown.

tools/sdk/esp32c3/lib/libesp_hid.a

1008 Bytes
Binary file not shown.
72 Bytes
Binary file not shown.
288 Bytes
Binary file not shown.
68 Bytes
Binary file not shown.

tools/sdk/esp32c3/lib/libesp_netif.a

7.95 KB
Binary file not shown.

tools/sdk/esp32c3/lib/libesp_phy.a

68 Bytes
Binary file not shown.
1.46 KB
Binary file not shown.

tools/sdk/esp32c3/lib/libesp_system.a

0 Bytes
Binary file not shown.
72 Bytes
Binary file not shown.

tools/sdk/esp32c3/lib/libesp_wifi.a

492 Bytes
Binary file not shown.

tools/sdk/esp32c3/lib/libfreemodbus.a

144 Bytes
Binary file not shown.

tools/sdk/esp32c3/lib/liblwip.a

5.87 KB
Binary file not shown.

tools/sdk/esp32c3/lib/libmdns.a

208 Bytes
Binary file not shown.

tools/sdk/esp32c3/lib/libmqtt.a

140 Bytes
Binary file not shown.
440 Bytes
Binary file not shown.

tools/sdk/esp32c3/lib/librtc_store.a

72 Bytes
Binary file not shown.
76 Bytes
Binary file not shown.
428 Bytes
Binary file not shown.
1.25 KB
Binary file not shown.

tools/sdk/esp32c3/qio_qspi/include/sdkconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,8 @@
436436
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
437437
#define CONFIG_LWIP_ESP_GRATUITOUS_ARP 1
438438
#define CONFIG_LWIP_GARP_TMR_INTERVAL 60
439+
#define CONFIG_LWIP_ESP_MLDV6_REPORT 1
440+
#define CONFIG_LWIP_MLDV6_TMR_INTERVAL 40
439441
#define CONFIG_LWIP_TCPIP_RECVMBOX_SIZE 32
440442
#define CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID 1
441443
#define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
@@ -830,5 +832,5 @@
830832
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
831833
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
832834
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
833-
#define CONFIG_ARDUINO_IDF_COMMIT "fee50c208a"
835+
#define CONFIG_ARDUINO_IDF_COMMIT "0c0d7bb1a3"
834836
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32c3/qout_qspi/include/sdkconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,8 @@
436436
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
437437
#define CONFIG_LWIP_ESP_GRATUITOUS_ARP 1
438438
#define CONFIG_LWIP_GARP_TMR_INTERVAL 60
439+
#define CONFIG_LWIP_ESP_MLDV6_REPORT 1
440+
#define CONFIG_LWIP_MLDV6_TMR_INTERVAL 40
439441
#define CONFIG_LWIP_TCPIP_RECVMBOX_SIZE 32
440442
#define CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID 1
441443
#define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
@@ -830,5 +832,5 @@
830832
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
831833
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
832834
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
833-
#define CONFIG_ARDUINO_IDF_COMMIT "fee50c208a"
835+
#define CONFIG_ARDUINO_IDF_COMMIT "0c0d7bb1a3"
834836
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32c3/sdkconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1283,6 +1283,8 @@ CONFIG_LWIP_IP6_FRAG=y
12831283
CONFIG_LWIP_ETHARP_TRUST_IP_MAC=y
12841284
CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
12851285
CONFIG_LWIP_GARP_TMR_INTERVAL=60
1286+
CONFIG_LWIP_ESP_MLDV6_REPORT=y
1287+
CONFIG_LWIP_MLDV6_TMR_INTERVAL=40
12861288
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32
12871289
# CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
12881290
# CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set

tools/sdk/esp32s2/dio_qspi/include/sdkconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,8 @@
339339
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
340340
#define CONFIG_LWIP_ESP_GRATUITOUS_ARP 1
341341
#define CONFIG_LWIP_GARP_TMR_INTERVAL 60
342+
#define CONFIG_LWIP_ESP_MLDV6_REPORT 1
343+
#define CONFIG_LWIP_MLDV6_TMR_INTERVAL 40
342344
#define CONFIG_LWIP_TCPIP_RECVMBOX_SIZE 32
343345
#define CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID 1
344346
#define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
@@ -692,5 +694,5 @@
692694
#define CONFIG_USB_MSC_BUFSIZE CONFIG_TINYUSB_MSC_BUFSIZE
693695
#define CONFIG_USB_MSC_ENABLED CONFIG_TINYUSB_MSC_ENABLED
694696
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
695-
#define CONFIG_ARDUINO_IDF_COMMIT "fee50c208a"
697+
#define CONFIG_ARDUINO_IDF_COMMIT "0c0d7bb1a3"
696698
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32s2/dout_qspi/include/sdkconfig.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,8 @@
339339
#define CONFIG_LWIP_ETHARP_TRUST_IP_MAC 1
340340
#define CONFIG_LWIP_ESP_GRATUITOUS_ARP 1
341341
#define CONFIG_LWIP_GARP_TMR_INTERVAL 60
342+
#define CONFIG_LWIP_ESP_MLDV6_REPORT 1
343+
#define CONFIG_LWIP_MLDV6_TMR_INTERVAL 40
342344
#define CONFIG_LWIP_TCPIP_RECVMBOX_SIZE 32
343345
#define CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID 1
344346
#define CONFIG_LWIP_DHCP_RESTORE_LAST_IP 1
@@ -692,5 +694,5 @@
692694
#define CONFIG_USB_MSC_BUFSIZE CONFIG_TINYUSB_MSC_BUFSIZE
693695
#define CONFIG_USB_MSC_ENABLED CONFIG_TINYUSB_MSC_ENABLED
694696
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
695-
#define CONFIG_ARDUINO_IDF_COMMIT "fee50c208a"
697+
#define CONFIG_ARDUINO_IDF_COMMIT "0c0d7bb1a3"
696698
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

tools/sdk/esp32s2/include/arduino_tinyusb/tinyusb/src/class/hid/hid_host.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* The MIT License (MIT)
33
*
44
* Copyright (c) 2019 Ha Thach (tinyusb.org)
@@ -106,7 +106,7 @@ bool tuh_hid_receive_report(uint8_t dev_addr, uint8_t instance);
106106

107107
// Send report using interrupt endpoint
108108
// If report_id > 0 (composite), it will be sent as 1st byte, then report contents. Otherwise only report content is sent.
109-
//void tuh_hid_send_report(uint8_t dev_addr, uint8_t instance, uint8_t report_id, uint8_t const* report, uint16_t len);
109+
bool tuh_hid_send_report(uint8_t dev_addr, uint8_t instance, uint8_t report_id, const void* report, uint16_t len);
110110

111111
//--------------------------------------------------------------------+
112112
// Callbacks (Weak is optional)

tools/sdk/esp32s2/include/esp_netif/include/esp_netif_defaults.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,15 @@ extern "C" {
1717
// Macros to assemble master configs with partial configs from netif, stack and driver
1818
//
1919

20+
#ifdef CONFIG_LWIP_ESP_MLDV6_REPORT
21+
#define ESP_NETIF_DEFAULT_MLDV6_REPORT_FLAGS (ESP_NETIF_FLAG_MLDV6_REPORT)
22+
#else
23+
#define ESP_NETIF_DEFAULT_MLDV6_REPORT_FLAGS (0)
24+
#endif
25+
2026
#define ESP_NETIF_INHERENT_DEFAULT_WIFI_STA() \
2127
{ \
22-
.flags = (esp_netif_flags_t)(ESP_NETIF_DHCP_CLIENT | ESP_NETIF_FLAG_GARP | ESP_NETIF_FLAG_EVENT_IP_MODIFIED), \
28+
.flags = (esp_netif_flags_t)(ESP_NETIF_DHCP_CLIENT | ESP_NETIF_FLAG_GARP | ESP_NETIF_DEFAULT_MLDV6_REPORT_FLAGS | ESP_NETIF_FLAG_EVENT_IP_MODIFIED), \
2329
ESP_COMPILER_DESIGNATED_INIT_AGGREGATE_TYPE_EMPTY(mac) \
2430
ESP_COMPILER_DESIGNATED_INIT_AGGREGATE_TYPE_EMPTY(ip_info) \
2531
.get_ip_event = IP_EVENT_STA_GOT_IP, \

0 commit comments

Comments
 (0)