Skip to content

Commit 5089c97

Browse files
me-no-devme-no-dev
committed
IDF release/v4.4 2a4923faa6
1 parent a498911 commit 5089c97

File tree

83 files changed

+95
-75
lines changed

Some content is hidden

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

83 files changed

+95
-75
lines changed

‎platform.txt

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

‎tools/platformio-build-esp32.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@
334334
"UNITY_INCLUDE_CONFIG_H",
335335
"WITH_POSIX",
336336
"_GNU_SOURCE",
337-
("IDF_VER", '\\"v4.4.7-74-g0b75989e37-dirty\\"'),
337+
("IDF_VER", '\\"v4.4.7-88-g2a4923faa6-dirty\\"'),
338338
"ESP_PLATFORM",
339339
"_POSIX_READER_WRITER_LOCKS",
340340
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32c3.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@
331331
"UNITY_INCLUDE_CONFIG_H",
332332
"WITH_POSIX",
333333
"_GNU_SOURCE",
334-
("IDF_VER", '\\"v4.4.7-74-g0b75989e37-dirty\\"'),
334+
("IDF_VER", '\\"v4.4.7-88-g2a4923faa6-dirty\\"'),
335335
"ESP_PLATFORM",
336336
"_POSIX_READER_WRITER_LOCKS",
337337
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32s2.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@
317317
"UNITY_INCLUDE_CONFIG_H",
318318
"WITH_POSIX",
319319
"_GNU_SOURCE",
320-
("IDF_VER", '\\"v4.4.7-74-g0b75989e37-dirty\\"'),
320+
("IDF_VER", '\\"v4.4.7-88-g2a4923faa6-dirty\\"'),
321321
"ESP_PLATFORM",
322322
"_POSIX_READER_WRITER_LOCKS",
323323
"ARDUINO_ARCH_ESP32",

‎tools/platformio-build-esp32s3.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@
333333
"UNITY_INCLUDE_CONFIG_H",
334334
"WITH_POSIX",
335335
"_GNU_SOURCE",
336-
("IDF_VER", '\\"v4.4.7-74-g0b75989e37-dirty\\"'),
336+
("IDF_VER", '\\"v4.4.7-88-g2a4923faa6-dirty\\"'),
337337
"ESP_PLATFORM",
338338
"_POSIX_READER_WRITER_LOCKS",
339339
"ARDUINO_ARCH_ESP32",

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -845,5 +845,5 @@
845845
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
846846
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
847847
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
848-
#define CONFIG_ARDUINO_IDF_COMMIT "0b75989e37"
848+
#define CONFIG_ARDUINO_IDF_COMMIT "2a4923faa6"
849849
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -845,5 +845,5 @@
845845
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
846846
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
847847
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
848-
#define CONFIG_ARDUINO_IDF_COMMIT "0b75989e37"
848+
#define CONFIG_ARDUINO_IDF_COMMIT "2a4923faa6"
849849
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

‎tools/sdk/esp32/include/console/esp_console.h

+15-10
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ typedef struct {
6565
.max_cmdline_length = 0, \
6666
}
6767

