Skip to content

Commit ced5069

Browse files
me-no-devme-no-dev
committed
IDF release/v5.1 cd4714dd01
1 parent da253aa commit ced5069

File tree

220 files changed

+1900
-748
lines changed

Some content is hidden

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

220 files changed

+1900
-748
lines changed

‎esp32/dio_qspi/include/sdkconfig.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,7 @@
609609
#define CONFIG_ESP_WIFI_SLP_DEFAULT_MAX_ACTIVE_TIME 10
610610
#define CONFIG_ESP_WIFI_SLP_DEFAULT_WAIT_BROADCAST_DATA_TIME 15
611611
#define CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE 1
612+
#define CONFIG_ESP_WIFI_GMAC_SUPPORT 1
612613
#define CONFIG_ESP_WIFI_SOFTAP_SUPPORT 1
613614
#define CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM 7
614615
#define CONFIG_ESP_WIFI_MBEDTLS_CRYPTO 1
@@ -1175,5 +1176,5 @@
11751176
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
11761177
#define CONFIG_WPA_MBEDTLS_CRYPTO CONFIG_ESP_WIFI_MBEDTLS_CRYPTO
11771178
#define CONFIG_WPA_MBEDTLS_TLS_CLIENT CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
1178-
#define CONFIG_ARDUINO_IDF_COMMIT "dc859c1e67"
1179+
#define CONFIG_ARDUINO_IDF_COMMIT "cd4714dd01"
11791180
#define CONFIG_ARDUINO_IDF_BRANCH "release/v5.1"

‎esp32/flags/defines

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-DESP_PLATFORM -DIDF_VER=\"v5.1.4-497-gdc859c1e67-dirty\" -DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\" -DSOC_MMU_PAGE_SIZE=CONFIG_MMU_PAGE_SIZE -DUNITY_INCLUDE_CONFIG_H -D_GNU_SOURCE -D_POSIX_READER_WRITER_LOCKS -DconfigENABLE_FREERTOS_DEBUG_OCDAWARE=1 -DTF_LITE_STATIC_MEMORY
1+
-DESP_PLATFORM -DIDF_VER=\"v5.1.4-545-gcd4714dd01-dirty\" -DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\" -DSOC_MMU_PAGE_SIZE=CONFIG_MMU_PAGE_SIZE -DUNITY_INCLUDE_CONFIG_H -D_GNU_SOURCE -D_POSIX_READER_WRITER_LOCKS -DconfigENABLE_FREERTOS_DEBUG_OCDAWARE=1 -DTF_LITE_STATIC_MEMORY

‎esp32/include/bt/include/esp32/include/esp_bt.h

+307-224
Large diffs are not rendered by default.

‎esp32/include/driver/deprecated/driver/rmt.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -152,10 +152,10 @@ esp_err_t rmt_set_tx_carrier(rmt_channel_t channel, bool carrier_en, uint16_t hi
152152
esp_err_t rmt_set_mem_pd(rmt_channel_t channel, bool pd_en);
153153

154154
/**
155-
* @brief Get RMT memory low power mode.
155+
* @brief Check if the RMT memory is force powered down
156156
*
157-
* @param channel RMT channel
158-
* @param pd_en Pointer to accept RMT memory low power mode.
157+
* @param channel RMT channel (actually this function is configured for all channels)
158+
* @param pd_en Pointer to accept the result
159159
*
160160
* @return
161161
* - ESP_ERR_INVALID_ARG Parameter error

‎esp32/include/esp_wifi/include/esp_wifi.h

+22-4
Original file line numberDiff line numberDiff line change
@@ -237,16 +237,32 @@ extern const wpa_crypto_funcs_t g_wifi_default_wpa_crypto_funcs;
237237
#define WIFI_FTM_RESPONDER 0
238238
#endif
239239

240-
#define CONFIG_FEATURE_WPA3_SAE_BIT (1<<0)
240+
#if CONFIG_ESP_WIFI_GCMP_SUPPORT
241+
#define WIFI_ENABLE_GCMP (1<<4)
242+
#else
243+
#define WIFI_ENABLE_GCMP 0
244+
#endif
245+
246+
#if CONFIG_ESP_WIFI_GMAC_SUPPORT
247+
#define WIFI_ENABLE_GMAC (1<<5)
248+
#else
249+
#define WIFI_ENABLE_GMAC 0
250+
#endif
251+
252+
#define CONFIG_FEATURE_WPA3_SAE_BIT (1<<0)
241253
#define CONFIG_FEATURE_CACHE_TX_BUF_BIT (1<<1)
242254
#define CONFIG_FEATURE_FTM_INITIATOR_BIT (1<<2)
243255
#define CONFIG_FEATURE_FTM_RESPONDER_BIT (1<<3)
256+
#define CONFIG_FEATURE_GCMP_BIT (1<<4)
257+
#define CONFIG_FEATURE_GMAC_BIT (1<<5)
244258

245259
/* Set additional WiFi features and capabilities */
246260
#define WIFI_FEATURE_CAPS (WIFI_ENABLE_WPA3_SAE | \
247261
WIFI_ENABLE_SPIRAM | \
248262
WIFI_FTM_INITIATOR | \
249-
WIFI_FTM_RESPONDER)
263+
WIFI_FTM_RESPONDER | \
264+
WIFI_ENABLE_GCMP | \
265+
WIFI_ENABLE_GMAC)
250266

