Skip to content

Commit 5d9b98c

Browse files
me-no-devme-no-dev
authored
IDF master cf457d412 (#5073)
esp-dsp: master 7cc5073 esp-face: master 420fc7e esp-rainmaker: f1b82c7 esp32-camera: master 2dded7c esp_littlefs: master d268e18
1 parent 11f89cd commit 5d9b98c

File tree

694 files changed

+12775
-3426
lines changed

Some content is hidden

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

694 files changed

+12775
-3426
lines changed

Diff for: ‎platform.txt

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

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "freertos", "include"),
111111
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "freertos", "port", "xtensa", "include"),
112112
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "esp_hw_support", "include"),
113+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "esp_hw_support", "include", "soc"),
113114
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "esp_hw_support", "port", "esp32"),
114115
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "heap", "include"),
115116
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "log", "include"),
@@ -127,6 +128,8 @@
127128
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "esp_rom", "esp32"),
128129
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "esp_common", "include"),
129130
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "esp_system", "include"),
131+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "esp_system", "port", "soc"),
132+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "esp_system", "port", "public_compat"),
130133
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "esp32", "include"),
131134
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "driver", "include"),
132135
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "driver", "esp32", "include"),
@@ -158,6 +161,7 @@
158161
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "esp_gdbstub", "xtensa"),
159162
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "esp_gdbstub", "esp32"),
160163
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espcoredump", "include"),
164+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "espcoredump", "include", "port", "xtensa"),
161165
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "wpa_supplicant", "include"),
162166
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "wpa_supplicant", "port", "include"),
163167
join(FRAMEWORK_DIR, "tools", "sdk", "esp32", "include", "wpa_supplicant", "include", "esp_supplicant"),
@@ -273,7 +277,7 @@
273277
"UNITY_INCLUDE_CONFIG_H",
274278
"WITH_POSIX",
275279
"_GNU_SOURCE",
276-
("IDF_VER", '\\"v4.4-dev-744-g1cb31e509\\"'),
280+
("IDF_VER", '\\"v4.4-dev-960-gcf457d412\\"'),
277281
"ESP_PLATFORM",
278282
"ARDUINO_ARCH_ESP32",
279283
"ESP32",

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
],
7272

7373
LINKFLAGS=[
74-
"-mlongcalls",
7574
"-nostartfiles",
7675
"-march=rv32imc",
7776
"--specs=nosys.specs",
@@ -111,6 +110,7 @@
111110
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "freertos", "include"),
112111
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "freertos", "port", "riscv", "include"),
113112
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp_hw_support", "include"),
113+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp_hw_support", "include", "soc"),
114114
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp_hw_support", "port", "esp32c3"),
115115
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp_hw_support", "port", "esp32c3", "private_include"),
116116
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "heap", "include"),
@@ -129,6 +129,8 @@
129129
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp_rom", "esp32c3"),
130130
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp_common", "include"),
131131
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp_system", "include"),
132+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp_system", "port", "soc"),
133+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp_system", "port", "public_compat"),
132134
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp32c3", "include"),
133135
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "driver", "include"),
134136
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "driver", "esp32c3", "include"),
@@ -158,6 +160,7 @@
158160
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp_gdbstub", "riscv"),
159161
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "esp_gdbstub", "esp32c3"),
160162
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espcoredump", "include"),
163+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "espcoredump", "include", "port", "riscv"),
161164
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "wpa_supplicant", "include"),
162165
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "wpa_supplicant", "port", "include"),
163166
join(FRAMEWORK_DIR, "tools", "sdk", "esp32c3", "include", "wpa_supplicant", "include", "esp_supplicant"),
@@ -234,7 +237,7 @@
234237
"UNITY_INCLUDE_CONFIG_H",
235238
"WITH_POSIX",
236239
"_GNU_SOURCE",
237-
("IDF_VER", '\\"v4.4-dev-744-g1cb31e509\\"'),
240+
("IDF_VER", '\\"v4.4-dev-960-gcf457d412\\"'),
238241
"ESP_PLATFORM",
239242
"ARDUINO_ARCH_ESP32",
240243
"ESP32",

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "freertos", "include"),
107107
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "freertos", "port", "xtensa", "include"),
108108
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "esp_hw_support", "include"),
109+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "esp_hw_support", "include", "soc"),
109110
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "esp_hw_support", "port", "esp32s2"),
110111
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "esp_hw_support", "port", "esp32s2", "private_include"),
111112
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "heap", "include"),
@@ -124,6 +125,8 @@
124125
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "esp_rom", "esp32s2"),
125126
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "esp_common", "include"),
126127
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "esp_system", "include"),
128+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "esp_system", "port", "soc"),
129+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "esp_system", "port", "public_compat"),
127130
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "esp32s2", "include"),
128131
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "driver", "include"),
129132
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "driver", "esp32s2", "include"),
@@ -155,6 +158,7 @@
155158
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "esp_gdbstub", "xtensa"),
156159
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "esp_gdbstub", "esp32s2"),
157160
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espcoredump", "include"),
161+
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "espcoredump", "include", "port", "xtensa"),
158162
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "wpa_supplicant", "include"),
159163
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "wpa_supplicant", "port", "include"),
160164
join(FRAMEWORK_DIR, "tools", "sdk", "esp32s2", "include", "wpa_supplicant", "include", "esp_supplicant"),
@@ -262,7 +266,7 @@
262266
"UNITY_INCLUDE_CONFIG_H",
263267
"WITH_POSIX",
264268
"_GNU_SOURCE",
265-
("IDF_VER", '\\"v4.4-dev-744-g1cb31e509\\"'),
269+
("IDF_VER", '\\"v4.4-dev-960-gcf457d412\\"'),
266270
"ESP_PLATFORM",
267271
"ARDUINO_ARCH_ESP32",
268272
"ESP32",

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