68+
#if CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
6869
/**
6970
* @brief Parameters for console device: UART
7071
*
@@ -76,7 +77,7 @@ typedef struct {
7677
int rx_gpio_num; //!< GPIO number for RX path, -1 means using default one
7778
} esp_console_dev_uart_config_t;
7879

79-
#ifdef CONFIG_ESP_CONSOLE_UART_CUSTOM
80+
#if CONFIG_ESP_CONSOLE_UART_CUSTOM
8081
#define ESP_CONSOLE_DEV_UART_CONFIG_DEFAULT() \
8182
{ \
8283
.channel = CONFIG_ESP_CONSOLE_UART_NUM, \
@@ -92,8 +93,10 @@ typedef struct {
9293
.tx_gpio_num = -1, \
9394
.rx_gpio_num = -1, \
9495
}
95-
#endif
96+
#endif // CONFIG_ESP_CONSOLE_UART_CUSTOM
97+
#endif // CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
9698

99+
#if CONFIG_ESP_CONSOLE_USB_CDC || (defined __DOXYGEN__ && SOC_USB_OTG_SUPPORTED)
97100
/**
98101
* @brief Parameters for console device: USB CDC
99102
*
@@ -104,11 +107,10 @@ typedef struct {
104107

105108
} esp_console_dev_usb_cdc_config_t;
106109

107-
#define ESP_CONSOLE_DEV_CDC_CONFIG_DEFAULT() \
108-
{ \
109-
}
110+
#define ESP_CONSOLE_DEV_CDC_CONFIG_DEFAULT() {}
111+
#endif // CONFIG_ESP_CONSOLE_USB_CDC || (defined __DOXYGEN__ && SOC_USB_OTG_SUPPORTED)
110112

111-
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
113+
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || (defined __DOXYGEN__ && SOC_USB_SERIAL_JTAG_SUPPORTED)
112114
/**
113115
* @brief Parameters for console device: USB-SERIAL-JTAG
114116
*
@@ -120,8 +122,7 @@ typedef struct {
120122
} esp_console_dev_usb_serial_jtag_config_t;
121123

122124
#define ESP_CONSOLE_DEV_USB_SERIAL_JTAG_CONFIG_DEFAULT() {}
123-
124-
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
125+
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || (defined __DOXYGEN__ && SOC_USB_SERIAL_JTAG_SUPPORTED)
125126

126127
/**
127128
* @brief initialize console module
@@ -304,6 +305,7 @@ struct esp_console_repl_s {
304305
esp_err_t (*del)(esp_console_repl_t *repl);
305306
};
306307

308+
#if CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
307309
/**
308310
* @brief Establish a console REPL environment over UART driver
309311
*
@@ -326,7 +328,9 @@ struct esp_console_repl_s {
326328
* - ESP_FAIL Parameter error
327329
*/
328330
esp_err_t esp_console_new_repl_uart(const esp_console_dev_uart_config_t *dev_config, const esp_console_repl_config_t *repl_config, esp_console_repl_t **ret_repl);
331+
#endif // CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
329332

333+
#if CONFIG_ESP_CONSOLE_USB_CDC || (defined __DOXYGEN__ && SOC_USB_OTG_SUPPORTED)
330334
/**
331335
* @brief Establish a console REPL environment over USB CDC
332336
*
@@ -347,8 +351,9 @@ esp_err_t esp_console_new_repl_uart(const esp_console_dev_uart_config_t *dev_con
347351
* - ESP_FAIL Parameter error
348352
*/
349353
esp_err_t esp_console_new_repl_usb_cdc(const esp_console_dev_usb_cdc_config_t *dev_config, const esp_console_repl_config_t *repl_config, esp_console_repl_t **ret_repl);
354+
#endif // CONFIG_ESP_CONSOLE_USB_CDC || (defined __DOXYGEN__ && SOC_USB_OTG_SUPPORTED)
350355

351-
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
356+
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || (defined __DOXYGEN__ && SOC_USB_SERIAL_JTAG_SUPPORTED)
352357
/**
353358
* @brief Establish a console REPL (Read-eval-print loop) environment over USB-SERIAL-JTAG
354359
*
@@ -369,7 +374,7 @@ esp_err_t esp_console_new_repl_usb_cdc(const esp_console_dev_usb_cdc_config_t *d
369374
* - ESP_FAIL Parameter error
370375
*/
371376
esp_err_t esp_console_new_repl_usb_serial_jtag(const esp_console_dev_usb_serial_jtag_config_t *dev_config, const esp_console_repl_config_t *repl_config, esp_console_repl_t **ret_repl);
372-
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
377+
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || (defined __DOXYGEN__ && SOC_USB_SERIAL_JTAG_SUPPORTED)
373378