251267
#define WIFI_INIT_CONFIG_DEFAULT() { \
252268
.osi_funcs = &g_wifi_osi_funcs, \
@@ -397,6 +413,7 @@ esp_err_t esp_wifi_restore(void);
397413
* - ESP_OK: succeed
398414
* - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init
399415
* - ESP_ERR_WIFI_NOT_STARTED: WiFi is not started by esp_wifi_start
416+
* - ESP_ERR_WIFI_MODE: WiFi mode error
400417
* - ESP_ERR_WIFI_CONN: WiFi internal error, station or soft-AP control block wrong
401418
* - ESP_ERR_WIFI_SSID: SSID of AP which station connects is invalid
402419
*/
@@ -1477,9 +1494,10 @@ esp_err_t esp_wifi_sta_get_negotiated_phymode(wifi_phy_mode_t *phymode);
14771494
esp_err_t esp_wifi_set_dynamic_cs(bool enabled);
14781495

14791496
/**
1480-
* @brief Get the rssi info after station connected to AP
1497+
* @brief Get the rssi information of AP to which the device is associated with
14811498
*
1482-
* @attention This API should be called after station connected to AP.
1499+
* @attention 1. This API should be called after station connected to AP.
1500+
* @attention 2. Use this API only in WIFI_MODE_STA or WIFI_MODE_APSTA mode.
14831501
*
14841502
* @param rssi store the rssi info received from last beacon.
14851503
*

‎esp32/include/esp_wifi/include/esp_wifi_types.h

+1
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,7 @@ typedef struct {
955955
typedef enum {
956956
WPS_FAIL_REASON_NORMAL = 0, /**< WPS normal fail reason */
957957
WPS_FAIL_REASON_RECV_M2D, /**< WPS receive M2D frame */
958+
WPS_FAIL_REASON_RECV_DEAUTH, /**< Recv deauth from AP while wps handshake */
958959
WPS_FAIL_REASON_MAX
959960
} wifi_event_sta_wps_fail_reason_t;
960961

‎esp32/include/hal/esp32/include/hal/rmt_ll.h

+25-6
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,33 @@ static inline void rmt_ll_enable_periph_clock(rmt_dev_t *dev, bool enable)
5252
}
5353

5454
/**
55-
* @brief Power down memory
55+
* @brief Force power on the RMT memory block, regardless of the outside PMU logic
5656
*
5757
* @param dev Peripheral instance address
58-
* @param enable True to power down, False to power up
5958
*/
60-
static inline void rmt_ll_power_down_mem(rmt_dev_t *dev, bool enable)
59+
static inline void rmt_ll_mem_force_power_on(rmt_dev_t *dev)
6160
{
62-
dev->conf_ch[0].conf0.mem_pd = enable; // Only conf0 register of channel0 has `mem_pd`
61+
(void)dev;
62+
}
63+
64+
/**
65+
* @brief Force power off the RMT memory block, regardless of the outside PMU logic
66+
*
67+
* @param dev Peripheral instance address
68+
*/
69+
static inline void rmt_ll_mem_force_power_off(rmt_dev_t *dev)
70+
{
71+
dev->conf_ch[0].conf0.mem_pd = 1;
72+
}
73+
74+
/**
75+
* @brief Power control the RMT memory block by the outside PMU logic
76+
*
77+
* @param dev Peripheral instance address
78+
*/
79+
static inline void rmt_ll_mem_power_by_pmu(rmt_dev_t *dev)
80+
{
81+
dev->conf_ch[0].conf0.mem_pd = 0;
6382
}
6483