32 Bytes
Binary file not shown.

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

32 Bytes
Binary file not shown.

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

32 Bytes
Binary file not shown.

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

32 Bytes
Binary file not shown.

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

32 Bytes
Binary file not shown.

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

32 Bytes
Binary file not shown.

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

32 Bytes
Binary file not shown.

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

32 Bytes
Binary file not shown.

Diff for: ‎tools/sdk/esp32/include/bt/host/bluedroid/api/include/api/esp_blufi_api.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,7 @@ typedef void (* esp_blufi_event_cb_t)(esp_blufi_cb_event_t event, esp_blufi_cb_p
301301
* @param len : length of data from phone
302302
* @param output_data : data want to send to phone
303303
* @param output_len : length of data want to send to phone
304+
* @param need_free : output reporting if memory needs to be freed or not *
304305
*/
305306
typedef void (*esp_blufi_negotiate_data_handler_t)(uint8_t *data, int len, uint8_t **output_data, int *output_len, bool *need_free);
306307

@@ -311,7 +312,7 @@ typedef void (*esp_blufi_negotiate_data_handler_t)(uint8_t *data, int len, uint8
311312
* @param crypt_len : length of plain text
312313
* @return Nonnegative number is encrypted length, if error, return negative number;
313314
*/
314-
typedef int (* esp_blufi_encrypt_func_t)(uint8_t iv8, uint8_t *crypt_data, int cyprt_len);
315+
typedef int (* esp_blufi_encrypt_func_t)(uint8_t iv8, uint8_t *crypt_data, int crypt_len);
315316

316317
/**
317318
* @brief BLUFI decrypt the data after negotiate a share key

Diff for: ‎tools/sdk/esp32/include/bt/host/bluedroid/api/include/api/esp_gattc_api.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ typedef union {
259259
/**
260260
* @brief GATT Client callback function type
261261
* @param event : Event type
262-
* @param gatts_if : GATT client access interface, normally
262+
* @param gattc_if : GATT client access interface, normally
263263
* different gattc_if correspond to different profile
264264
* @param param : Point to callback parameter, currently is union type
265265
*/

Diff for: ‎tools/sdk/esp32/include/bt/host/bluedroid/api/include/api/esp_hf_ag_api.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ typedef void (* esp_hf_incoming_data_cb_t)(const uint8_t *buf, uint32_t len);
188188
*
189189
* @param[in] len : size(in bytes) in buf
190190
*
191-
* @param[out] length of data successfully read
191+
* @return length of data successfully read
192192
*/
193193
typedef uint32_t (* esp_hf_outgoing_data_cb_t) (uint8_t *buf, uint32_t len);
194194

Diff for: ‎tools/sdk/esp32/include/bt/host/bluedroid/api/include/api/esp_hf_client_api.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ typedef void (* esp_hf_client_incoming_data_cb_t)(const uint8_t *buf, uint32_t l
273273
*
274274
* @param[in] len : size(in bytes) in buf
275275
*
276-
* @param[out] length of data successfully read
276+
* @return length of data successfully read
277277
*
278278
*/
279279
typedef uint32_t (* esp_hf_client_outgoing_data_cb_t)(uint8_t *buf, uint32_t len);

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -196,15 +196,12 @@
196196
#define CONFIG_PICO_PSRAM_CS_IO 10
197197
#define CONFIG_SPIRAM_SPIWP_SD3_PIN 7
198198
#define CONFIG_ESP32_TRACEMEM_RESERVE_DRAM 0x0
199-
#define CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR 1
200-
#define CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES 4
201199
#define CONFIG_ESP32_ULP_COPROC_ENABLED 1
202200
#define CONFIG_ESP32_ULP_COPROC_RESERVE_MEM 512
203201
#define CONFIG_ESP32_DEBUG_OCDAWARE 1
204202
#define CONFIG_ESP32_BROWNOUT_DET 1
205203
#define CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0 1
206204
#define CONFIG_ESP32_BROWNOUT_DET_LVL 0
207-
#define CONFIG_ESP32_REDUCE_PHY_TX_POWER 1
208205
#define CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1 1
209206
#define CONFIG_ESP32_RTC_CLK_SRC_INT_RC 1
210207
#define CONFIG_ESP32_RTC_CLK_CAL_CYCLES 1024
@@ -239,6 +236,8 @@
239236
#define CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP 1
240237
#define CONFIG_ESP_MAC_ADDR_UNIVERSE_BT 1
241238
#define CONFIG_ESP_MAC_ADDR_UNIVERSE_ETH 1
239+
#define CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR 1
240+
#define CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES 4
242241
#define CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL 120
243242
#define CONFIG_ESP_NETIF_TCPIP_LWIP 1
244243
#define CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER 1
@@ -286,6 +285,7 @@
286285
#define CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE 1
287286
#define CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER 20
288287
#define CONFIG_ESP32_PHY_MAX_TX_POWER 20
288+
#define CONFIG_ESP32_REDUCE_PHY_TX_POWER 1
289289
#define CONFIG_ESP_COREDUMP_ENABLE_TO_NONE 1
290290
#define CONFIG_FATFS_CODEPAGE_850 1
291291
#define CONFIG_FATFS_CODEPAGE 850
@@ -391,8 +391,6 @@
391391
#define CONFIG_LWIP_MAX_RAW_PCBS 16
392392
#define CONFIG_LWIP_DHCP_MAX_NTP_SERVERS 1
393393
#define CONFIG_LWIP_SNTP_UPDATE_DELAY 3600000
394-
#define CONFIG_LCP_ECHOINTERVAL 0
395-
#define CONFIG_LCP_MAXECHOFAILS 3
396394
#define CONFIG_LWIP_ESP_LWIP_ASSERT 1
397395
#define CONFIG_LWIP_HOOK_TCP_ISN_DEFAULT 1
398396
#define CONFIG_LWIP_HOOK_IP6_ROUTE_NONE 1
@@ -654,5 +652,5 @@
654652
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
655653
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
656654
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
657-
#define CONFIG_ARDUINO_IDF_COMMIT "1cb31e509"
655+
#define CONFIG_ARDUINO_IDF_COMMIT "cf457d412"
658656
#define CONFIG_ARDUINO_IDF_BRANCH "master"

Diff for: ‎tools/sdk/esp32/include/driver/include/driver/dedic_gpio.h

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
#include "esp_attr.h"
2121
#include "soc/soc_caps.h"
2222

23+
#if SOC_DEDICATED_GPIO_SUPPORTED
24+
2325
#ifdef __cplusplus
2426
extern "C" {
2527
#endif
@@ -171,3 +173,5 @@ esp_err_t dedic_gpio_bundle_set_interrupt_and_callback(dedic_gpio_bundle_handle_
171173
#ifdef __cplusplus
172174
}
173175
#endif
176+
177+
#endif //SOC_DEDICATED_GPIO_SUPPORTED

Diff for: ‎tools/sdk/esp32/include/driver/include/driver/gpio.h

+1-23
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Licensed under the Apache License, Version 2.0 (the "License");
44
// you may not use this file except in compliance with the License.
55
// You may obtain a copy of the License at
6-
6+
//
77
// http://www.apache.org/licenses/LICENSE-2.0
88
//
99
// Unless required by applicable law or agreed to in writing, software
@@ -494,28 +494,6 @@ esp_err_t gpio_sleep_set_direction(gpio_num_t gpio_num, gpio_mode_t mode);
494494
* - ESP_ERR_INVALID_ARG : Parameter error
495495
*/
496496
esp_err_t gpio_sleep_set_pull_mode(gpio_num_t gpio_num, gpio_pull_mode_t pull);
497-
498-
#if CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL
499-
/**
500-
* @brief Emulate ESP32S2 behaviour to backup FUN_PU, FUN_PD information
501-
*
502-
* @note Need to be called before sleep.
503-
*
504-
* @return
505-
* - ESP_OK Success
506-
*/
507-
esp_err_t gpio_sleep_pupd_config_apply(gpio_num_t gpio_num);
508-
509-
/**
510-
* @brief Emulate ESP32S2 behaviour to restore FUN_PU, FUN_PD information
511-
*
512-
* @note Need to be called after sleep.
513-
*
514-
* @return
515-
* - ESP_OK Success
516-
*/
517-
esp_err_t gpio_sleep_pupd_config_unapply(gpio_num_t gpio_num);
518-
#endif
519497
#endif
520498

521499
#if SOC_GPIO_SUPPORT_DEEPSLEEP_WAKEUP

Diff for: ‎tools/sdk/esp32/include/driver/include/driver/i2c.h

+31-1
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,39 @@ extern "C" {
3333

3434
#define I2C_APB_CLK_FREQ APB_CLK_FREQ /*!< I2C source clock is APB clock, 80MHz */
3535

36+
#define I2C_NUM_MAX (SOC_I2C_NUM) /*!< I2C port max */
3637
#define I2C_NUM_0 (0) /*!< I2C port 0 */
38+
#if SOC_I2C_NUM >= 2
3739
#define I2C_NUM_1 (1) /*!< I2C port 1 */
38-
#define I2C_NUM_MAX (SOC_I2C_NUM) /*!< I2C port max */
40+
#endif
41+
42+
// I2C clk flags for users to use, can be expanded in the future.
43+
#define I2C_SCLK_SRC_FLAG_FOR_NOMAL (0) /*!< Any one clock source that is available for the specified frequency may be choosen*/
44+
#define I2C_SCLK_SRC_FLAG_AWARE_DFS (1 << 0) /*!< For REF tick clock, it won't change with APB.*/
45+
#define I2C_SCLK_SRC_FLAG_LIGHT_SLEEP (1 << 1) /*!< For light sleep mode.*/
46+
47+
/**
48+
* @brief I2C initialization parameters
49+
*/
50+
typedef struct{
51+
i2c_mode_t mode; /*!< I2C mode */
52+
int sda_io_num; /*!< GPIO number for I2C sda signal */
53+
int scl_io_num; /*!< GPIO number for I2C scl signal */
54+
bool sda_pullup_en; /*!< Internal GPIO pull mode for I2C sda signal*/
55+
bool scl_pullup_en; /*!< Internal GPIO pull mode for I2C scl signal*/
56+
57+
union {
58+
struct {
59+
uint32_t clk_speed; /*!< I2C clock frequency for master mode, (no higher than 1MHz for now) */
60+
} master; /*!< I2C master config */
61+
struct {
62+
uint8_t addr_10bit_en; /*!< I2C 10bit address mode enable for slave mode */
63+
uint16_t slave_addr; /*!< I2C address for slave mode */
64+
} slave; /*!< I2C slave config */
65+
};
66+
uint32_t clk_flags; /*!< Bitwise of ``I2C_SCLK_SRC_FLAG_**FOR_DFS**`` for clk source choice*/
67+
} i2c_config_t;
68+
3969

4070
typedef void *i2c_cmd_handle_t; /*!< I2C command handle */
4171

Diff for: ‎tools/sdk/esp32/include/driver/include/driver/i2s.h

+18-16
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "hal/i2s_types.h"
2626
#include "driver/periph_ctrl.h"
2727
#include "esp_intr_alloc.h"
28+
2829
#if SOC_I2S_SUPPORTS_ADC_DAC
2930
#include "driver/adc.h"
3031
#endif
@@ -82,21 +83,6 @@ esp_err_t i2s_set_pin(i2s_port_t i2s_num, const i2s_pin_config_t *pin);
8283
esp_err_t i2s_set_pdm_rx_down_sample(i2s_port_t i2s_num, i2s_pdm_dsr_t dsr);
8384
#endif
8485

85-
/**
86-
* @brief Set I2S dac mode, I2S built-in DAC is disabled by default
87-
*
88-
* @param dac_mode DAC mode configurations - see i2s_dac_mode_t
89-
*
90-
* @note Built-in DAC functions are only supported on I2S0 for current ESP32 chip.
91-
* If either of the built-in DAC channel are enabled, the other one can not
92-
* be used as RTC DAC function at the same time.
93-
*
94-
* @return
95-
* - ESP_OK Success
96-
* - ESP_ERR_INVALID_ARG Parameter error
97-
*/
98-
esp_err_t i2s_set_dac_mode(i2s_dac_mode_t dac_mode);
99-
10086
/**
10187
* @brief Install and start I2S driver.
10288
*
@@ -331,7 +317,23 @@ esp_err_t i2s_adc_enable(i2s_port_t i2s_num);
331317
* - ESP_ERR_INVALID_STATE Driver state error
332318
*/
333319
esp_err_t i2s_adc_disable(i2s_port_t i2s_num);
334-
#endif
320+
321+
/**
322+
* @brief Set I2S dac mode, I2S built-in DAC is disabled by default
323+
*
324+
* @param dac_mode DAC mode configurations - see i2s_dac_mode_t
325+
*
326+
* @note Built-in DAC functions are only supported on I2S0 for current ESP32 chip.
327+
* If either of the built-in DAC channel are enabled, the other one can not
328+
* be used as RTC DAC function at the same time.
329+
*
330+
* @return
331+
* - ESP_OK Success
332+
* - ESP_ERR_INVALID_ARG Parameter error
333+
*/
334+
esp_err_t i2s_set_dac_mode(i2s_dac_mode_t dac_mode);
335+
#endif //SOC_I2S_SUPPORTS_ADC_DAC
336+
335337

336338
#ifdef __cplusplus
337339
}

Diff for: ‎tools/sdk/esp32/include/driver/include/driver/rtc_io.h

+4-7
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,12 @@
1717

1818
#include <stdint.h>
1919
#include "esp_err.h"
20-
#include "driver/gpio.h"
2120
#include "soc/soc_caps.h"
2221
#include "soc/rtc_io_periph.h"
2322
#include "hal/rtc_io_types.h"
23+
#include "driver/gpio.h"
24+
25+
2426
#ifdef __cplusplus
2527
extern "C" {
2628
#endif
@@ -42,6 +44,7 @@ static inline bool rtc_gpio_is_valid_gpio(gpio_num_t gpio_num)
4244

4345
#define RTC_GPIO_IS_VALID_GPIO(gpio_num) rtc_gpio_is_valid_gpio(gpio_num) // Deprecated, use rtc_gpio_is_valid_gpio()
4446

47+
#if SOC_RTCIO_INPUT_OUTPUT_SUPPORTED
4548
/**
4649
* @brief Get RTC IO index number by gpio number.
4750
*
@@ -52,15 +55,9 @@ static inline bool rtc_gpio_is_valid_gpio(gpio_num_t gpio_num)
5255
*/
5356
static inline int rtc_io_number_get(gpio_num_t gpio_num)
5457
{
55-
#if SOC_RTCIO_INPUT_OUTPUT_SUPPORTED
5658
return rtc_io_num_map[gpio_num];
57-
#else
58-
return gpio_num;
59-
#endif
6059
}
6160

62-
#if SOC_RTCIO_INPUT_OUTPUT_SUPPORTED
63-
6461
/**
6562
* @brief Init a GPIO as RTC GPIO
6663
*

0 commit comments

Comments
 (0)