374379
/**
375380
* @brief Start REPL environment

‎tools/sdk/esp32/ld/libbtdm_app.a

1.28 KB
Binary file not shown.

‎tools/sdk/esp32/lib/libapp_update.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32/lib/libconsole.a

-12.5 KB
Binary file not shown.

‎tools/sdk/esp32/lib/libesp_rainmaker.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32/lib/libesp_system.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32/lib/libmdns.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32/lib/libprotocomm.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32/lib/librmaker_common.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32/lib/libwpa_supplicant.a

2.64 KB
Binary file not shown.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -845,5 +845,5 @@
845845
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
846846
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
847847
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
848-
#define CONFIG_ARDUINO_IDF_COMMIT "0b75989e37"
848+
#define CONFIG_ARDUINO_IDF_COMMIT "2a4923faa6"
849849
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -845,5 +845,5 @@
845845
#define CONFIG_ULP_COPROC_ENABLED CONFIG_ESP32_ULP_COPROC_ENABLED
846846
#define CONFIG_ULP_COPROC_RESERVE_MEM CONFIG_ESP32_ULP_COPROC_RESERVE_MEM
847847
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
848-
#define CONFIG_ARDUINO_IDF_COMMIT "0b75989e37"
848+
#define CONFIG_ARDUINO_IDF_COMMIT "2a4923faa6"
849849
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -849,5 +849,5 @@
849849
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
850850
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
851851
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
852-
#define CONFIG_ARDUINO_IDF_COMMIT "0b75989e37"
852+
#define CONFIG_ARDUINO_IDF_COMMIT "2a4923faa6"
853853
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -849,5 +849,5 @@
849849
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
850850
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
851851
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
852-
#define CONFIG_ARDUINO_IDF_COMMIT "0b75989e37"
852+
#define CONFIG_ARDUINO_IDF_COMMIT "2a4923faa6"
853853
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

‎tools/sdk/esp32c3/include/console/esp_console.h

+15-10
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ typedef struct {
6565
.max_cmdline_length = 0, \
6666
}
6767

68+
#if CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
6869
/**
6970
* @brief Parameters for console device: UART
7071
*
@@ -76,7 +77,7 @@ typedef struct {
7677
int rx_gpio_num; //!< GPIO number for RX path, -1 means using default one
7778
} esp_console_dev_uart_config_t;
7879

79-
#ifdef CONFIG_ESP_CONSOLE_UART_CUSTOM
80+
#if CONFIG_ESP_CONSOLE_UART_CUSTOM
8081
#define ESP_CONSOLE_DEV_UART_CONFIG_DEFAULT() \
8182
{ \
8283
.channel = CONFIG_ESP_CONSOLE_UART_NUM, \
@@ -92,8 +93,10 @@ typedef struct {
9293
.tx_gpio_num = -1, \
9394
.rx_gpio_num = -1, \
9495
}
95-
#endif
96+
#endif // CONFIG_ESP_CONSOLE_UART_CUSTOM
97+
#endif // CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
9698

99+
#if CONFIG_ESP_CONSOLE_USB_CDC || (defined __DOXYGEN__ && SOC_USB_OTG_SUPPORTED)
97100
/**
98101
* @brief Parameters for console device: USB CDC
99102
*
@@ -104,11 +107,10 @@ typedef struct {
104107

105108
} esp_console_dev_usb_cdc_config_t;
106109

107-
#define ESP_CONSOLE_DEV_CDC_CONFIG_DEFAULT() \
108-
{ \
109-
}
110+
#define ESP_CONSOLE_DEV_CDC_CONFIG_DEFAULT() {}
111+
#endif // CONFIG_ESP_CONSOLE_USB_CDC || (defined __DOXYGEN__ && SOC_USB_OTG_SUPPORTED)
110112

111-
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
113+
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || (defined __DOXYGEN__ && SOC_USB_SERIAL_JTAG_SUPPORTED)
112114
/**
113115
* @brief Parameters for console device: USB-SERIAL-JTAG
114116
*
@@ -120,8 +122,7 @@ typedef struct {
120122
} esp_console_dev_usb_serial_jtag_config_t;
121123

122124
#define ESP_CONSOLE_DEV_USB_SERIAL_JTAG_CONFIG_DEFAULT() {}
123-
124-
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
125+
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || (defined __DOXYGEN__ && SOC_USB_SERIAL_JTAG_SUPPORTED)
125126

126127
/**
127128
* @brief initialize console module
@@ -304,6 +305,7 @@ struct esp_console_repl_s {
304305
esp_err_t (*del)(esp_console_repl_t *repl);
305306
};
306307

308+
#if CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
307309
/**
308310
* @brief Establish a console REPL environment over UART driver
309311
*
@@ -326,7 +328,9 @@ struct esp_console_repl_s {
326328
* - ESP_FAIL Parameter error
327329
*/
328330
esp_err_t esp_console_new_repl_uart(const esp_console_dev_uart_config_t *dev_config, const esp_console_repl_config_t *repl_config, esp_console_repl_t **ret_repl);
331+
#endif // CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
329332