6584
/**
@@ -84,7 +103,7 @@ static inline void rmt_ll_enable_mem_access_nonfifo(rmt_dev_t *dev, bool enable)
84103
* @param divider_numerator Numerator part of the divider
85104
*/
86105
static inline void rmt_ll_set_group_clock_src(rmt_dev_t *dev, uint32_t channel, rmt_clock_source_t src,
87-
uint32_t divider_integral, uint32_t divider_denominator, uint32_t divider_numerator)
106+
uint32_t divider_integral, uint32_t divider_denominator, uint32_t divider_numerator)
88107
{
89108
(void)divider_integral;
90109
(void)divider_denominator;
@@ -595,7 +614,7 @@ static inline uint32_t rmt_ll_tx_get_idle_level(rmt_dev_t *dev, uint32_t channel
595614
return dev->conf_ch[channel].conf1.idle_out_lv;
596615
}
597616

598-
static inline bool rmt_ll_is_mem_powered_down(rmt_dev_t *dev)
617+
static inline bool rmt_ll_is_mem_force_powered_down(rmt_dev_t *dev)
599618
{
600619
// Only conf0 register of channel0 has `mem_pd`
601620
return dev->conf_ch[0].conf0.mem_pd;

‎esp32/ld/libbtdm_app.a

40 Bytes
Binary file not shown.

‎esp32/lib/libbt.a

0 Bytes
Binary file not shown.

‎esp32/lib/libcore.a

0 Bytes
Binary file not shown.

‎esp32/lib/libdriver.a

1.56 KB
Binary file not shown.

‎esp32/lib/libesp_app_format.a

0 Bytes
Binary file not shown.

‎esp32/lib/libesp_system.a

0 Bytes
Binary file not shown.

‎esp32/lib/libesp_wifi.a

0 Bytes
Binary file not shown.

‎esp32/lib/libespnow.a

-4 Bytes
Binary file not shown.

‎esp32/lib/libespressif__esp_diagnostics.a

0 Bytes
Binary file not shown.

‎esp32/lib/libespressif__esp_insights.a

0 Bytes
Binary file not shown.

‎esp32/lib/libespressif__esp_rainmaker.a

36 Bytes
Binary file not shown.

‎esp32/lib/libespressif__rmaker_common.a

0 Bytes
Binary file not shown.

‎esp32/lib/libhal.a

-120 Bytes
Binary file not shown.

‎esp32/lib/libmesh.a

-4 Bytes
Binary file not shown.

‎esp32/lib/libnet80211.a

-1.74 KB
Binary file not shown.

‎esp32/lib/libpp.a

160 Bytes
Binary file not shown.

‎esp32/lib/libprotocomm.a

4 Bytes
Binary file not shown.

‎esp32/lib/libsmartconfig.a

0 Bytes
Binary file not shown.

‎esp32/lib/libwapi.a

-4 Bytes
Binary file not shown.

‎esp32/lib/libwifi_provisioning.a

0 Bytes
Binary file not shown.

‎esp32/lib/libwpa_supplicant.a

5.16 KB
Binary file not shown.

‎esp32/platformio-build.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@
386386

387387
CPPDEFINES=[
388388
"ESP_PLATFORM",
389-
("IDF_VER", '\\"v5.1.4-497-gdc859c1e67-dirty\\"'),
389+
("IDF_VER", '\\"v5.1.4-545-gcd4714dd01-dirty\\"'),
390390
("MBEDTLS_CONFIG_FILE", '\\"mbedtls/esp_config.h\\"'),
391391
("SOC_MMU_PAGE_SIZE", 'CONFIG_MMU_PAGE_SIZE'),
392392
"UNITY_INCLUDE_CONFIG_H",

‎esp32/qio_qspi/include/sdkconfig.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,7 @@
609609
#define CONFIG_ESP_WIFI_SLP_DEFAULT_MAX_ACTIVE_TIME 10
610610
#define CONFIG_ESP_WIFI_SLP_DEFAULT_WAIT_BROADCAST_DATA_TIME 15
611611
#define CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE 1
612+
#define CONFIG_ESP_WIFI_GMAC_SUPPORT 1
612613
#define CONFIG_ESP_WIFI_SOFTAP_SUPPORT 1
613614
#define CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM 7
614615
#define CONFIG_ESP_WIFI_MBEDTLS_CRYPTO 1
@@ -1175,5 +1176,5 @@
11751176
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
11761177
#define CONFIG_WPA_MBEDTLS_CRYPTO CONFIG_ESP_WIFI_MBEDTLS_CRYPTO
11771178
#define CONFIG_WPA_MBEDTLS_TLS_CLIENT CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
1178-
#define CONFIG_ARDUINO_IDF_COMMIT "dc859c1e67"
1179+
#define CONFIG_ARDUINO_IDF_COMMIT "cd4714dd01"
11791180
#define CONFIG_ARDUINO_IDF_BRANCH "release/v5.1"

‎esp32/sdkconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1385,7 +1385,7 @@ CONFIG_ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME=50
13851385
CONFIG_ESP_WIFI_SLP_DEFAULT_MAX_ACTIVE_TIME=10
13861386
CONFIG_ESP_WIFI_SLP_DEFAULT_WAIT_BROADCAST_DATA_TIME=15
13871387
CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y
1388-
# CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
1388+
CONFIG_ESP_WIFI_GMAC_SUPPORT=y
13891389
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
13901390
# CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set
13911391
CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=7

‎esp32c3/bin/bootloader_dio_40m.elf

-36 Bytes
Binary file not shown.

‎esp32c3/bin/bootloader_dio_80m.elf

-36 Bytes
Binary file not shown.

‎esp32c3/bin/bootloader_qio_40m.elf

-36 Bytes
Binary file not shown.

‎esp32c3/bin/bootloader_qio_80m.elf

-36 Bytes
Binary file not shown.

‎esp32c3/dio_qspi/include/sdkconfig.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,7 @@
642642
#define CONFIG_ESP_WIFI_FTM_INITIATOR_SUPPORT 1
643643
#define CONFIG_ESP_WIFI_FTM_RESPONDER_SUPPORT 1
644644
#define CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE 1
645+
#define CONFIG_ESP_WIFI_GMAC_SUPPORT 1
645646
#define CONFIG_ESP_WIFI_SOFTAP_SUPPORT 1
646647
#define CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM 7
647648
#define CONFIG_ESP_WIFI_MBEDTLS_CRYPTO 1
@@ -1198,5 +1199,5 @@
11981199
#define CONFIG_WPA_MBEDTLS_TLS_CLIENT CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
11991200
#define CONFIG_WPA_MBO_SUPPORT CONFIG_ESP_WIFI_MBO_SUPPORT
12001201
#define CONFIG_WPA_SCAN_CACHE CONFIG_ESP_WIFI_SCAN_CACHE
1201-
#define CONFIG_ARDUINO_IDF_COMMIT "dc859c1e67"
1202+
#define CONFIG_ARDUINO_IDF_COMMIT "cd4714dd01"
12021203
#define CONFIG_ARDUINO_IDF_BRANCH "release/v5.1"

‎esp32c3/flags/defines

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
-DESP_PLATFORM -DIDF_VER=\"v5.1.4-497-gdc859c1e67-dirty\" -DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\" -DSOC_MMU_PAGE_SIZE=CONFIG_MMU_PAGE_SIZE -DUNITY_INCLUDE_CONFIG_H -D_GNU_SOURCE -D_POSIX_READER_WRITER_LOCKS -DconfigENABLE_FREERTOS_DEBUG_OCDAWARE=1 -DTF_LITE_STATIC_MEMORY
1+
-DESP_PLATFORM -DIDF_VER=\"v5.1.4-545-gcd4714dd01-dirty\" -DMBEDTLS_CONFIG_FILE=\"mbedtls/esp_config.h\" -DSOC_MMU_PAGE_SIZE=CONFIG_MMU_PAGE_SIZE -DUNITY_INCLUDE_CONFIG_H -D_GNU_SOURCE -D_POSIX_READER_WRITER_LOCKS -DconfigENABLE_FREERTOS_DEBUG_OCDAWARE=1 -DTF_LITE_STATIC_MEMORY

‎esp32c3/include/driver/deprecated/driver/rmt.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -152,10 +152,10 @@ esp_err_t rmt_set_tx_carrier(rmt_channel_t channel, bool carrier_en, uint16_t hi
152152
esp_err_t rmt_set_mem_pd(rmt_channel_t channel, bool pd_en);
153153

154154
/**
155-
* @brief Get RMT memory low power mode.
155+
* @brief Check if the RMT memory is force powered down
156156
*
157-
* @param channel RMT channel
158-
* @param pd_en Pointer to accept RMT memory low power mode.
157+
* @param channel RMT channel (actually this function is configured for all channels)
158+
* @param pd_en Pointer to accept the result
159159
*
160160
* @return
161161
* - ESP_ERR_INVALID_ARG Parameter error

‎esp32c3/include/esp_wifi/include/esp_wifi.h

+22-4
Original file line numberDiff line numberDiff line change
@@ -237,16 +237,32 @@ extern const wpa_crypto_funcs_t g_wifi_default_wpa_crypto_funcs;
237237
#define WIFI_FTM_RESPONDER 0
238238
#endif
239239

240-
#define CONFIG_FEATURE_WPA3_SAE_BIT (1<<0)
240+
#if CONFIG_ESP_WIFI_GCMP_SUPPORT
241+
#define WIFI_ENABLE_GCMP (1<<4)
242+
#else
243+
#define WIFI_ENABLE_GCMP 0
244+
#endif
245+
246+
#if CONFIG_ESP_WIFI_GMAC_SUPPORT
247+
#define WIFI_ENABLE_GMAC (1<<5)
248+
#else
249+
#define WIFI_ENABLE_GMAC 0
250+
#endif
251+
252+
#define CONFIG_FEATURE_WPA3_SAE_BIT (1<<0)
241253
#define CONFIG_FEATURE_CACHE_TX_BUF_BIT (1<<1)
242254
#define CONFIG_FEATURE_FTM_INITIATOR_BIT (1<<2)
243255
#define CONFIG_FEATURE_FTM_RESPONDER_BIT (1<<3)
256+
#define CONFIG_FEATURE_GCMP_BIT (1<<4)
257+
#define CONFIG_FEATURE_GMAC_BIT (1<<5)
244258

245259
/* Set additional WiFi features and capabilities */
246260
#define WIFI_FEATURE_CAPS (WIFI_ENABLE_WPA3_SAE | \
247261
WIFI_ENABLE_SPIRAM | \
248262
WIFI_FTM_INITIATOR | \
249-
WIFI_FTM_RESPONDER)
263+
WIFI_FTM_RESPONDER | \
264+
WIFI_ENABLE_GCMP | \
265+
WIFI_ENABLE_GMAC)
250266

251267
#define WIFI_INIT_CONFIG_DEFAULT() { \
252268
.osi_funcs = &g_wifi_osi_funcs, \
@@ -397,6 +413,7 @@ esp_err_t esp_wifi_restore(void);
397413
* - ESP_OK: succeed
398414
* - ESP_ERR_WIFI_NOT_INIT: WiFi is not initialized by esp_wifi_init
399415
* - ESP_ERR_WIFI_NOT_STARTED: WiFi is not started by esp_wifi_start
416+
* - ESP_ERR_WIFI_MODE: WiFi mode error
400417
* - ESP_ERR_WIFI_CONN: WiFi internal error, station or soft-AP control block wrong
401418
* - ESP_ERR_WIFI_SSID: SSID of AP which station connects is invalid
402419
*/
@@ -1477,9 +1494,10 @@ esp_err_t esp_wifi_sta_get_negotiated_phymode(wifi_phy_mode_t *phymode);
14771494
esp_err_t esp_wifi_set_dynamic_cs(bool enabled);
14781495

14791496
/**
1480-
* @brief Get the rssi info after station connected to AP
1497+
* @brief Get the rssi information of AP to which the device is associated with
14811498
*
1482-
* @attention This API should be called after station connected to AP.
1499+
* @attention 1. This API should be called after station connected to AP.
1500+
* @attention 2. Use this API only in WIFI_MODE_STA or WIFI_MODE_APSTA mode.
14831501
*
14841502
* @param rssi store the rssi info received from last beacon.
14851503
*

‎esp32c3/include/esp_wifi/include/esp_wifi_types.h

+1
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,7 @@ typedef struct {
955955
typedef enum {
956956
WPS_FAIL_REASON_NORMAL = 0, /**< WPS normal fail reason */
957957
WPS_FAIL_REASON_RECV_M2D, /**< WPS receive M2D frame */
958+
WPS_FAIL_REASON_RECV_DEAUTH, /**< Recv deauth from AP while wps handshake */
958959
WPS_FAIL_REASON_MAX
959960
} wifi_event_sta_wps_fail_reason_t;
960961

‎esp32c3/include/hal/esp32c3/include/hal/rmt_ll.h

+28-10
Original file line numberDiff line numberDiff line change
@@ -54,15 +54,36 @@ static inline void rmt_ll_enable_periph_clock(rmt_dev_t *dev, bool enable)
5454
}
5555

5656
/**
57-
* @brief Power down memory
57+
* @brief Force power on the RMT memory block, regardless of the outside PMU logic
5858
*
5959
* @param dev Peripheral instance address
60-
* @param enable True to power down, False to power up
6160
*/
62-
static inline void rmt_ll_power_down_mem(rmt_dev_t *dev, bool enable)
61+
static inline void rmt_ll_mem_force_power_on(rmt_dev_t *dev)
6362
{
64-
dev->sys_conf.mem_force_pu = !enable;
65-
dev->sys_conf.mem_force_pd = enable;
63+
dev->sys_conf.mem_force_pu = 1;
64+
dev->sys_conf.mem_force_pd = 0;
65+
}
66+
67+
/**
68+
* @brief Force power off the RMT memory block, regardless of the outside PMU logic
69+
*
70+
* @param dev Peripheral instance address
71+
*/
72+
static inline void rmt_ll_mem_force_power_off(rmt_dev_t *dev)
73+
{
74+
dev->sys_conf.mem_force_pd = 1;
75+
dev->sys_conf.mem_force_pu = 0;
76+
}
77+
78+
/**
79+
* @brief Power control the RMT memory block by the outside PMU logic
80+
*
81+
* @param dev Peripheral instance address
82+
*/
83+
static inline void rmt_ll_mem_power_by_pmu(rmt_dev_t *dev)
84+
{
85+
dev->sys_conf.mem_force_pd = 0;
86+
dev->sys_conf.mem_force_pu = 0;
6687
}
6788