333+
#if CONFIG_ESP_CONSOLE_USB_CDC || (defined __DOXYGEN__ && SOC_USB_OTG_SUPPORTED)
330334
/**
331335
* @brief Establish a console REPL environment over USB CDC
332336
*
@@ -347,8 +351,9 @@ esp_err_t esp_console_new_repl_uart(const esp_console_dev_uart_config_t *dev_con
347351
* - ESP_FAIL Parameter error
348352
*/
349353
esp_err_t esp_console_new_repl_usb_cdc(const esp_console_dev_usb_cdc_config_t *dev_config, const esp_console_repl_config_t *repl_config, esp_console_repl_t **ret_repl);
354+
#endif // CONFIG_ESP_CONSOLE_USB_CDC || (defined __DOXYGEN__ && SOC_USB_OTG_SUPPORTED)
350355

351-
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
356+
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || (defined __DOXYGEN__ && SOC_USB_SERIAL_JTAG_SUPPORTED)
352357
/**
353358
* @brief Establish a console REPL (Read-eval-print loop) environment over USB-SERIAL-JTAG
354359
*
@@ -369,7 +374,7 @@ esp_err_t esp_console_new_repl_usb_cdc(const esp_console_dev_usb_cdc_config_t *d
369374
* - ESP_FAIL Parameter error
370375
*/
371376
esp_err_t esp_console_new_repl_usb_serial_jtag(const esp_console_dev_usb_serial_jtag_config_t *dev_config, const esp_console_repl_config_t *repl_config, esp_console_repl_t **ret_repl);
372-
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
377+
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || (defined __DOXYGEN__ && SOC_USB_SERIAL_JTAG_SUPPORTED)
373378