6889
/**
@@ -779,12 +800,9 @@ static inline uint32_t rmt_ll_tx_get_idle_level(rmt_dev_t *dev, uint32_t channel
779800
return dev->tx_conf[channel].idle_out_lv;
780801
}
781802

782-
static inline bool rmt_ll_is_mem_powered_down(rmt_dev_t *dev)
803+
static inline bool rmt_ll_is_mem_force_powered_down(rmt_dev_t *dev)
783804
{
784-
// the RTC domain can also power down RMT memory
785-
// so it's probably not enough to detect whether it's powered down or not
786-
// mem_force_pd has higher priority than mem_force_pu
787-
return (dev->sys_conf.mem_force_pd) || !(dev->sys_conf.mem_force_pu);
805+
return dev->sys_conf.mem_force_pd;
788806
}
789807

790808
__attribute__((always_inline))

‎esp32c3/ld/esp32c3.rom.ld

+1-1
Original file line numberDiff line numberDiff line change
@@ -1623,7 +1623,7 @@ TRC_PER_IS_GOOD = 0x400017a4;
16231623
trc_SetTxAmpduState = 0x400017a8;
16241624
trc_tid_isTxAmpduOperational = 0x400017ac;
16251625
trcAmpduSetState = 0x400017b0;
1626-
wDev_AppendRxBlocks = 0x400017b8;
1626+
/*wDev_AppendRxBlocks = 0x400017b8;*/
16271627
wDev_DiscardFrame = 0x400017bc;
16281628
wDev_GetNoiseFloor = 0x400017c0;
16291629
wDev_IndicateAmpdu = 0x400017c4;

‎esp32c3/lib/libbt.a

0 Bytes
Binary file not shown.

‎esp32c3/lib/libcore.a

-4 Bytes
Binary file not shown.

‎esp32c3/lib/libdriver.a

1.51 KB
Binary file not shown.

‎esp32c3/lib/libesp_app_format.a

0 Bytes
Binary file not shown.

‎esp32c3/lib/libesp_system.a

0 Bytes
Binary file not shown.

‎esp32c3/lib/libesp_wifi.a

0 Bytes
Binary file not shown.

‎esp32c3/lib/libespnow.a

0 Bytes
Binary file not shown.

‎esp32c3/lib/libespressif__esp_diagnostics.a

0 Bytes
Binary file not shown.

‎esp32c3/lib/libespressif__esp_insights.a

0 Bytes
Binary file not shown.

‎esp32c3/lib/libespressif__esp_rainmaker.a

0 Bytes
Binary file not shown.

‎esp32c3/lib/libespressif__rmaker_common.a

0 Bytes
Binary file not shown.

‎esp32c3/lib/libhal.a

-136 Bytes
Binary file not shown.

‎esp32c3/lib/libmesh.a

0 Bytes
Binary file not shown.

‎esp32c3/lib/libnet80211.a

-1.13 KB
Binary file not shown.