374379
/**
375380
* @brief Start REPL environment

‎tools/sdk/esp32c3/lib/libapp_update.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32c3/lib/libconsole.a

-17.3 KB
Binary file not shown.

‎tools/sdk/esp32c3/lib/libesp_hw_support.a

52 Bytes
Binary file not shown.

‎tools/sdk/esp32c3/lib/libesp_rainmaker.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32c3/lib/libesp_system.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32c3/lib/libmdns.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32c3/lib/libprotocomm.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32c3/lib/librmaker_common.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32c3/lib/libwpa_supplicant.a

4.5 KB
Binary file not shown.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -849,5 +849,5 @@
849849
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
850850
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
851851
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
852-
#define CONFIG_ARDUINO_IDF_COMMIT "0b75989e37"
852+
#define CONFIG_ARDUINO_IDF_COMMIT "2a4923faa6"
853853
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -849,5 +849,5 @@
849849
#define CONFIG_TOOLPREFIX CONFIG_SDK_TOOLPREFIX
850850
#define CONFIG_UDP_RECVMBOX_SIZE CONFIG_LWIP_UDP_RECVMBOX_SIZE
851851
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
852-
#define CONFIG_ARDUINO_IDF_COMMIT "0b75989e37"
852+
#define CONFIG_ARDUINO_IDF_COMMIT "2a4923faa6"
853853
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -717,5 +717,5 @@
717717
#define CONFIG_USB_MSC_BUFSIZE CONFIG_TINYUSB_MSC_BUFSIZE
718718
#define CONFIG_USB_MSC_ENABLED CONFIG_TINYUSB_MSC_ENABLED
719719
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
720-
#define CONFIG_ARDUINO_IDF_COMMIT "0b75989e37"
720+
#define CONFIG_ARDUINO_IDF_COMMIT "2a4923faa6"
721721
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -717,5 +717,5 @@
717717
#define CONFIG_USB_MSC_BUFSIZE CONFIG_TINYUSB_MSC_BUFSIZE
718718
#define CONFIG_USB_MSC_ENABLED CONFIG_TINYUSB_MSC_ENABLED
719719
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
720-
#define CONFIG_ARDUINO_IDF_COMMIT "0b75989e37"
720+
#define CONFIG_ARDUINO_IDF_COMMIT "2a4923faa6"
721721
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

‎tools/sdk/esp32s2/include/console/esp_console.h

+15-10
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ typedef struct {
6565
.max_cmdline_length = 0, \
6666
}
6767

68+
#if CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
6869
/**
6970
* @brief Parameters for console device: UART
7071
*
@@ -76,7 +77,7 @@ typedef struct {
7677
int rx_gpio_num; //!< GPIO number for RX path, -1 means using default one
7778
} esp_console_dev_uart_config_t;
7879

79-
#ifdef CONFIG_ESP_CONSOLE_UART_CUSTOM
80+
#if CONFIG_ESP_CONSOLE_UART_CUSTOM
8081
#define ESP_CONSOLE_DEV_UART_CONFIG_DEFAULT() \
8182
{ \
8283
.channel = CONFIG_ESP_CONSOLE_UART_NUM, \
@@ -92,8 +93,10 @@ typedef struct {
9293
.tx_gpio_num = -1, \
9394
.rx_gpio_num = -1, \
9495
}
95-
#endif
96+
#endif // CONFIG_ESP_CONSOLE_UART_CUSTOM
97+
#endif // CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
9698

99+
#if CONFIG_ESP_CONSOLE_USB_CDC || (defined __DOXYGEN__ && SOC_USB_OTG_SUPPORTED)
97100
/**
98101
* @brief Parameters for console device: USB CDC
99102
*
@@ -104,11 +107,10 @@ typedef struct {
104107

105108
} esp_console_dev_usb_cdc_config_t;
106109

107-
#define ESP_CONSOLE_DEV_CDC_CONFIG_DEFAULT() \
108-
{ \
109-
}
110+
#define ESP_CONSOLE_DEV_CDC_CONFIG_DEFAULT() {}
111+
#endif // CONFIG_ESP_CONSOLE_USB_CDC || (defined __DOXYGEN__ && SOC_USB_OTG_SUPPORTED)
110112

111-
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
113+
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || (defined __DOXYGEN__ && SOC_USB_SERIAL_JTAG_SUPPORTED)
112114
/**
113115
* @brief Parameters for console device: USB-SERIAL-JTAG
114116
*
@@ -120,8 +122,7 @@ typedef struct {
120122
} esp_console_dev_usb_serial_jtag_config_t;
121123

122124
#define ESP_CONSOLE_DEV_USB_SERIAL_JTAG_CONFIG_DEFAULT() {}
123-
124-
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
125+
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || (defined __DOXYGEN__ && SOC_USB_SERIAL_JTAG_SUPPORTED)
125126

126127
/**
127128
* @brief initialize console module
@@ -304,6 +305,7 @@ struct esp_console_repl_s {
304305
esp_err_t (*del)(esp_console_repl_t *repl);
305306
};
306307

308+
#if CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
307309
/**
308310
* @brief Establish a console REPL environment over UART driver
309311
*
@@ -326,7 +328,9 @@ struct esp_console_repl_s {
326328
* - ESP_FAIL Parameter error
327329
*/
328330
esp_err_t esp_console_new_repl_uart(const esp_console_dev_uart_config_t *dev_config, const esp_console_repl_config_t *repl_config, esp_console_repl_t **ret_repl);
331+
#endif // CONFIG_ESP_CONSOLE_UART_DEFAULT || CONFIG_ESP_CONSOLE_UART_CUSTOM
329332

333+
#if CONFIG_ESP_CONSOLE_USB_CDC || (defined __DOXYGEN__ && SOC_USB_OTG_SUPPORTED)
330334
/**
331335
* @brief Establish a console REPL environment over USB CDC
332336
*
@@ -347,8 +351,9 @@ esp_err_t esp_console_new_repl_uart(const esp_console_dev_uart_config_t *dev_con
347351
* - ESP_FAIL Parameter error
348352
*/
349353
esp_err_t esp_console_new_repl_usb_cdc(const esp_console_dev_usb_cdc_config_t *dev_config, const esp_console_repl_config_t *repl_config, esp_console_repl_t **ret_repl);
354+
#endif // CONFIG_ESP_CONSOLE_USB_CDC || (defined __DOXYGEN__ && SOC_USB_OTG_SUPPORTED)
350355

351-
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
356+
#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || (defined __DOXYGEN__ && SOC_USB_SERIAL_JTAG_SUPPORTED)
352357
/**
353358
* @brief Establish a console REPL (Read-eval-print loop) environment over USB-SERIAL-JTAG
354359
*
@@ -369,7 +374,7 @@ esp_err_t esp_console_new_repl_usb_cdc(const esp_console_dev_usb_cdc_config_t *d
369374
* - ESP_FAIL Parameter error
370375
*/
371376
esp_err_t esp_console_new_repl_usb_serial_jtag(const esp_console_dev_usb_serial_jtag_config_t *dev_config, const esp_console_repl_config_t *repl_config, esp_console_repl_t **ret_repl);
372-
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG
377+
#endif // CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG || (defined __DOXYGEN__ && SOC_USB_SERIAL_JTAG_SUPPORTED)
373378

374379
/**
375380
* @brief Start REPL environment

‎tools/sdk/esp32s2/lib/libapp_update.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32s2/lib/libarduino_tinyusb.a

320 Bytes
Binary file not shown.

‎tools/sdk/esp32s2/lib/libconsole.a

-12.5 KB
Binary file not shown.

‎tools/sdk/esp32s2/lib/libesp_rainmaker.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32s2/lib/libesp_system.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32s2/lib/libmdns.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32s2/lib/libprotocomm.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32s2/lib/librmaker_common.a

0 Bytes
Binary file not shown.

‎tools/sdk/esp32s2/lib/libwpa_supplicant.a

2.73 KB
Binary file not shown.

‎tools/sdk/esp32s2/qio_qspi/include/sdkconfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -717,5 +717,5 @@
717717
#define CONFIG_USB_MSC_BUFSIZE CONFIG_TINYUSB_MSC_BUFSIZE
718718
#define CONFIG_USB_MSC_ENABLED CONFIG_TINYUSB_MSC_ENABLED
719719
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
720-
#define CONFIG_ARDUINO_IDF_COMMIT "0b75989e37"
720+
#define CONFIG_ARDUINO_IDF_COMMIT "2a4923faa6"
721721
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

‎tools/sdk/esp32s2/qout_qspi/include/sdkconfig.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -717,5 +717,5 @@
717717
#define CONFIG_USB_MSC_BUFSIZE CONFIG_TINYUSB_MSC_BUFSIZE
718718
#define CONFIG_USB_MSC_ENABLED CONFIG_TINYUSB_MSC_ENABLED
719719
#define CONFIG_WARN_WRITE_STRINGS CONFIG_COMPILER_WARN_WRITE_STRINGS
720-
#define CONFIG_ARDUINO_IDF_COMMIT "0b75989e37"
720+
#define CONFIG_ARDUINO_IDF_COMMIT "2a4923faa6"
721721
#define CONFIG_ARDUINO_IDF_BRANCH "release/v4.4"

‎tools/sdk/esp32s3/bin/bootloader_dio_80m.elf

-24 Bytes
Binary file not shown.

‎tools/sdk/esp32s3/bin/bootloader_opi_80m.elf

-28 Bytes
Binary file not shown.

‎tools/sdk/esp32s3/bin/bootloader_qio_120m.elf

-24 Bytes
Binary file not shown.

‎tools/sdk/esp32s3/bin/bootloader_qio_80m.elf

-24 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)