‎esp32c3/lib/libpp.a

108 Bytes
Binary file not shown.

‎esp32c3/lib/libsmartconfig.a

-4 Bytes
Binary file not shown.

‎esp32c3/lib/libwapi.a

-4 Bytes
Binary file not shown.

‎esp32c3/lib/libwifi_provisioning.a

0 Bytes
Binary file not shown.

‎esp32c3/lib/libwpa_supplicant.a

7.28 KB
Binary file not shown.

‎esp32c3/platformio-build.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@
363363

364364
CPPDEFINES=[
365365
"ESP_PLATFORM",
366-
("IDF_VER", '\\"v5.1.4-497-gdc859c1e67-dirty\\"'),
366+
("IDF_VER", '\\"v5.1.4-545-gcd4714dd01-dirty\\"'),
367367
("MBEDTLS_CONFIG_FILE", '\\"mbedtls/esp_config.h\\"'),
368368
("SOC_MMU_PAGE_SIZE", 'CONFIG_MMU_PAGE_SIZE'),
369369
"UNITY_INCLUDE_CONFIG_H",

‎esp32c3/qio_qspi/include/sdkconfig.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -642,6 +642,7 @@
642642
#define CONFIG_ESP_WIFI_FTM_INITIATOR_SUPPORT 1
643643
#define CONFIG_ESP_WIFI_FTM_RESPONDER_SUPPORT 1
644644
#define CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE 1
645+
#define CONFIG_ESP_WIFI_GMAC_SUPPORT 1
645646
#define CONFIG_ESP_WIFI_SOFTAP_SUPPORT 1
646647
#define CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM 7
647648
#define CONFIG_ESP_WIFI_MBEDTLS_CRYPTO 1
@@ -1198,5 +1199,5 @@
11981199
#define CONFIG_WPA_MBEDTLS_TLS_CLIENT CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT
11991200
#define CONFIG_WPA_MBO_SUPPORT CONFIG_ESP_WIFI_MBO_SUPPORT
12001201
#define CONFIG_WPA_SCAN_CACHE CONFIG_ESP_WIFI_SCAN_CACHE
1201-
#define CONFIG_ARDUINO_IDF_COMMIT "dc859c1e67"
1202+
#define CONFIG_ARDUINO_IDF_COMMIT "cd4714dd01"
12021203
#define CONFIG_ARDUINO_IDF_BRANCH "release/v5.1"

‎esp32c3/sdkconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1470,7 +1470,7 @@ CONFIG_ESP_WIFI_FTM_INITIATOR_SUPPORT=y
14701470
CONFIG_ESP_WIFI_FTM_RESPONDER_SUPPORT=y
14711471
CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y
14721472
# CONFIG_ESP_WIFI_GCMP_SUPPORT is not set
1473-
# CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
1473+
CONFIG_ESP_WIFI_GMAC_SUPPORT=y
14741474
CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
14751475
# CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set
14761476
CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=7

0 commit comments

Comments
 (0)