From 5993a582647c476bdd4071952ea4b87fa171b09e Mon Sep 17 00:00:00 2001 From: alufers Date: Sun, 28 May 2023 02:10:59 +0200 Subject: [PATCH 01/21] Add required components to blackmagic component Needed for idf v5.0.2 --- components/blackmagic/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/blackmagic/CMakeLists.txt b/components/blackmagic/CMakeLists.txt index 8bf8743..c35ce61 100644 --- a/components/blackmagic/CMakeLists.txt +++ b/components/blackmagic/CMakeLists.txt @@ -82,6 +82,6 @@ execute_process( message(STATUS "BM version: ${BM_GIT_DESC}") idf_component_register(SRCS ${BM_SOURCES} ${BM_TARGETS} - INCLUDE_DIRS ${BM_INCLUDE}) + INCLUDE_DIRS ${BM_INCLUDE} REQUIRES driver esp_timer) -target_compile_options(${COMPONENT_LIB} PRIVATE -DPC_HOSTED=0 -DFIRMWARE_VERSION="${BM_GIT_DESC}" -Wno-char-subscripts -Wno-attributes -std=gnu11) \ No newline at end of file +target_compile_options(${COMPONENT_LIB} PRIVATE -DPC_HOSTED=0 -DFIRMWARE_VERSION="${BM_GIT_DESC}" -Wno-char-subscripts -Wno-attributes -std=gnu11) From e012f1c8dab738debc44d6af7375b043a02715ba Mon Sep 17 00:00:00 2001 From: alufers Date: Sun, 28 May 2023 02:12:07 +0200 Subject: [PATCH 02/21] Add required components to dap-link component, add missing include Needed for idf v5.0.2. `esp_attr.h` is needed for IRAM_ATTR --- components/dap-link/CMakeLists.txt | 2 +- components/dap-link/dap_config.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/components/dap-link/CMakeLists.txt b/components/dap-link/CMakeLists.txt index b3f7912..5e98509 100644 --- a/components/dap-link/CMakeLists.txt +++ b/components/dap-link/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRCS "free-dap/dap.c" PRIV_INCLUDE_DIRS "." - INCLUDE_DIRS "." "free-dap") \ No newline at end of file + INCLUDE_DIRS "." "free-dap" REQUIRES driver) diff --git a/components/dap-link/dap_config.h b/components/dap-link/dap_config.h index 9d828c2..0339fd0 100644 --- a/components/dap-link/dap_config.h +++ b/components/dap-link/dap_config.h @@ -9,6 +9,7 @@ #include #include #include +#include /*- Definitions -------------------------------------------------------------*/ // #define DAP_CONFIG_ENABLE_JTAG @@ -192,4 +193,4 @@ __attribute__((always_inline)) static inline void DAP_CONFIG_DELAY(uint32_t cycl register int32_t cnt; for(cnt = cycles; --cnt > 0;) ; -} \ No newline at end of file +} From 22e0ba40ec63619c7290abb6602632959c75cd0a Mon Sep 17 00:00:00 2001 From: alufers Date: Sun, 28 May 2023 02:12:57 +0200 Subject: [PATCH 03/21] Add esp_timer.h include to the blackmagic component --- components/blackmagic/esp32-platform/platform.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/blackmagic/esp32-platform/platform.c b/components/blackmagic/esp32-platform/platform.c index 5ef43b8..9c34ecd 100644 --- a/components/blackmagic/esp32-platform/platform.c +++ b/components/blackmagic/esp32-platform/platform.c @@ -8,6 +8,7 @@ #include #include +#include "esp_timer.h" uint32_t swd_delay_cnt = 0; // static const char* TAG = "gdb-platform"; @@ -131,4 +132,4 @@ bool platform_nrst_get_val() { void platform_target_clk_output_enable(bool enable) { (void)enable; -} \ No newline at end of file +} From fe1bd499316e1a69eb8d2515e1560cdcaede6fb1 Mon Sep 17 00:00:00 2001 From: alufers Date: Sun, 28 May 2023 02:13:27 +0200 Subject: [PATCH 04/21] Add required components to simple-uart component, add missing include Needed for idf v5.0.2. --- components/simple-uart/CMakeLists.txt | 2 +- components/simple-uart/simple-uart.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/components/simple-uart/CMakeLists.txt b/components/simple-uart/CMakeLists.txt index be69461..1828b8d 100644 --- a/components/simple-uart/CMakeLists.txt +++ b/components/simple-uart/CMakeLists.txt @@ -1,2 +1,2 @@ idf_component_register(SRCS "simple-uart.c" - INCLUDE_DIRS ".") \ No newline at end of file + INCLUDE_DIRS "." REQUIRES driver) diff --git a/components/simple-uart/simple-uart.c b/components/simple-uart/simple-uart.c index 1ca861f..20e549f 100644 --- a/components/simple-uart/simple-uart.c +++ b/components/simple-uart/simple-uart.c @@ -1,10 +1,12 @@ #include +#include #include #include #include #include #include +#include #include "simple-uart.h" @@ -173,7 +175,12 @@ static void simple_uart_isr(void* arg) { } void simple_uart_set_baud_rate(uint8_t uart_num, uint32_t baud_rate) { - uart_hal_set_baudrate(UART_HAL(uart_num), baud_rate); + uart_sclk_t src_clk; + uint32_t sclk_freq; + + uart_hal_get_sclk(&(uart_context[uart_num].hal), &src_clk); + uart_get_sclk_freq(src_clk, &sclk_freq); + uart_hal_set_baudrate(UART_HAL(uart_num), baud_rate, sclk_freq); } void simple_uart_set_stop_bits(uint8_t uart_num, uart_stop_bits_t stop_bits) { @@ -186,4 +193,4 @@ void simple_uart_set_parity(uint8_t uart_num, uart_parity_t parity) { void simple_uart_set_data_bits(uint8_t uart_num, uart_word_length_t data_bits) { uart_hal_set_data_bit_num(UART_HAL(uart_num), data_bits); -} \ No newline at end of file +} From de5708ebc71798268b01b93a2153711acd6c55e1 Mon Sep 17 00:00:00 2001 From: alufers Date: Sun, 28 May 2023 02:14:13 +0200 Subject: [PATCH 05/21] Add required components to soft-uart component, change include Needed for idf v5.0.2. --- components/soft-uart/CMakeLists.txt | 2 +- components/soft-uart/soft-uart.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/soft-uart/CMakeLists.txt b/components/soft-uart/CMakeLists.txt index 159b0d6..f12a4b9 100644 --- a/components/soft-uart/CMakeLists.txt +++ b/components/soft-uart/CMakeLists.txt @@ -1,2 +1,2 @@ idf_component_register(SRCS "soft-uart.c" - INCLUDE_DIRS ".") \ No newline at end of file + INCLUDE_DIRS "." REQUIRES driver) diff --git a/components/soft-uart/soft-uart.c b/components/soft-uart/soft-uart.c index 1b3d2e0..9d2fe54 100644 --- a/components/soft-uart/soft-uart.c +++ b/components/soft-uart/soft-uart.c @@ -1,7 +1,7 @@ #include "soft-uart.h" #include #include -#include +#include "esp_private/esp_clk.h" #include struct SoftUart { @@ -56,7 +56,7 @@ SoftUart* soft_uart_init(uint32_t baudrate, uint8_t tx_pin) { uart->bit_time = (esp_clk_cpu_freq() / uart->baudrate); - gpio_pad_select_gpio(uart->tx_pin); + esp_rom_gpio_pad_select_gpio(uart->tx_pin); gpio_set_direction(uart->tx_pin, GPIO_MODE_OUTPUT); gpio_set_level(uart->tx_pin, !uart->invert); return uart; @@ -66,4 +66,4 @@ void soft_uart_transmit(SoftUart* uart, const uint8_t* data, uint32_t data_size) for(size_t i = 0; i < data_size; i++) { soft_uart_transmit_byte(uart, data[i]); } -} \ No newline at end of file +} From ec7c6b434ff9e01f79b3fcf6f5edc78791e1133c Mon Sep 17 00:00:00 2001 From: alufers Date: Sun, 28 May 2023 02:17:09 +0200 Subject: [PATCH 06/21] change GPIP_PIN_INTR_DISABLE -> GPIO_INTR_DISABLE Changed for-idf 5.0.2 --- main/cli/cli-commands-gpio.c | 6 +++--- main/main.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main/cli/cli-commands-gpio.c b/main/cli/cli-commands-gpio.c index 7670684..1fa905a 100644 --- a/main/cli/cli-commands-gpio.c +++ b/main/cli/cli-commands-gpio.c @@ -169,7 +169,7 @@ void cli_gpio_set(Cli* cli, mstring_t* args) { } gpio_config_t io_conf; - io_conf.intr_type = GPIO_PIN_INTR_DISABLE; + io_conf.intr_type = GPIO_INTR_DISABLE; io_conf.mode = GPIO_MODE_OUTPUT; io_conf.pin_bit_mask = 0; io_conf.pull_down_en = 0; @@ -225,7 +225,7 @@ void cli_gpio_get(Cli* cli, mstring_t* args) { } gpio_config_t io_conf; - io_conf.intr_type = GPIO_PIN_INTR_DISABLE; + io_conf.intr_type = GPIO_INTR_DISABLE; io_conf.mode = GPIO_MODE_INPUT; io_conf.pin_bit_mask = 0; io_conf.pull_down_en = 0; @@ -278,4 +278,4 @@ void cli_gpio_get(Cli* cli, mstring_t* args) { } while(false); mstring_free(gpio_name); -} \ No newline at end of file +} diff --git a/main/main.c b/main/main.c index ec2b7ed..7b87942 100644 --- a/main/main.c +++ b/main/main.c @@ -35,7 +35,7 @@ void gdb_application_thread(void* pvParameters) { void pins_init() { gpio_config_t io_conf; // disable interrupt - io_conf.intr_type = GPIO_PIN_INTR_DISABLE; + io_conf.intr_type = GPIO_INTR_DISABLE; // set as output mode io_conf.mode = GPIO_MODE_OUTPUT; // bit mask of the pins that you want to set From d5b601c340fa065c42f7db76c7a9f1855fd36a9a Mon Sep 17 00:00:00 2001 From: alufers Date: Sun, 28 May 2023 02:20:25 +0200 Subject: [PATCH 07/21] Add esp-idf managed components Espressif decided to move the mdns functionality to https://github.com/espressif/esp-protocols, which is an managed components, so their package manager has to be used. managed_components has been added to .giitignore, because it is downloaded by esp-idf. --- .gitignore | 3 ++- dependencies.lock | 21 +++++++++++++++++++++ main/idf_component.yml | 7 +++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 dependencies.lock create mode 100644 main/idf_component.yml diff --git a/.gitignore b/.gitignore index d408e14..7bdd9cd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ /build /sdkconfig.old /main/wifi-credentials.h -.DS_Store \ No newline at end of file +.DS_Store +managed_components diff --git a/dependencies.lock b/dependencies.lock new file mode 100644 index 0000000..d0f962c --- /dev/null +++ b/dependencies.lock @@ -0,0 +1,21 @@ +dependencies: + espressif/mdns: + component_hash: 46ee81d32fbf850462d8af1e83303389602f6a6a9eddd2a55104cb4c063858ed + source: + service_url: https://api.components.espressif.com/ + type: service + version: 1.1.0 + espressif/tinyusb: + component_hash: 68e971ee08d20180b1a092e5ee727877a3b3d8c815fde0a91fc6fdff06d41ead + source: + service_url: https://api.components.espressif.com/ + type: service + version: 0.14.3 + idf: + component_hash: null + source: + type: idf + version: 5.0.2 +manifest_hash: c64f6ab4afe7b51976719443799f4b2bed8d651d0bd98b9fc4ed18e4c4647f17 +target: esp32s2 +version: 1.0.0 diff --git a/main/idf_component.yml b/main/idf_component.yml new file mode 100644 index 0000000..633bd80 --- /dev/null +++ b/main/idf_component.yml @@ -0,0 +1,7 @@ +## IDF Component Manager Manifest File +dependencies: + ## Required IDF version + idf: + version: ">=5.0.0" + espressif/mdns: + version: ">=1.1.0" From 0e87b51e50844231b845d4f3068737db1e212c1b Mon Sep 17 00:00:00 2001 From: alufers Date: Sun, 28 May 2023 02:21:07 +0200 Subject: [PATCH 08/21] Change portTICK_RATE_MS to portTICK_PERIOD_MS Changed for esp-idf v5.0.2 --- main/i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/i2c.c b/main/i2c.c index f069319..1855b1d 100644 --- a/main/i2c.c +++ b/main/i2c.c @@ -51,7 +51,7 @@ void i2c_scan(void) { i2c_master_start(cmd); i2c_master_write_byte(cmd, (address << 1) | WRITE_BIT, ACK_CHECK_EN); i2c_master_stop(cmd); - esp_err_t ret = i2c_master_cmd_begin(i2c_port, cmd, 50 / portTICK_RATE_MS); + esp_err_t ret = i2c_master_cmd_begin(i2c_port, cmd, 50 / portTICK_PERIOD_MS); i2c_cmd_link_delete(cmd); if(ret == ESP_OK) { printf("%02x ", address); @@ -63,4 +63,4 @@ void i2c_scan(void) { } printf("\r\n"); } -} \ No newline at end of file +} From 1b11ffc6ae973127657f9de62308113afca522bc Mon Sep 17 00:00:00 2001 From: alufers Date: Sun, 28 May 2023 02:25:07 +0200 Subject: [PATCH 09/21] Rename tinyusb component to usbglue, use esp-idf's tinyusb Renamed the component to avoid conflicts with the esp-idf component. The tinyusb submodule has been removed and replaced, with Espressif's tinyusb managed component. Adjusted CMakeLists.txt not to build tinyusb, leave it up to the managed component. Added missing include to esp_mac.h --- .gitmodules | 2 - components/tinyusb/CMakeLists.txt | 65 -- components/tinyusb/tinyusb | 1 - components/usbglue/CMakeLists.txt | 41 + .../{tinyusb => usbglue}/config/tusb_config.h | 0 .../drivers/dap-link/dap-link-descriptors.c | 0 .../drivers/dap-link/dap-link-descriptors.h | 0 .../drivers/dap-link/vendor_device.c | 0 .../drivers/dap-link/vendor_device.h | 0 .../drivers/dual-cdc/dual-cdc-descriptors.c | 0 .../drivers/dual-cdc/dual-cdc-descriptors.h | 0 .../{tinyusb => usbglue}/drivers/usb-glue.c | 8 +- .../{tinyusb => usbglue}/drivers/usb-glue.h | 2 +- components/usbglue/idf_component.yml | 7 + sdkconfig | 904 ++++++++++++------ 15 files changed, 692 insertions(+), 338 deletions(-) delete mode 100644 components/tinyusb/CMakeLists.txt delete mode 160000 components/tinyusb/tinyusb create mode 100644 components/usbglue/CMakeLists.txt rename components/{tinyusb => usbglue}/config/tusb_config.h (100%) rename components/{tinyusb => usbglue}/drivers/dap-link/dap-link-descriptors.c (100%) rename components/{tinyusb => usbglue}/drivers/dap-link/dap-link-descriptors.h (100%) rename components/{tinyusb => usbglue}/drivers/dap-link/vendor_device.c (100%) rename components/{tinyusb => usbglue}/drivers/dap-link/vendor_device.h (100%) rename components/{tinyusb => usbglue}/drivers/dual-cdc/dual-cdc-descriptors.c (100%) rename components/{tinyusb => usbglue}/drivers/dual-cdc/dual-cdc-descriptors.h (100%) rename components/{tinyusb => usbglue}/drivers/usb-glue.c (98%) rename components/{tinyusb => usbglue}/drivers/usb-glue.h (96%) create mode 100644 components/usbglue/idf_component.yml diff --git a/.gitmodules b/.gitmodules index ff17d34..1a12eb3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,6 @@ [submodule "components/mlib/mlib"] path = components/mlib/mlib url = https://github.com/P-p-H-d/mlib.git -[submodule "components/tinyusb/tinyusb"] - path = components/tinyusb/tinyusb url = https://github.com/hathach/tinyusb [submodule "components/dap-link/free-dap"] path = components/dap-link/free-dap diff --git a/components/tinyusb/CMakeLists.txt b/components/tinyusb/CMakeLists.txt deleted file mode 100644 index 5f384c0..0000000 --- a/components/tinyusb/CMakeLists.txt +++ /dev/null @@ -1,65 +0,0 @@ -idf_component_register(REQUIRES esp_rom app_update spi_flash freertos soc driver) - -idf_component_get_property(FREERTOS_ORIG_INCLUDE_PATH freertos ORIG_INCLUDE_PATH) - -idf_build_get_property(idf_target IDF_TARGET) - -if(${idf_target} STREQUAL "esp32s2") - target_compile_options(${COMPONENT_TARGET} INTERFACE - "-DCFG_TUSB_MCU=OPT_MCU_ESP32S2" - ) -endif() - -if(${idf_target} STREQUAL "esp32s3") - target_compile_options(${COMPONENT_TARGET} INTERFACE - "-DCFG_TUSB_MCU=OPT_MCU_ESP32S3" - ) -endif() - -target_include_directories(${COMPONENT_TARGET} INTERFACE - "${FREERTOS_ORIG_INCLUDE_PATH}" - "${COMPONENT_DIR}/config/" - "${COMPONENT_DIR}/drivers/" - "${COMPONENT_DIR}/drivers/dual-cdc/" - "${COMPONENT_DIR}/tinyusb/hw/bsp/" - "${COMPONENT_DIR}/tinyusb/src/" - "${COMPONENT_DIR}/tinyusb/src/device" - "${COMPONENT_DIR}/tinyusb/src/class" -) - -target_sources(${COMPONENT_TARGET} INTERFACE - "${COMPONENT_DIR}/tinyusb/src/tusb.c" - "${COMPONENT_DIR}/tinyusb/src/common/tusb_fifo.c" - "${COMPONENT_DIR}/tinyusb/src/device/usbd.c" - "${COMPONENT_DIR}/tinyusb/src/device/usbd_control.c" - "${COMPONENT_DIR}/tinyusb/src/class/audio/audio_device.c" - "${COMPONENT_DIR}/tinyusb/src/class/bth/bth_device.c" - "${COMPONENT_DIR}/tinyusb/src/class/cdc/cdc_device.c" - "${COMPONENT_DIR}/tinyusb/src/class/cdc/cdc_host.c" - "${COMPONENT_DIR}/tinyusb/src/class/cdc/cdc_rndis_host.c" - "${COMPONENT_DIR}/tinyusb/src/class/dfu/dfu_rt_device.c" - "${COMPONENT_DIR}/tinyusb/src/class/dfu/dfu_device.c" - "${COMPONENT_DIR}/tinyusb/src/class/hid/hid_device.c" - "${COMPONENT_DIR}/tinyusb/src/class/hid/hid_host.c" - "${COMPONENT_DIR}/tinyusb/src/class/midi/midi_device.c" - "${COMPONENT_DIR}/tinyusb/src/class/msc/msc_device.c" - "${COMPONENT_DIR}/tinyusb/src/class/msc/msc_host.c" - "${COMPONENT_DIR}/tinyusb/src/class/net/ncm_device.c" - "${COMPONENT_DIR}/tinyusb/src/class/net/ecm_rndis_device.c" - "${COMPONENT_DIR}/tinyusb/src/class/usbtmc/usbtmc_device.c" - "${COMPONENT_DIR}/tinyusb/src/class/vendor/vendor_device.c" - "${COMPONENT_DIR}/tinyusb/src/class/vendor/vendor_host.c" - "${COMPONENT_DIR}/tinyusb/src/class/video/video_device.c" - "${COMPONENT_DIR}/tinyusb/src/portable/espressif/esp32sx/dcd_esp32sx.c" - "${COMPONENT_DIR}/tinyusb/src/host/hub.c" - "${COMPONENT_DIR}/tinyusb/src/host/usbh.c" - "${COMPONENT_DIR}/tinyusb/src/host/usbh_control.c" - - "${COMPONENT_DIR}/drivers/usb-glue.c" - - # "${COMPONENT_DIR}/drivers/dual-cdc/dual-cdc-driver.c" - "${COMPONENT_DIR}/drivers/dual-cdc/dual-cdc-descriptors.c" - - # "${COMPONENT_DIR}/drivers/dap-link/vendor_device.c" - "${COMPONENT_DIR}/drivers/dap-link/dap-link-descriptors.c" -) diff --git a/components/tinyusb/tinyusb b/components/tinyusb/tinyusb deleted file mode 160000 index dd30f2c..0000000 --- a/components/tinyusb/tinyusb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dd30f2c648b984949b858d7dcc914297985a20bb diff --git a/components/usbglue/CMakeLists.txt b/components/usbglue/CMakeLists.txt new file mode 100644 index 0000000..31d0a1c --- /dev/null +++ b/components/usbglue/CMakeLists.txt @@ -0,0 +1,41 @@ +idf_component_register(REQUIRES esp_rom app_update spi_flash freertos soc driver) + +idf_component_get_property(FREERTOS_ORIG_INCLUDE_PATH freertos ORIG_INCLUDE_PATH) + +idf_build_get_property(idf_target IDF_TARGET) + +if(${idf_target} STREQUAL "esp32s2") + target_compile_options(${COMPONENT_TARGET} INTERFACE + "-DCFG_TUSB_MCU=OPT_MCU_ESP32S2" + ) +endif() + +if(${idf_target} STREQUAL "esp32s3") + target_compile_options(${COMPONENT_TARGET} INTERFACE + "-DCFG_TUSB_MCU=OPT_MCU_ESP32S3" + ) +endif() + +idf_component_get_property(tusb_lib espressif__tinyusb COMPONENT_LIB) +target_include_directories(${tusb_lib} PRIVATE ./config) + +target_include_directories(${COMPONENT_TARGET} INTERFACE + "${FREERTOS_ORIG_INCLUDE_PATH}" + "${COMPONENT_DIR}/config/" + "${COMPONENT_DIR}/drivers/" + "${COMPONENT_DIR}/drivers/dual-cdc/" + "${COMPONENT_DIR}/tinyusb/hw/bsp/" + "${COMPONENT_DIR}/tinyusb/src/" + "${COMPONENT_DIR}/tinyusb/src/device" + "${COMPONENT_DIR}/tinyusb/src/class" +) + +target_sources(${COMPONENT_TARGET} INTERFACE + "${COMPONENT_DIR}/drivers/usb-glue.c" + + # "${COMPONENT_DIR}/drivers/dual-cdc/dual-cdc-driver.c" + "${COMPONENT_DIR}/drivers/dual-cdc/dual-cdc-descriptors.c" + + # "${COMPONENT_DIR}/drivers/dap-link/vendor_device.c" + "${COMPONENT_DIR}/drivers/dap-link/dap-link-descriptors.c" +) diff --git a/components/tinyusb/config/tusb_config.h b/components/usbglue/config/tusb_config.h similarity index 100% rename from components/tinyusb/config/tusb_config.h rename to components/usbglue/config/tusb_config.h diff --git a/components/tinyusb/drivers/dap-link/dap-link-descriptors.c b/components/usbglue/drivers/dap-link/dap-link-descriptors.c similarity index 100% rename from components/tinyusb/drivers/dap-link/dap-link-descriptors.c rename to components/usbglue/drivers/dap-link/dap-link-descriptors.c diff --git a/components/tinyusb/drivers/dap-link/dap-link-descriptors.h b/components/usbglue/drivers/dap-link/dap-link-descriptors.h similarity index 100% rename from components/tinyusb/drivers/dap-link/dap-link-descriptors.h rename to components/usbglue/drivers/dap-link/dap-link-descriptors.h diff --git a/components/tinyusb/drivers/dap-link/vendor_device.c b/components/usbglue/drivers/dap-link/vendor_device.c similarity index 100% rename from components/tinyusb/drivers/dap-link/vendor_device.c rename to components/usbglue/drivers/dap-link/vendor_device.c diff --git a/components/tinyusb/drivers/dap-link/vendor_device.h b/components/usbglue/drivers/dap-link/vendor_device.h similarity index 100% rename from components/tinyusb/drivers/dap-link/vendor_device.h rename to components/usbglue/drivers/dap-link/vendor_device.h diff --git a/components/tinyusb/drivers/dual-cdc/dual-cdc-descriptors.c b/components/usbglue/drivers/dual-cdc/dual-cdc-descriptors.c similarity index 100% rename from components/tinyusb/drivers/dual-cdc/dual-cdc-descriptors.c rename to components/usbglue/drivers/dual-cdc/dual-cdc-descriptors.c diff --git a/components/tinyusb/drivers/dual-cdc/dual-cdc-descriptors.h b/components/usbglue/drivers/dual-cdc/dual-cdc-descriptors.h similarity index 100% rename from components/tinyusb/drivers/dual-cdc/dual-cdc-descriptors.h rename to components/usbglue/drivers/dual-cdc/dual-cdc-descriptors.h diff --git a/components/tinyusb/drivers/usb-glue.c b/components/usbglue/drivers/usb-glue.c similarity index 98% rename from components/tinyusb/drivers/usb-glue.c rename to components/usbglue/drivers/usb-glue.c index fa20126..75fdc40 100644 --- a/components/tinyusb/drivers/usb-glue.c +++ b/components/usbglue/drivers/usb-glue.c @@ -1,4 +1,6 @@ #include +#include + #include "dap-link/dap-link-descriptors.h" #include "dual-cdc/dual-cdc-descriptors.h" #include "usb-glue.h" @@ -247,6 +249,10 @@ void tud_cdc_line_coding_cb(uint8_t interface, cdc_line_coding_t const* p_line_c #include #include + +#define GPIO_FUNC_IN_HIGH 0x38 +#define GPIO_FUNC_IN_LOW 0x3C + static void usb_hal_init_pins(usb_hal_context_t* usb) { /* usb_periph_iopins currently configures USB_OTG as USB Device. * Introduce additional parameters in usb_hal_context_t when adding support @@ -274,7 +280,7 @@ static void usb_hal_init_pins(usb_hal_context_t* usb) { static void usb_hal_bus_reset() { gpio_config_t io_conf; - io_conf.intr_type = GPIO_PIN_INTR_DISABLE; + io_conf.intr_type = GPIO_INTR_DISABLE; io_conf.mode = GPIO_MODE_OUTPUT_OD; io_conf.pin_bit_mask = ((1 << USBPHY_DM_NUM) | (1 << USBPHY_DP_NUM)); io_conf.pull_down_en = GPIO_PULLDOWN_ENABLE; diff --git a/components/tinyusb/drivers/usb-glue.h b/components/usbglue/drivers/usb-glue.h similarity index 96% rename from components/tinyusb/drivers/usb-glue.h rename to components/usbglue/drivers/usb-glue.h index 6c7e978..9e3f1a6 100644 --- a/components/tinyusb/drivers/usb-glue.h +++ b/components/usbglue/drivers/usb-glue.h @@ -51,4 +51,4 @@ void usb_glue_dap_send(const uint8_t* buf, size_t len, bool flush); void usb_glue_dap_set_receive_callback(void (*callback)(void* context), void* context); -size_t usb_glue_dap_receive(uint8_t* buf, size_t len); \ No newline at end of file +size_t usb_glue_dap_receive(uint8_t* buf, size_t len); diff --git a/components/usbglue/idf_component.yml b/components/usbglue/idf_component.yml new file mode 100644 index 0000000..637acd8 --- /dev/null +++ b/components/usbglue/idf_component.yml @@ -0,0 +1,7 @@ +## IDF Component Manager Manifest File +dependencies: + ## Required IDF version + idf: + version: ">=4.1.0" + tinyusb: + version: ">=0.14.3" diff --git a/sdkconfig b/sdkconfig index ea0fde0..2a85a6a 100644 --- a/sdkconfig +++ b/sdkconfig @@ -2,19 +2,244 @@ # Automatically generated file. DO NOT EDIT. # Espressif IoT Development Framework (ESP-IDF) Project Configuration # +CONFIG_SOC_ADC_SUPPORTED=y +CONFIG_SOC_DAC_SUPPORTED=y +CONFIG_SOC_TWAI_SUPPORTED=y +CONFIG_SOC_CP_DMA_SUPPORTED=y +CONFIG_SOC_DEDICATED_GPIO_SUPPORTED=y +CONFIG_SOC_SUPPORTS_SECURE_DL_MODE=y +CONFIG_SOC_RISCV_COPROC_SUPPORTED=y +CONFIG_SOC_USB_OTG_SUPPORTED=y +CONFIG_SOC_PCNT_SUPPORTED=y +CONFIG_SOC_WIFI_SUPPORTED=y +CONFIG_SOC_ULP_SUPPORTED=y +CONFIG_SOC_CCOMP_TIMER_SUPPORTED=y +CONFIG_SOC_ASYNC_MEMCPY_SUPPORTED=y +CONFIG_SOC_EFUSE_KEY_PURPOSE_FIELD=y +CONFIG_SOC_TEMP_SENSOR_SUPPORTED=y +CONFIG_SOC_CACHE_SUPPORT_WRAP=y +CONFIG_SOC_RTC_FAST_MEM_SUPPORTED=y +CONFIG_SOC_RTC_SLOW_MEM_SUPPORTED=y +CONFIG_SOC_RTC_MEM_SUPPORTED=y +CONFIG_SOC_PSRAM_DMA_CAPABLE=y +CONFIG_SOC_XT_WDT_SUPPORTED=y +CONFIG_SOC_I2S_SUPPORTED=y +CONFIG_SOC_RMT_SUPPORTED=y +CONFIG_SOC_SDM_SUPPORTED=y +CONFIG_SOC_SYSTIMER_SUPPORTED=y +CONFIG_SOC_AES_SUPPORTED=y +CONFIG_SOC_MPI_SUPPORTED=y +CONFIG_SOC_SHA_SUPPORTED=y +CONFIG_SOC_HMAC_SUPPORTED=y +CONFIG_SOC_DIG_SIGN_SUPPORTED=y +CONFIG_SOC_FLASH_ENC_SUPPORTED=y +CONFIG_SOC_SECURE_BOOT_SUPPORTED=y +CONFIG_SOC_MEMPROT_SUPPORTED=y +CONFIG_SOC_TOUCH_SENSOR_SUPPORTED=y +CONFIG_SOC_XTAL_SUPPORT_40M=y +CONFIG_SOC_ADC_RTC_CTRL_SUPPORTED=y +CONFIG_SOC_ADC_DIG_CTRL_SUPPORTED=y +CONFIG_SOC_ADC_ARBITER_SUPPORTED=y +CONFIG_SOC_ADC_FILTER_SUPPORTED=y +CONFIG_SOC_ADC_MONITOR_SUPPORTED=y +CONFIG_SOC_ADC_DMA_SUPPORTED=y +CONFIG_SOC_ADC_PERIPH_NUM=2 +CONFIG_SOC_ADC_MAX_CHANNEL_NUM=10 +CONFIG_SOC_ADC_ATTEN_NUM=4 +CONFIG_SOC_ADC_DIGI_CONTROLLER_NUM=2 +CONFIG_SOC_ADC_PATT_LEN_MAX=32 +CONFIG_SOC_ADC_DIGI_MIN_BITWIDTH=12 +CONFIG_SOC_ADC_DIGI_MAX_BITWIDTH=12 +CONFIG_SOC_ADC_DIGI_RESULT_BYTES=2 +CONFIG_SOC_ADC_DIGI_DATA_BYTES_PER_CONV=2 +CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_HIGH=83333 +CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=611 +CONFIG_SOC_ADC_RTC_MIN_BITWIDTH=13 +CONFIG_SOC_ADC_RTC_MAX_BITWIDTH=13 +CONFIG_SOC_RTC_SLOW_CLOCK_SUPPORT_8MD256=y +CONFIG_SOC_ADC_CALIBRATION_V1_SUPPORTED=y +CONFIG_SOC_BROWNOUT_RESET_SUPPORTED=y +CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=6 +CONFIG_SOC_CP_DMA_MAX_BUFFER_SIZE=4095 +CONFIG_SOC_CPU_CORES_NUM=1 +CONFIG_SOC_CPU_INTR_NUM=32 +CONFIG_SOC_CPU_BREAKPOINTS_NUM=2 +CONFIG_SOC_CPU_WATCHPOINTS_NUM=2 +CONFIG_SOC_CPU_WATCHPOINT_SIZE=64 +CONFIG_SOC_DAC_PERIPH_NUM=2 +CONFIG_SOC_DAC_RESOLUTION=8 +CONFIG_SOC_GPIO_PORT=1 +CONFIG_SOC_GPIO_PIN_COUNT=47 +CONFIG_SOC_GPIO_SUPPORT_RTC_INDEPENDENT=y +CONFIG_SOC_GPIO_SUPPORT_FORCE_HOLD=y +CONFIG_SOC_GPIO_VALID_GPIO_MASK=0x7FFFFFFFFFFF +CONFIG_SOC_GPIO_VALID_DIGITAL_IO_PAD_MASK=0x00007FFFFC000000 +CONFIG_SOC_DEDIC_GPIO_OUT_CHANNELS_NUM=8 +CONFIG_SOC_DEDIC_GPIO_IN_CHANNELS_NUM=8 +CONFIG_SOC_DEDIC_GPIO_ALLOW_REG_ACCESS=y +CONFIG_SOC_DEDIC_GPIO_HAS_INTERRUPT=y +CONFIG_SOC_DEDIC_GPIO_OUT_AUTO_ENABLE=y +CONFIG_SOC_I2C_NUM=2 +CONFIG_SOC_I2C_FIFO_LEN=32 +CONFIG_SOC_I2C_SUPPORT_SLAVE=y +CONFIG_SOC_I2C_SUPPORT_HW_CLR_BUS=y +CONFIG_SOC_I2C_SUPPORT_REF_TICK=y +CONFIG_SOC_I2C_SUPPORT_APB=y +CONFIG_SOC_CLK_APLL_SUPPORTED=y +CONFIG_SOC_APLL_MULTIPLIER_OUT_MIN_HZ=350000000 +CONFIG_SOC_APLL_MULTIPLIER_OUT_MAX_HZ=500000000 +CONFIG_SOC_APLL_MIN_HZ=5303031 +CONFIG_SOC_APLL_MAX_HZ=125000000 +CONFIG_SOC_I2S_NUM=1 +CONFIG_SOC_I2S_HW_VERSION_1=y +CONFIG_SOC_I2S_SUPPORTS_APLL=y +CONFIG_SOC_I2S_SUPPORTS_DMA_EQUAL=y +CONFIG_SOC_I2S_SUPPORTS_LCD_CAMERA=y +CONFIG_SOC_I2S_APLL_MIN_FREQ=250000000 +CONFIG_SOC_I2S_APLL_MAX_FREQ=500000000 +CONFIG_SOC_I2S_APLL_MIN_RATE=10675 +CONFIG_SOC_I2S_LCD_I80_VARIANT=y +CONFIG_SOC_LCD_I80_SUPPORTED=y +CONFIG_SOC_LCD_I80_BUSES=1 +CONFIG_SOC_LCD_I80_BUS_WIDTH=24 +CONFIG_SOC_LEDC_HAS_TIMER_SPECIFIC_MUX=y +CONFIG_SOC_LEDC_SUPPORT_APB_CLOCK=y +CONFIG_SOC_LEDC_SUPPORT_REF_TICK=y +CONFIG_SOC_LEDC_SUPPORT_XTAL_CLOCK=y +CONFIG_SOC_LEDC_CHANNEL_NUM=8 +CONFIG_SOC_LEDC_TIMER_BIT_WIDE_NUM=14 +CONFIG_SOC_LEDC_SUPPORT_FADE_STOP=y +CONFIG_SOC_MPU_MIN_REGION_SIZE=0x20000000 +CONFIG_SOC_MPU_REGIONS_MAX_NUM=8 +CONFIG_SOC_PCNT_GROUPS=1 +CONFIG_SOC_PCNT_UNITS_PER_GROUP=4 +CONFIG_SOC_PCNT_CHANNELS_PER_UNIT=2 +CONFIG_SOC_PCNT_THRES_POINT_PER_UNIT=2 +CONFIG_SOC_RMT_GROUPS=1 +CONFIG_SOC_RMT_TX_CANDIDATES_PER_GROUP=4 +CONFIG_SOC_RMT_RX_CANDIDATES_PER_GROUP=4 +CONFIG_SOC_RMT_CHANNELS_PER_GROUP=4 +CONFIG_SOC_RMT_MEM_WORDS_PER_CHANNEL=64 +CONFIG_SOC_RMT_SUPPORT_RX_DEMODULATION=y +CONFIG_SOC_RMT_SUPPORT_TX_ASYNC_STOP=y +CONFIG_SOC_RMT_SUPPORT_TX_LOOP_COUNT=y +CONFIG_SOC_RMT_SUPPORT_TX_SYNCHRO=y +CONFIG_SOC_RMT_SUPPORT_TX_CARRIER_DATA_ONLY=y +CONFIG_SOC_RMT_SUPPORT_REF_TICK=y +CONFIG_SOC_RMT_SUPPORT_APB=y +CONFIG_SOC_RMT_CHANNEL_CLK_INDEPENDENT=y +CONFIG_SOC_RTCIO_PIN_COUNT=22 +CONFIG_SOC_RTCIO_INPUT_OUTPUT_SUPPORTED=y +CONFIG_SOC_RTCIO_HOLD_SUPPORTED=y +CONFIG_SOC_RTCIO_WAKE_SUPPORTED=y +CONFIG_SOC_SDM_GROUPS=1 +CONFIG_SOC_SDM_CHANNELS_PER_GROUP=8 +CONFIG_SOC_SPI_HD_BOTH_INOUT_SUPPORTED=y +CONFIG_SOC_SPI_PERIPH_NUM=3 +CONFIG_SOC_SPI_DMA_CHAN_NUM=3 +CONFIG_SOC_SPI_MAX_CS_NUM=6 +CONFIG_SOC_SPI_MAXIMUM_BUFFER_SIZE=72 +CONFIG_SOC_SPI_MAX_PRE_DIVIDER=8192 +CONFIG_SOC_SPI_SUPPORT_DDRCLK=y +CONFIG_SOC_SPI_SLAVE_SUPPORT_SEG_TRANS=y +CONFIG_SOC_SPI_SUPPORT_CD_SIG=y +CONFIG_SOC_SPI_SUPPORT_CONTINUOUS_TRANS=y +CONFIG_SOC_SPI_SUPPORT_SLAVE_HD_VER2=y +CONFIG_SOC_SPI_PERIPH_SUPPORT_CONTROL_DUMMY_OUT=y +CONFIG_SOC_MEMSPI_IS_INDEPENDENT=y +CONFIG_SOC_SPI_SUPPORT_OCT=y +CONFIG_SOC_MEMSPI_SRC_FREQ_80M_SUPPORTED=y +CONFIG_SOC_MEMSPI_SRC_FREQ_40M_SUPPORTED=y +CONFIG_SOC_MEMSPI_SRC_FREQ_26M_SUPPORTED=y +CONFIG_SOC_MEMSPI_SRC_FREQ_20M_SUPPORTED=y +CONFIG_SOC_SYSTIMER_COUNTER_NUM=y +CONFIG_SOC_SYSTIMER_ALARM_NUM=3 +CONFIG_SOC_SYSTIMER_BIT_WIDTH_LO=32 +CONFIG_SOC_SYSTIMER_BIT_WIDTH_HI=32 +CONFIG_SOC_TIMER_GROUPS=2 +CONFIG_SOC_TIMER_GROUP_TIMERS_PER_GROUP=2 +CONFIG_SOC_TIMER_GROUP_COUNTER_BIT_WIDTH=64 +CONFIG_SOC_TIMER_GROUP_SUPPORT_XTAL=y +CONFIG_SOC_TIMER_GROUP_SUPPORT_APB=y +CONFIG_SOC_TIMER_GROUP_TOTAL_TIMERS=4 +CONFIG_SOC_TOUCH_VERSION_2=y +CONFIG_SOC_TOUCH_SENSOR_NUM=15 +CONFIG_SOC_TOUCH_PROXIMITY_CHANNEL_NUM=3 +CONFIG_SOC_TOUCH_PAD_THRESHOLD_MAX=0x1FFFFF +CONFIG_SOC_TOUCH_PAD_MEASURE_WAIT_MAX=0xFF +CONFIG_SOC_TWAI_BRP_MIN=2 +CONFIG_SOC_TWAI_BRP_MAX=32768 +CONFIG_SOC_TWAI_SUPPORTS_RX_STATUS=y +CONFIG_SOC_UART_NUM=2 +CONFIG_SOC_UART_SUPPORT_WAKEUP_INT=y +CONFIG_SOC_UART_SUPPORT_APB_CLK=y +CONFIG_SOC_UART_SUPPORT_REF_TICK=y +CONFIG_SOC_UART_FIFO_LEN=128 +CONFIG_SOC_UART_BITRATE_MAX=5000000 +CONFIG_SOC_SPIRAM_SUPPORTED=y +CONFIG_SOC_USB_PERIPH_NUM=y +CONFIG_SOC_SHA_DMA_MAX_BUFFER_SIZE=3968 +CONFIG_SOC_SHA_SUPPORT_DMA=y +CONFIG_SOC_SHA_SUPPORT_RESUME=y +CONFIG_SOC_SHA_CRYPTO_DMA=y +CONFIG_SOC_SHA_SUPPORT_SHA1=y +CONFIG_SOC_SHA_SUPPORT_SHA224=y +CONFIG_SOC_SHA_SUPPORT_SHA256=y +CONFIG_SOC_SHA_SUPPORT_SHA384=y +CONFIG_SOC_SHA_SUPPORT_SHA512=y +CONFIG_SOC_SHA_SUPPORT_SHA512_224=y +CONFIG_SOC_SHA_SUPPORT_SHA512_256=y +CONFIG_SOC_SHA_SUPPORT_SHA512_T=y +CONFIG_SOC_RSA_MAX_BIT_LEN=4096 +CONFIG_SOC_AES_SUPPORT_DMA=y +CONFIG_SOC_AES_SUPPORT_GCM=y +CONFIG_SOC_EFUSE_DIS_DOWNLOAD_DCACHE=y +CONFIG_SOC_EFUSE_HARD_DIS_JTAG=y +CONFIG_SOC_EFUSE_SOFT_DIS_JTAG=y +CONFIG_SOC_EFUSE_DIS_BOOT_REMAP=y +CONFIG_SOC_EFUSE_DIS_LEGACY_SPI_BOOT=y +CONFIG_SOC_SECURE_BOOT_V2_RSA=y +CONFIG_SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS=3 +CONFIG_SOC_EFUSE_REVOKE_BOOT_KEY_DIGESTS=y +CONFIG_SOC_SUPPORT_SECURE_BOOT_REVOKE_KEY=y +CONFIG_SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX=64 +CONFIG_SOC_FLASH_ENCRYPTION_XTS_AES=y +CONFIG_SOC_FLASH_ENCRYPTION_XTS_AES_OPTIONS=y +CONFIG_SOC_FLASH_ENCRYPTION_XTS_AES_128=y +CONFIG_SOC_FLASH_ENCRYPTION_XTS_AES_256=y +CONFIG_SOC_MEMPROT_CPU_PREFETCH_PAD_SIZE=16 +CONFIG_SOC_MEMPROT_MEM_ALIGN_SIZE=4 +CONFIG_SOC_AES_CRYPTO_DMA=y +CONFIG_SOC_AES_SUPPORT_AES_128=y +CONFIG_SOC_AES_SUPPORT_AES_192=y +CONFIG_SOC_AES_SUPPORT_AES_256=y +CONFIG_SOC_PHY_DIG_REGS_MEM_SIZE=21 +CONFIG_SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH=12 +CONFIG_SOC_SPI_MEM_SUPPORT_AUTO_WAIT_IDLE=y +CONFIG_SOC_SPI_MEM_SUPPORT_AUTO_SUSPEND=y +CONFIG_SOC_SPI_MEM_SUPPORT_SW_SUSPEND=y +CONFIG_SOC_SPI_MEM_SUPPORT_CONFIG_GPIO_BY_EFUSE=y +CONFIG_SOC_PM_SUPPORT_EXT_WAKEUP=y +CONFIG_SOC_PM_SUPPORT_WIFI_WAKEUP=y +CONFIG_SOC_PM_SUPPORT_TOUCH_SENSOR_WAKEUP=y +CONFIG_SOC_PM_SUPPORT_WIFI_PD=y +CONFIG_SOC_PM_SUPPORT_RTC_PERIPH_PD=y +CONFIG_SOC_PM_SUPPORT_RTC_FAST_MEM_PD=y +CONFIG_SOC_PM_SUPPORT_RTC_SLOW_MEM_PD=y +CONFIG_SOC_COEX_HW_PTI=y +CONFIG_SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC=y +CONFIG_SOC_WIFI_HW_TSF=y +CONFIG_SOC_WIFI_FTM_SUPPORT=y +CONFIG_SOC_WIFI_WAPI_SUPPORT=y +CONFIG_SOC_WIFI_CSI_SUPPORT=y +CONFIG_SOC_WIFI_MESH_SUPPORT=y CONFIG_IDF_CMAKE=y CONFIG_IDF_TARGET_ARCH_XTENSA=y +CONFIG_IDF_TARGET_ARCH="xtensa" CONFIG_IDF_TARGET="esp32s2" CONFIG_IDF_TARGET_ESP32S2=y CONFIG_IDF_FIRMWARE_CHIP_ID=0x0002 -# -# SDK tool configuration -# -CONFIG_SDK_TOOLPREFIX="xtensa-esp32s2-elf-" -# CONFIG_SDK_TOOLCHAIN_SUPPORTS_TIME_WIDE_64_BITS is not set -# end of SDK tool configuration - # # Build type # @@ -23,18 +248,10 @@ CONFIG_APP_BUILD_TYPE_APP_2NDBOOT=y CONFIG_APP_BUILD_GENERATE_BINARIES=y CONFIG_APP_BUILD_BOOTLOADER=y CONFIG_APP_BUILD_USE_FLASH_SECTIONS=y +# CONFIG_APP_REPRODUCIBLE_BUILD is not set +# CONFIG_APP_NO_BLOBS is not set # end of Build type -# -# Application manager -# -CONFIG_APP_COMPILE_TIME_DATE=y -# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set -# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set -# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set -CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16 -# end of Application manager - # # Bootloader config # @@ -69,13 +286,28 @@ CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y # # Security features # -CONFIG_SECURE_BOOT_SUPPORTS_RSA=y -CONFIG_SECURE_TARGET_HAS_SECURE_ROM_DL_MODE=y +CONFIG_SECURE_BOOT_V2_RSA_SUPPORTED=y +CONFIG_SECURE_BOOT_V2_PREFERRED=y # CONFIG_SECURE_SIGNED_APPS_NO_SECURE_BOOT is not set # CONFIG_SECURE_BOOT is not set # CONFIG_SECURE_FLASH_ENC_ENABLED is not set +CONFIG_SECURE_ROM_DL_MODE_ENABLED=y # end of Security features +# +# Application manager +# +CONFIG_APP_COMPILE_TIME_DATE=y +# CONFIG_APP_EXCLUDE_PROJECT_VER_VAR is not set +# CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR is not set +# CONFIG_APP_PROJECT_VER_FROM_CONFIG is not set +CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16 +# end of Application manager + +CONFIG_ESP_ROM_HAS_CRC_LE=y +CONFIG_ESP_ROM_HAS_MZ_CRC32=y +CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y + # # Boot ROM Behavior # @@ -88,7 +320,6 @@ CONFIG_BOOT_ROM_LOG_ALWAYS_ON=y # # Serial flasher config # -CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200 # CONFIG_ESPTOOLPY_NO_STUB is not set # CONFIG_ESPTOOLPY_FLASHMODE_QIO is not set # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set @@ -110,22 +341,13 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y # CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set CONFIG_ESPTOOLPY_FLASHSIZE="4MB" -CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y +# CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set CONFIG_ESPTOOLPY_BEFORE_RESET=y # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set CONFIG_ESPTOOLPY_BEFORE="default_reset" CONFIG_ESPTOOLPY_AFTER_RESET=y # CONFIG_ESPTOOLPY_AFTER_NORESET is not set CONFIG_ESPTOOLPY_AFTER="hard_reset" -# CONFIG_ESPTOOLPY_MONITOR_BAUD_CONSOLE is not set -# CONFIG_ESPTOOLPY_MONITOR_BAUD_9600B is not set -# CONFIG_ESPTOOLPY_MONITOR_BAUD_57600B is not set -CONFIG_ESPTOOLPY_MONITOR_BAUD_115200B=y -# CONFIG_ESPTOOLPY_MONITOR_BAUD_230400B is not set -# CONFIG_ESPTOOLPY_MONITOR_BAUD_921600B is not set -# CONFIG_ESPTOOLPY_MONITOR_BAUD_2MB is not set -# CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER is not set -CONFIG_ESPTOOLPY_MONITOR_BAUD_OTHER_VAL=115200 CONFIG_ESPTOOLPY_MONITOR_BAUD=115200 # end of Serial flasher config @@ -152,6 +374,7 @@ CONFIG_COMPILER_OPTIMIZATION_DEFAULT=y CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_ENABLE=y # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT is not set # CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE is not set +CONFIG_COMPILER_FLOAT_LIB_FROM_GCCLIB=y CONFIG_COMPILER_OPTIMIZATION_ASSERTION_LEVEL=2 # CONFIG_COMPILER_OPTIMIZATION_CHECKS_SILENT is not set CONFIG_COMPILER_HIDE_PATHS_MACROS=y @@ -162,7 +385,6 @@ CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y # CONFIG_COMPILER_STACK_CHECK_MODE_STRONG is not set # CONFIG_COMPILER_STACK_CHECK_MODE_ALL is not set # CONFIG_COMPILER_WARN_WRITE_STRINGS is not set -# CONFIG_COMPILER_DISABLE_GCC8_WARNINGS is not set # CONFIG_COMPILER_DUMP_RTL_FILES is not set # end of Compiler options @@ -175,69 +397,107 @@ CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y # # CONFIG_APPTRACE_DEST_JTAG is not set CONFIG_APPTRACE_DEST_NONE=y +# CONFIG_APPTRACE_DEST_UART0 is not set +# CONFIG_APPTRACE_DEST_UART1 is not set +CONFIG_APPTRACE_DEST_UART_NONE=y +CONFIG_APPTRACE_UART_TASK_PRIO=1 CONFIG_APPTRACE_LOCK_ENABLE=y # end of Application Level Tracing # -# ESP-ASIO -# -# CONFIG_ASIO_SSL_SUPPORT is not set -# end of ESP-ASIO - -# -# CoAP Configuration -# -CONFIG_COAP_MBEDTLS_PSK=y -# CONFIG_COAP_MBEDTLS_PKI is not set -# CONFIG_COAP_MBEDTLS_DEBUG is not set -CONFIG_COAP_LOG_DEFAULT_LEVEL=0 -# end of CoAP Configuration - -# -# Driver configurations +# Driver Configurations # # -# ADC configuration +# Legacy ADC Configuration # -# CONFIG_ADC_FORCE_XPD_FSM is not set CONFIG_ADC_DISABLE_DAC=y -# end of ADC configuration +# CONFIG_ADC_SUPPRESS_DEPRECATE_WARN is not set # -# MCPWM configuration +# Legacy ADC Calibration Configuration # -# CONFIG_MCPWM_ISR_IN_IRAM is not set -# end of MCPWM configuration +# CONFIG_ADC_CALI_SUPPRESS_DEPRECATE_WARN is not set +# end of Legacy ADC Calibration Configuration +# end of Legacy ADC Configuration # -# SPI configuration +# SPI Configuration # # CONFIG_SPI_MASTER_IN_IRAM is not set # CONFIG_SPI_MASTER_ISR_IN_IRAM is not set # CONFIG_SPI_SLAVE_IN_IRAM is not set # CONFIG_SPI_SLAVE_ISR_IN_IRAM is not set -# end of SPI configuration +# end of SPI Configuration # -# TWAI configuration +# TWAI Configuration # # CONFIG_TWAI_ISR_IN_IRAM is not set -# end of TWAI configuration +CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM=y +# end of TWAI Configuration + +# +# Temperature sensor Configuration +# +# CONFIG_TEMP_SENSOR_SUPPRESS_DEPRECATE_WARN is not set +# CONFIG_TEMP_SENSOR_ENABLE_DEBUG_LOG is not set +# end of Temperature sensor Configuration # -# UART configuration +# UART Configuration # CONFIG_UART_ISR_IN_IRAM=y -# end of UART configuration +# end of UART Configuration # -# GDMA Configuration +# GPIO Configuration # -# CONFIG_GDMA_CTRL_FUNC_IN_IRAM is not set -# CONFIG_GDMA_ISR_IRAM_SAFE is not set -# end of GDMA Configuration -# end of Driver configurations +# CONFIG_GPIO_CTRL_FUNC_IN_IRAM is not set +# end of GPIO Configuration + +# +# Sigma Delta Modulator Configuration +# +# CONFIG_SDM_CTRL_FUNC_IN_IRAM is not set +# CONFIG_SDM_SUPPRESS_DEPRECATE_WARN is not set +# CONFIG_SDM_ENABLE_DEBUG_LOG is not set +# end of Sigma Delta Modulator Configuration + +# +# GPTimer Configuration +# +# CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM is not set +# CONFIG_GPTIMER_ISR_IRAM_SAFE is not set +# CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set +# CONFIG_GPTIMER_ENABLE_DEBUG_LOG is not set +# end of GPTimer Configuration + +# +# PCNT Configuration +# +# CONFIG_PCNT_CTRL_FUNC_IN_IRAM is not set +# CONFIG_PCNT_ISR_IRAM_SAFE is not set +# CONFIG_PCNT_SUPPRESS_DEPRECATE_WARN is not set +# CONFIG_PCNT_ENABLE_DEBUG_LOG is not set +# end of PCNT Configuration + +# +# RMT Configuration +# +# CONFIG_RMT_ISR_IRAM_SAFE is not set +# CONFIG_RMT_SUPPRESS_DEPRECATE_WARN is not set +# CONFIG_RMT_ENABLE_DEBUG_LOG is not set +# end of RMT Configuration + +# +# I2S Configuration +# +# CONFIG_I2S_ISR_IRAM_SAFE is not set +# CONFIG_I2S_SUPPRESS_DEPRECATE_WARN is not set +# CONFIG_I2S_ENABLE_DEBUG_LOG is not set +# end of I2S Configuration +# end of Driver Configurations # # eFuse Bit Manager @@ -259,63 +519,12 @@ CONFIG_ESP_TLS_USE_DS_PERIPHERAL=y # end of ESP-TLS # -# ESP32S2-specific +# ADC and ADC Calibration # -# CONFIG_ESP32S2_DEFAULT_CPU_FREQ_80 is not set -# CONFIG_ESP32S2_DEFAULT_CPU_FREQ_160 is not set -CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ=240 - -# -# Cache config -# -CONFIG_ESP32S2_INSTRUCTION_CACHE_8KB=y -# CONFIG_ESP32S2_INSTRUCTION_CACHE_16KB is not set -# CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_16B is not set -CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_32B=y -CONFIG_ESP32S2_DATA_CACHE_0KB=y -# CONFIG_ESP32S2_DATA_CACHE_8KB is not set -# CONFIG_ESP32S2_DATA_CACHE_16KB is not set -# CONFIG_ESP32S2_DATA_CACHE_LINE_16B is not set -CONFIG_ESP32S2_DATA_CACHE_LINE_32B=y -# CONFIG_ESP32S2_INSTRUCTION_CACHE_WRAP is not set -# CONFIG_ESP32S2_DATA_CACHE_WRAP is not set -# end of Cache config - -# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set -# CONFIG_ESP32S2_TRAX is not set -CONFIG_ESP32S2_TRACEMEM_RESERVE_DRAM=0x0 -# CONFIG_ESP32S2_ULP_COPROC_ENABLED is not set -CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=0 -CONFIG_ESP32S2_DEBUG_OCDAWARE=y -CONFIG_ESP32S2_BROWNOUT_DET=y -CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_7=y -# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_6 is not set -# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_5 is not set -# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_4 is not set -# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_3 is not set -# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_2 is not set -# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_1 is not set -CONFIG_ESP32S2_BROWNOUT_DET_LVL=7 -CONFIG_ESP32S2_TIME_SYSCALL_USE_RTC_FRC1=y -# CONFIG_ESP32S2_TIME_SYSCALL_USE_RTC is not set -# CONFIG_ESP32S2_TIME_SYSCALL_USE_FRC1 is not set -# CONFIG_ESP32S2_TIME_SYSCALL_USE_NONE is not set -CONFIG_ESP32S2_RTC_CLK_SRC_INT_RC=y -# CONFIG_ESP32S2_RTC_CLK_SRC_EXT_CRYS is not set -# CONFIG_ESP32S2_RTC_CLK_SRC_EXT_OSC is not set -# CONFIG_ESP32S2_RTC_CLK_SRC_INT_8MD256 is not set -CONFIG_ESP32S2_RTC_CLK_CAL_CYCLES=576 -# CONFIG_ESP32S2_NO_BLOBS is not set -# CONFIG_ESP32S2_KEEP_USB_ALIVE is not set -# CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM is not set -# CONFIG_ESP32S2_USE_FIXED_STATIC_RAM_SIZE is not set -# end of ESP32S2-specific - -# -# ADC-Calibration -# -# end of ADC-Calibration +# CONFIG_ADC_ONESHOT_CTRL_FUNC_IN_IRAM is not set +# CONFIG_ADC_CONTINUOUS_ISR_IRAM_SAFE is not set +CONFIG_ADC_DISABLE_DAC_OUTPUT=y +# end of ADC and ADC Calibration # # Common ESP-related @@ -332,6 +541,7 @@ CONFIG_ETH_USE_SPI_ETHERNET=y # CONFIG_ETH_SPI_ETHERNET_W5500 is not set # CONFIG_ETH_SPI_ETHERNET_KSZ8851SNL is not set # CONFIG_ETH_USE_OPENETH is not set +# CONFIG_ETH_TRANSMIT_MUTEX is not set # end of Ethernet # @@ -364,12 +574,14 @@ CONFIG_HTTPD_ERR_RESP_NO_DELAY=y CONFIG_HTTPD_PURGE_BUF_LEN=32 # CONFIG_HTTPD_LOG_PURGE_DATA is not set # CONFIG_HTTPD_WS_SUPPORT is not set +# CONFIG_HTTPD_QUEUE_WORK_BLOCKING is not set # end of HTTP Server # # ESP HTTPS OTA # -# CONFIG_OTA_ALLOW_HTTP is not set +# CONFIG_ESP_HTTPS_OTA_DECRYPT_CB is not set +# CONFIG_ESP_HTTPS_OTA_ALLOW_HTTP is not set # end of ESP HTTPS OTA # @@ -382,6 +594,21 @@ CONFIG_HTTPD_PURGE_BUF_LEN=32 # Hardware Settings # +# +# Chip revision +# +CONFIG_ESP32S2_REV_MIN_0=y +# CONFIG_ESP32S2_REV_MIN_1 is not set +CONFIG_ESP32S2_REV_MIN_FULL=0 +CONFIG_ESP_REV_MIN_FULL=0 + +# +# Maximum Supported ESP32-S2 Revision (Rev v1.99) +# +CONFIG_ESP32S2_REV_MAX_FULL=199 +CONFIG_ESP_REV_MAX_FULL=199 +# end of Chip revision + # # MAC Config # @@ -404,23 +631,40 @@ CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y # # RTC Clock Config # +CONFIG_RTC_CLK_SRC_INT_RC=y +# CONFIG_RTC_CLK_SRC_EXT_CRYS is not set +# CONFIG_RTC_CLK_SRC_EXT_OSC is not set +# CONFIG_RTC_CLK_SRC_INT_8MD256 is not set +CONFIG_RTC_CLK_CAL_CYCLES=576 # end of RTC Clock Config -# end of Hardware Settings # -# IPC (Inter-Processor Call) +# Peripheral Control # -CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 -# end of IPC (Inter-Processor Call) +# CONFIG_PERIPH_CTRL_FUNC_IN_IRAM is not set +# end of Peripheral Control + +# +# Main XTAL Config +# +CONFIG_XTAL_FREQ_40=y +CONFIG_XTAL_FREQ=40 +# end of Main XTAL Config +# end of Hardware Settings # # LCD and Touch Panel # +# +# LCD Touch Drivers are maintained in the IDF Component Registry +# + # # LCD Peripheral Configuration # CONFIG_LCD_PANEL_IO_FORMAT_BUF_SIZE=32 +# CONFIG_LCD_ENABLE_DEBUG_LOG is not set # end of LCD Peripheral Configuration # end of LCD and Touch Panel @@ -430,7 +674,8 @@ CONFIG_LCD_PANEL_IO_FORMAT_BUF_SIZE=32 CONFIG_ESP_NETIF_IP_LOST_TIMER_INTERVAL=120 CONFIG_ESP_NETIF_TCPIP_LWIP=y # CONFIG_ESP_NETIF_LOOPBACK is not set -CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER=y +# CONFIG_ESP_NETIF_L2_TAP is not set +# CONFIG_ESP_NETIF_BRIDGE_EN is not set # end of ESP NETIF Adapter # @@ -440,6 +685,7 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y # CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP_PHY_MAX_TX_POWER=20 +CONFIG_ESP_PHY_REDUCE_TX_POWER=y # CONFIG_ESP_PHY_ENABLE_USB is not set # end of PHY @@ -449,9 +695,57 @@ CONFIG_ESP_PHY_MAX_TX_POWER=20 # CONFIG_PM_ENABLE is not set # end of Power Management +# +# ESP PSRAM +# +# CONFIG_SPIRAM is not set +# end of ESP PSRAM + +# +# ESP Ringbuf +# +# CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH is not set +# CONFIG_RINGBUF_PLACE_ISR_FUNCTIONS_INTO_FLASH is not set +# end of ESP Ringbuf + # # ESP System Settings # +# CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_80 is not set +# CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160 is not set +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y +CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=240 + +# +# Cache config +# +CONFIG_ESP32S2_INSTRUCTION_CACHE_8KB=y +# CONFIG_ESP32S2_INSTRUCTION_CACHE_16KB is not set +# CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_16B is not set +CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_32B=y +CONFIG_ESP32S2_DATA_CACHE_0KB=y +# CONFIG_ESP32S2_DATA_CACHE_8KB is not set +# CONFIG_ESP32S2_DATA_CACHE_16KB is not set +# CONFIG_ESP32S2_DATA_CACHE_LINE_16B is not set +CONFIG_ESP32S2_DATA_CACHE_LINE_32B=y +# CONFIG_ESP32S2_INSTRUCTION_CACHE_WRAP is not set +# CONFIG_ESP32S2_DATA_CACHE_WRAP is not set +# end of Cache config + +# +# Memory +# +# CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM is not set +# CONFIG_ESP32S2_USE_FIXED_STATIC_RAM_SIZE is not set +# end of Memory + +# +# Trace memory +# +# CONFIG_ESP32S2_TRAX is not set +CONFIG_ESP32S2_TRACEMEM_RESERVE_DRAM=0x0 +# end of Trace memory + # CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT is not set CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y # CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT is not set @@ -464,11 +758,8 @@ CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y # # Memory protection # -CONFIG_ESP_SYSTEM_MEMPROT_DEPCHECK=y CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=y CONFIG_ESP_SYSTEM_MEMPROT_FEATURE_LOCK=y -CONFIG_ESP_SYSTEM_MEMPROT_CPU_PREFETCH_PAD_SIZE=16 -CONFIG_ESP_SYSTEM_MEMPROT_MEM_ALIGN_SIZE=4 # end of Memory protection CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32 @@ -485,12 +776,37 @@ CONFIG_ESP_CONSOLE_NONE=y CONFIG_ESP_CONSOLE_MULTIPLE_UART=y CONFIG_ESP_CONSOLE_UART_NUM=-1 # CONFIG_ESP_INT_WDT is not set -# CONFIG_ESP_TASK_WDT is not set +CONFIG_ESP_TASK_WDT_EN=y +# CONFIG_ESP_TASK_WDT_INIT is not set # CONFIG_ESP_PANIC_HANDLER_IRAM is not set # CONFIG_ESP_DEBUG_STUBS_ENABLE is not set +CONFIG_ESP_DEBUG_OCDAWARE=y CONFIG_ESP_SYSTEM_CHECK_INT_LEVEL_4=y + +# +# Brownout Detector +# +CONFIG_ESP_BROWNOUT_DET=y +CONFIG_ESP_BROWNOUT_DET_LVL_SEL_7=y +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_2 is not set +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_1 is not set +CONFIG_ESP_BROWNOUT_DET_LVL=7 +# end of Brownout Detector + +# CONFIG_ESP32S2_KEEP_USB_ALIVE is not set +CONFIG_ESP_SYSTEM_BROWNOUT_INTR=y # end of ESP System Settings +# +# IPC (Inter-Processor Call) +# +CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 +# end of IPC (Inter-Processor Call) + # # High resolution timer (esp_timer) # @@ -522,12 +838,15 @@ CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32 # CONFIG_ESP32_WIFI_IRAM_OPT is not set # CONFIG_ESP32_WIFI_RX_IRAM_OPT is not set CONFIG_ESP32_WIFI_ENABLE_WPA3_SAE=y +CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA=y # CONFIG_ESP_WIFI_SLP_IRAM_OPT is not set # CONFIG_ESP_WIFI_FTM_ENABLE is not set # CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE is not set # CONFIG_ESP_WIFI_EXTERNAL_COEXIST_ENABLE is not set # CONFIG_ESP_WIFI_GMAC_SUPPORT is not set CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y +# CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set +CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=7 # end of Wi-Fi # @@ -541,6 +860,19 @@ CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y # # FAT Filesystem support # +CONFIG_FATFS_VOLUME_COUNT=2 +# CONFIG_FATFS_SECTOR_512 is not set +# CONFIG_FATFS_SECTOR_1024 is not set +# CONFIG_FATFS_SECTOR_2048 is not set +CONFIG_FATFS_SECTOR_4096=y +CONFIG_FATFS_SECTORS_PER_CLUSTER_1=y +# CONFIG_FATFS_SECTORS_PER_CLUSTER_2 is not set +# CONFIG_FATFS_SECTORS_PER_CLUSTER_4 is not set +# CONFIG_FATFS_SECTORS_PER_CLUSTER_8 is not set +# CONFIG_FATFS_SECTORS_PER_CLUSTER_16 is not set +# CONFIG_FATFS_SECTORS_PER_CLUSTER_32 is not set +# CONFIG_FATFS_SECTORS_PER_CLUSTER_64 is not set +# CONFIG_FATFS_SECTORS_PER_CLUSTER_128 is not set # CONFIG_FATFS_CODEPAGE_DYNAMIC is not set CONFIG_FATFS_CODEPAGE_437=y # CONFIG_FATFS_CODEPAGE_720 is not set @@ -563,6 +895,9 @@ CONFIG_FATFS_CODEPAGE_437=y # CONFIG_FATFS_CODEPAGE_936 is not set # CONFIG_FATFS_CODEPAGE_949 is not set # CONFIG_FATFS_CODEPAGE_950 is not set +CONFIG_FATFS_AUTO_TYPE=y +# CONFIG_FATFS_FAT12 is not set +# CONFIG_FATFS_FAT16 is not set CONFIG_FATFS_CODEPAGE=437 CONFIG_FATFS_LFN_NONE=y # CONFIG_FATFS_LFN_HEAP is not set @@ -574,64 +909,25 @@ CONFIG_FATFS_TIMEOUT_MS=10000 # end of FAT Filesystem support # -# Modbus configuration -# -CONFIG_FMB_COMM_MODE_TCP_EN=y -CONFIG_FMB_TCP_PORT_DEFAULT=502 -CONFIG_FMB_TCP_PORT_MAX_CONN=5 -CONFIG_FMB_TCP_CONNECTION_TOUT_SEC=20 -CONFIG_FMB_COMM_MODE_RTU_EN=y -CONFIG_FMB_COMM_MODE_ASCII_EN=y -CONFIG_FMB_MASTER_TIMEOUT_MS_RESPOND=150 -CONFIG_FMB_MASTER_DELAY_MS_CONVERT=200 -CONFIG_FMB_QUEUE_LENGTH=20 -CONFIG_FMB_PORT_TASK_STACK_SIZE=4096 -CONFIG_FMB_SERIAL_BUF_SIZE=256 -CONFIG_FMB_SERIAL_ASCII_BITS_PER_SYMB=8 -CONFIG_FMB_SERIAL_ASCII_TIMEOUT_RESPOND_MS=1000 -CONFIG_FMB_PORT_TASK_PRIO=10 -CONFIG_FMB_PORT_TASK_AFFINITY=0x7FFFFFFF -CONFIG_FMB_CONTROLLER_SLAVE_ID_SUPPORT=y -CONFIG_FMB_CONTROLLER_SLAVE_ID=0x00112233 -CONFIG_FMB_CONTROLLER_NOTIFY_TIMEOUT=20 -CONFIG_FMB_CONTROLLER_NOTIFY_QUEUE_SIZE=20 -CONFIG_FMB_CONTROLLER_STACK_SIZE=4096 -CONFIG_FMB_EVENT_QUEUE_TIMEOUT=20 -CONFIG_FMB_TIMER_PORT_ENABLED=y -CONFIG_FMB_TIMER_GROUP=0 -CONFIG_FMB_TIMER_INDEX=0 -CONFIG_FMB_MASTER_TIMER_GROUP=0 -CONFIG_FMB_MASTER_TIMER_INDEX=0 -# CONFIG_FMB_TIMER_ISR_IN_IRAM is not set -# end of Modbus configuration +# FreeRTOS +# # -# FreeRTOS +# Kernel # +# CONFIG_FREERTOS_SMP is not set CONFIG_FREERTOS_UNICORE=y -CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF -CONFIG_FREERTOS_TICK_SUPPORT_CORETIMER=y -CONFIG_FREERTOS_CORETIMER_0=y -# CONFIG_FREERTOS_CORETIMER_1 is not set -CONFIG_FREERTOS_SYSTICK_USES_CCOUNT=y -CONFIG_FREERTOS_OPTIMIZED_SCHEDULER=y CONFIG_FREERTOS_HZ=100 -CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y +CONFIG_FREERTOS_OPTIMIZED_SCHEDULER=y # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set # CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y -# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set -CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1 -CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y -# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set -# CONFIG_FREERTOS_ASSERT_DISABLE is not set CONFIG_FREERTOS_IDLE_TASK_STACKSIZE=2304 -CONFIG_FREERTOS_ISR_STACKSIZE=1536 -# CONFIG_FREERTOS_LEGACY_HOOKS is not set +# CONFIG_FREERTOS_USE_IDLE_HOOK is not set +# CONFIG_FREERTOS_USE_TICK_HOOK is not set CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16 -CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y -# CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set +# CONFIG_FREERTOS_ENABLE_BACKWARD_COMPATIBILITY is not set CONFIG_FREERTOS_TIMER_TASK_PRIORITY=1 CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=2048 CONFIG_FREERTOS_TIMER_QUEUE_LENGTH=10 @@ -640,13 +936,31 @@ CONFIG_FREERTOS_USE_TRACE_FACILITY=y CONFIG_FREERTOS_USE_STATS_FORMATTING_FUNCTIONS=y # CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID is not set # CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set +# end of Kernel + +# +# Port +# CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y +# CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK is not set +# CONFIG_FREERTOS_ENABLE_STATIC_TASK_CLEAN_UP is not set CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y -# CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set +CONFIG_FREERTOS_ISR_STACKSIZE=1536 +CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y +CONFIG_FREERTOS_TICK_SUPPORT_CORETIMER=y +CONFIG_FREERTOS_CORETIMER_0=y +# CONFIG_FREERTOS_CORETIMER_1 is not set +CONFIG_FREERTOS_SYSTICK_USES_CCOUNT=y CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y -CONFIG_FREERTOS_DEBUG_OCDAWARE=y -CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y +# CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set +CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y +CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y +# end of Port + +CONFIG_FREERTOS_NO_AFFINITY=0x7FFFFFFF +CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y +CONFIG_FREERTOS_DEBUG_OCDAWARE=y # end of FreeRTOS # @@ -654,7 +968,7 @@ CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y # CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y # CONFIG_HAL_ASSERTION_DISABLE is not set -# CONFIG_HAL_ASSERTION_SILIENT is not set +# CONFIG_HAL_ASSERTION_SILENT is not set # CONFIG_HAL_ASSERTION_ENABLE is not set CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2 # end of Hardware Abstraction Layer (HAL) and Low Level (LL) @@ -671,18 +985,6 @@ CONFIG_HEAP_TRACING_OFF=y CONFIG_HEAP_ABORT_WHEN_ALLOCATION_FAILS=y # end of Heap memory debugging -# -# jsmn -# -# CONFIG_JSMN_PARENT_LINKS is not set -# CONFIG_JSMN_STRICT is not set -# end of jsmn - -# -# libsodium -# -# end of libsodium - # # Log output # @@ -708,6 +1010,7 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y CONFIG_LWIP_LOCAL_HOSTNAME="blackmagic.local" # CONFIG_LWIP_NETIF_API is not set # CONFIG_LWIP_TCPIP_CORE_LOCKING is not set +# CONFIG_LWIP_CHECK_THREAD_SAFETY is not set CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y # CONFIG_LWIP_L2_TO_L3_COPY is not set # CONFIG_LWIP_IRAM_OPTIMIZATION is not set @@ -725,15 +1028,18 @@ CONFIG_LWIP_IP6_FRAG=y # CONFIG_LWIP_IP6_REASSEMBLY is not set # CONFIG_LWIP_IP_FORWARD is not set # CONFIG_LWIP_STATS is not set -# CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set CONFIG_LWIP_ESP_GRATUITOUS_ARP=y CONFIG_LWIP_GARP_TMR_INTERVAL=60 +CONFIG_LWIP_ESP_MLDV6_REPORT=y +CONFIG_LWIP_MLDV6_TMR_INTERVAL=40 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y # CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID=y # CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set CONFIG_LWIP_DHCP_OPTIONS_LEN=68 +CONFIG_LWIP_NUM_NETIF_CLIENT_DATA=0 +CONFIG_LWIP_DHCP_COARSE_TIMER_SECS=1 # # DHCP server @@ -763,12 +1069,12 @@ CONFIG_LWIP_TCP_SYNMAXRTX=12 CONFIG_LWIP_TCP_MSS=1440 CONFIG_LWIP_TCP_TMR_INTERVAL=250 CONFIG_LWIP_TCP_MSL=60000 +CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT=20000 CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5744 CONFIG_LWIP_TCP_WND_DEFAULT=5744 CONFIG_LWIP_TCP_RECVMBOX_SIZE=6 CONFIG_LWIP_TCP_QUEUE_OOSEQ=y # CONFIG_LWIP_TCP_SACK_OUT is not set -# CONFIG_LWIP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set CONFIG_LWIP_TCP_OVERSIZE_MSS=y # CONFIG_LWIP_TCP_OVERSIZE_QUARTER_MSS is not set # CONFIG_LWIP_TCP_OVERSIZE_DISABLE is not set @@ -821,6 +1127,7 @@ CONFIG_LWIP_SNTP_MAX_SERVERS=1 CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000 # end of SNTP +CONFIG_LWIP_BRIDGEIF_MAX_PORTS=7 CONFIG_LWIP_ESP_LWIP_ASSERT=y # @@ -838,6 +1145,9 @@ CONFIG_LWIP_HOOK_ND6_GET_GW_NONE=y CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_NONE=y # CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT is not set # CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_CUSTOM is not set +CONFIG_LWIP_HOOK_IP6_INPUT_NONE=y +# CONFIG_LWIP_HOOK_IP6_INPUT_DEFAULT is not set +# CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM is not set # end of Hooks # CONFIG_LWIP_DEBUG is not set @@ -856,13 +1166,14 @@ CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN=4096 # CONFIG_MBEDTLS_DEBUG is not set # -# mbedTLS v2.28.x related +# mbedTLS v3.x related # +# CONFIG_MBEDTLS_SSL_PROTO_TLS1_3 is not set # CONFIG_MBEDTLS_SSL_VARIABLE_BUFFER_LENGTH is not set # CONFIG_MBEDTLS_X509_TRUSTED_CERT_CALLBACK is not set # CONFIG_MBEDTLS_SSL_CONTEXT_SERIALIZATION is not set CONFIG_MBEDTLS_SSL_KEEP_PEER_CERTIFICATE=y -# end of mbedTLS v2.28.x related +# end of mbedTLS v3.x related # # Certificate Bundle @@ -876,11 +1187,13 @@ CONFIG_MBEDTLS_HARDWARE_AES=y CONFIG_MBEDTLS_AES_USE_INTERRUPT=y CONFIG_MBEDTLS_HARDWARE_GCM=y CONFIG_MBEDTLS_HARDWARE_MPI=y +CONFIG_MBEDTLS_MPI_USE_INTERRUPT=y CONFIG_MBEDTLS_HARDWARE_SHA=y CONFIG_MBEDTLS_ROM_MD5=y # CONFIG_MBEDTLS_ATCA_HW_ECDSA_SIGN is not set # CONFIG_MBEDTLS_ATCA_HW_ECDSA_VERIFY is not set CONFIG_MBEDTLS_HAVE_TIME=y +# CONFIG_MBEDTLS_PLATFORM_TIME_ALT is not set # CONFIG_MBEDTLS_HAVE_TIME_DATE is not set CONFIG_MBEDTLS_ECDSA_DETERMINISTIC=y CONFIG_MBEDTLS_SHA512_C=y @@ -897,7 +1210,6 @@ CONFIG_MBEDTLS_TLS_ENABLED=y # # CONFIG_MBEDTLS_PSK_MODES is not set CONFIG_MBEDTLS_KEY_EXCHANGE_RSA=y -CONFIG_MBEDTLS_KEY_EXCHANGE_DHE_RSA=y CONFIG_MBEDTLS_KEY_EXCHANGE_ELLIPTIC_CURVE=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA=y CONFIG_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA=y @@ -906,16 +1218,11 @@ CONFIG_MBEDTLS_KEY_EXCHANGE_ECDH_RSA=y # end of TLS Key Exchange Methods CONFIG_MBEDTLS_SSL_RENEGOTIATION=y -# CONFIG_MBEDTLS_SSL_PROTO_SSL3 is not set -CONFIG_MBEDTLS_SSL_PROTO_TLS1=y -CONFIG_MBEDTLS_SSL_PROTO_TLS1_1=y CONFIG_MBEDTLS_SSL_PROTO_TLS1_2=y # CONFIG_MBEDTLS_SSL_PROTO_GMTSSL1_1 is not set # CONFIG_MBEDTLS_SSL_PROTO_DTLS is not set CONFIG_MBEDTLS_SSL_ALPN=y CONFIG_MBEDTLS_CLIENT_SSL_SESSION_TICKETS=y -CONFIG_MBEDTLS_X509_CHECK_KEY_USAGE=y -CONFIG_MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE=y CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y # @@ -924,9 +1231,6 @@ CONFIG_MBEDTLS_SERVER_SSL_SESSION_TICKETS=y CONFIG_MBEDTLS_AES_C=y # CONFIG_MBEDTLS_CAMELLIA_C is not set # CONFIG_MBEDTLS_DES_C is not set -CONFIG_MBEDTLS_RC4_DISABLED=y -# CONFIG_MBEDTLS_RC4_ENABLED_NO_DEFAULT is not set -# CONFIG_MBEDTLS_RC4_ENABLED is not set # CONFIG_MBEDTLS_BLOWFISH_C is not set # CONFIG_MBEDTLS_XTEA_C is not set CONFIG_MBEDTLS_CCM_C=y @@ -946,6 +1250,7 @@ CONFIG_MBEDTLS_X509_CSR_PARSE_C=y # end of Certificates CONFIG_MBEDTLS_ECP_C=y +# CONFIG_MBEDTLS_DHM_C is not set CONFIG_MBEDTLS_ECDH_C=y CONFIG_MBEDTLS_ECDSA_C=y # CONFIG_MBEDTLS_ECJPAKE_C is not set @@ -970,26 +1275,11 @@ CONFIG_MBEDTLS_ECP_NIST_OPTIM=y # CONFIG_MBEDTLS_SECURITY_RISKS is not set # end of mbedTLS -# -# mDNS -# -CONFIG_MDNS_MAX_SERVICES=10 -CONFIG_MDNS_TASK_PRIORITY=1 -CONFIG_MDNS_TASK_STACK_SIZE=4096 -# CONFIG_MDNS_TASK_AFFINITY_NO_AFFINITY is not set -CONFIG_MDNS_TASK_AFFINITY_CPU0=y -CONFIG_MDNS_TASK_AFFINITY=0x0 -CONFIG_MDNS_SERVICE_ADD_TIMEOUT_MS=2000 -# CONFIG_MDNS_STRICT_MODE is not set -CONFIG_MDNS_TIMER_PERIOD_MS=100 -# CONFIG_MDNS_NETWORKING_SOCKET is not set -CONFIG_MDNS_MULTIPLE_INSTANCE=y -# end of mDNS - # # ESP-MQTT Configurations # CONFIG_MQTT_PROTOCOL_311=y +# CONFIG_MQTT_PROTOCOL_5 is not set CONFIG_MQTT_TRANSPORT_SSL=y CONFIG_MQTT_TRANSPORT_WEBSOCKET=y CONFIG_MQTT_TRANSPORT_WEBSOCKET_SECURE=y @@ -1011,6 +1301,10 @@ CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF=y # CONFIG_NEWLIB_STDIN_LINE_ENDING_LF is not set CONFIG_NEWLIB_STDIN_LINE_ENDING_CR=y CONFIG_NEWLIB_NANO_FORMAT=y +CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC_HRT=y +# CONFIG_NEWLIB_TIME_SYSCALL_USE_RTC is not set +# CONFIG_NEWLIB_TIME_SYSCALL_USE_HRT is not set +# CONFIG_NEWLIB_TIME_SYSCALL_USE_NONE is not set # end of Newlib # @@ -1019,21 +1313,20 @@ CONFIG_NEWLIB_NANO_FORMAT=y # CONFIG_NVS_ASSERT_ERROR_CHECK is not set # end of NVS -# -# OpenSSL -# -# CONFIG_OPENSSL_DEBUG is not set -CONFIG_OPENSSL_ERROR_STACK=y -# CONFIG_OPENSSL_ASSERT_DO_NOTHING is not set -CONFIG_OPENSSL_ASSERT_EXIT=y -# end of OpenSSL - # # OpenThread # # CONFIG_OPENTHREAD_ENABLED is not set # end of OpenThread +# +# Protocomm +# +CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_0=y +CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_1=y +CONFIG_ESP_PROTOCOMM_SUPPORT_SECURITY_VERSION_2=y +# end of Protocomm + # # PThreads # @@ -1044,6 +1337,14 @@ CONFIG_PTHREAD_TASK_CORE_DEFAULT=-1 CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread" # end of PThreads +# +# MMU Config +# +CONFIG_MMU_PAGE_SIZE_64KB=y +CONFIG_MMU_PAGE_MODE="64KB" +CONFIG_MMU_PAGE_SIZE=0x10000 +# end of MMU Config + # # SPI Flash driver # @@ -1053,7 +1354,6 @@ CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y CONFIG_SPI_FLASH_DANGEROUS_WRITE_ABORTS=y # CONFIG_SPI_FLASH_DANGEROUS_WRITE_FAILS is not set # CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED is not set -# CONFIG_SPI_FLASH_USE_LEGACY_IMPL is not set # CONFIG_SPI_FLASH_BYPASS_BLOCK_ERASE is not set CONFIG_SPI_FLASH_YIELD_DURING_ERASE=y CONFIG_SPI_FLASH_ERASE_YIELD_DURATION_MS=20 @@ -1063,6 +1363,13 @@ CONFIG_SPI_FLASH_WRITE_CHUNK_SIZE=8192 # CONFIG_SPI_FLASH_CHECK_ERASE_TIMEOUT_DISABLED is not set # CONFIG_SPI_FLASH_OVERRIDE_CHIP_DRIVER_LIST is not set +# +# SPI Flash behavior when brownout +# +CONFIG_SPI_FLASH_BROWNOUT_RESET_XMC=y +CONFIG_SPI_FLASH_BROWNOUT_RESET=y +# end of SPI Flash behavior when brownout + # # Auto-detect flash chips # @@ -1119,9 +1426,16 @@ CONFIG_SPIFFS_USE_MTIME=y # CONFIG_WS_TRANSPORT=y CONFIG_WS_BUFFER_SIZE=1024 +# CONFIG_WS_DYNAMIC_BUFFER is not set # end of Websocket # end of TCP Transport +# +# Ultra Low Power (ULP) Co-processor +# +# CONFIG_ULP_COPROC_ENABLED is not set +# end of Ultra Low Power (ULP) Co-processor + # # Unity unit testing library # @@ -1142,6 +1456,15 @@ CONFIG_USB_HOST_CONTROL_TRANSFER_MAX_SIZE=256 CONFIG_USB_HOST_HW_BUFFER_BIAS_BALANCED=y # CONFIG_USB_HOST_HW_BUFFER_BIAS_IN is not set # CONFIG_USB_HOST_HW_BUFFER_BIAS_PERIODIC_OUT is not set + +# +# Root Hub configuration +# +CONFIG_USB_HOST_DEBOUNCE_DELAY_MS=250 +CONFIG_USB_HOST_RESET_HOLD_MS=30 +CONFIG_USB_HOST_RESET_RECOVERY_MS=30 +CONFIG_USB_HOST_SET_ADDR_RECOVERY_MS=10 +# end of Root Hub configuration # end of USB-OTG # @@ -1174,12 +1497,15 @@ CONFIG_WL_SECTOR_SIZE=4096 CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30 CONFIG_WIFI_PROV_BLE_FORCE_ENCRYPTION=y +CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y +# CONFIG_WIFI_PROV_STA_FAST_SCAN is not set # end of Wi-Fi Provisioning Manager # # Supplicant # CONFIG_WPA_MBEDTLS_CRYPTO=y +CONFIG_WPA_MBEDTLS_TLS_CLIENT=y # CONFIG_WPA_WAPI_PSK is not set # CONFIG_WPA_SUITE_B_192 is not set # CONFIG_WPA_DEBUG_PRINT is not set @@ -1188,17 +1514,41 @@ CONFIG_WPA_MBEDTLS_CRYPTO=y # CONFIG_WPA_11KV_SUPPORT is not set # CONFIG_WPA_MBO_SUPPORT is not set # CONFIG_WPA_DPP_SUPPORT is not set +# CONFIG_WPA_11R_SUPPORT is not set +# CONFIG_WPA_WPS_SOFTAP_REGISTRAR is not set # end of Supplicant -# end of Component config # -# Compatibility options +# mDNS +# +CONFIG_MDNS_MAX_INTERFACES=3 +CONFIG_MDNS_MAX_SERVICES=10 +CONFIG_MDNS_TASK_PRIORITY=1 +CONFIG_MDNS_TASK_STACK_SIZE=4096 +# CONFIG_MDNS_TASK_AFFINITY_NO_AFFINITY is not set +CONFIG_MDNS_TASK_AFFINITY_CPU0=y +CONFIG_MDNS_TASK_AFFINITY=0x0 +CONFIG_MDNS_SERVICE_ADD_TIMEOUT_MS=2000 +CONFIG_MDNS_TIMER_PERIOD_MS=100 +# CONFIG_MDNS_NETWORKING_SOCKET is not set +# CONFIG_MDNS_SKIP_SUPPRESSING_OWN_QUERIES is not set +# CONFIG_MDNS_ENABLE_DEBUG_PRINTS is not set +# CONFIG_MDNS_RESPOND_REVERSE_QUERIES is not set +CONFIG_MDNS_MULTIPLE_INSTANCE=y + +# +# MDNS Predefined interfaces # -# CONFIG_LEGACY_INCLUDE_COMMON_HEADERS is not set -# end of Compatibility options +CONFIG_MDNS_PREDEF_NETIF_STA=y +CONFIG_MDNS_PREDEF_NETIF_AP=y +CONFIG_MDNS_PREDEF_NETIF_ETH=y +# end of MDNS Predefined interfaces +# end of mDNS +# end of Component config # Deprecated options for backward compatibility -CONFIG_TOOLPREFIX="xtensa-esp32s2-elf-" +# CONFIG_NO_BLOBS is not set +# CONFIG_ESP32S2_NO_BLOBS is not set CONFIG_LOG_BOOTLOADER_LEVEL_NONE=y # CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set # CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set @@ -1212,16 +1562,10 @@ CONFIG_LOG_BOOTLOADER_LEVEL=0 # CONFIG_FLASHMODE_QOUT is not set CONFIG_FLASHMODE_DIO=y # CONFIG_FLASHMODE_DOUT is not set -# CONFIG_MONITOR_BAUD_9600B is not set -# CONFIG_MONITOR_BAUD_57600B is not set -CONFIG_MONITOR_BAUD_115200B=y -# CONFIG_MONITOR_BAUD_230400B is not set -# CONFIG_MONITOR_BAUD_921600B is not set -# CONFIG_MONITOR_BAUD_2MB is not set -# CONFIG_MONITOR_BAUD_OTHER is not set -CONFIG_MONITOR_BAUD_OTHER_VAL=115200 CONFIG_MONITOR_BAUD=115200 +CONFIG_OPTIMIZATION_LEVEL_DEBUG=y CONFIG_COMPILER_OPTIMIZATION_LEVEL_DEBUG=y +# CONFIG_OPTIMIZATION_LEVEL_RELEASE is not set # CONFIG_COMPILER_OPTIMIZATION_LEVEL_RELEASE is not set CONFIG_OPTIMIZATION_ASSERTIONS_ENABLED=y # CONFIG_OPTIMIZATION_ASSERTIONS_SILENT is not set @@ -1233,7 +1577,6 @@ CONFIG_STACK_CHECK_NONE=y # CONFIG_STACK_CHECK_STRONG is not set # CONFIG_STACK_CHECK_ALL is not set # CONFIG_WARN_WRITE_STRINGS is not set -# CONFIG_DISABLE_GCC8_WARNINGS is not set # CONFIG_ESP32_APPTRACE_DEST_TRAX is not set CONFIG_ESP32_APPTRACE_DEST_NONE=y CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y @@ -1241,56 +1584,75 @@ CONFIG_ADC2_DISABLE_DAC=y # CONFIG_EVENT_LOOP_PROFILING is not set CONFIG_POST_EVENTS_FROM_ISR=y CONFIG_POST_EVENTS_FROM_IRAM_ISR=y +# CONFIG_OTA_ALLOW_HTTP is not set CONFIG_ESP_SYSTEM_PD_FLASH=y -# CONFIG_ESP32C3_LIGHTSLEEP_GPIO_RESET_WORKAROUND is not set -CONFIG_IPC_TASK_STACK_SIZE=1024 +CONFIG_ESP32S2_RTC_CLK_SRC_INT_RC=y +# CONFIG_ESP32S2_RTC_CLK_SRC_EXT_CRYS is not set +# CONFIG_ESP32S2_RTC_CLK_SRC_EXT_OSC is not set +# CONFIG_ESP32S2_RTC_CLK_SRC_INT_8MD256 is not set +CONFIG_ESP32S2_RTC_CLK_CAL_CYCLES=576 CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y # CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP32_PHY_MAX_TX_POWER=20 +CONFIG_REDUCE_PHY_TX_POWER=y +CONFIG_ESP32_REDUCE_PHY_TX_POWER=y +# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set +# CONFIG_ESP32S2_DEFAULT_CPU_FREQ_80 is not set +# CONFIG_ESP32S2_DEFAULT_CPU_FREQ_160 is not set +CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y +CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ=240 # CONFIG_ESP32S2_PANIC_PRINT_HALT is not set CONFIG_ESP32S2_PANIC_PRINT_REBOOT=y # CONFIG_ESP32S2_PANIC_SILENT_REBOOT is not set # CONFIG_ESP32S2_PANIC_GDBSTUB is not set CONFIG_ESP32S2_ALLOW_RTC_FAST_MEM_AS_HEAP=y -CONFIG_ESP32H2_MEMPROT_FEATURE=y -CONFIG_ESP32H2_MEMPROT_FEATURE_LOCK=y +CONFIG_ESP32S2_MEMPROT_FEATURE=y +CONFIG_ESP32S2_MEMPROT_FEATURE_LOCK=y CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 CONFIG_MAIN_TASK_STACK_SIZE=3584 # CONFIG_CONSOLE_UART_DEFAULT is not set # CONFIG_CONSOLE_UART_CUSTOM is not set +CONFIG_CONSOLE_UART_NONE=y CONFIG_ESP_CONSOLE_UART_NONE=y CONFIG_CONSOLE_UART_NUM=-1 # CONFIG_INT_WDT is not set # CONFIG_TASK_WDT is not set +# CONFIG_ESP_TASK_WDT is not set # CONFIG_ESP32_DEBUG_STUBS_ENABLE is not set +CONFIG_ESP32S2_DEBUG_OCDAWARE=y +CONFIG_BROWNOUT_DET=y +CONFIG_ESP32S2_BROWNOUT_DET=y +CONFIG_ESP32S2_BROWNOUT_DET=y +CONFIG_BROWNOUT_DET_LVL_SEL_7=y +CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_7=y +# CONFIG_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_2 is not set +# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_2 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_1 is not set +# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_1 is not set +CONFIG_BROWNOUT_DET_LVL=7 +CONFIG_ESP32S2_BROWNOUT_DET_LVL=7 +CONFIG_IPC_TASK_STACK_SIZE=1024 CONFIG_TIMER_TASK_STACK_SIZE=3584 # CONFIG_EXTERNAL_COEX_ENABLE is not set # CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set # CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y -CONFIG_MB_MASTER_TIMEOUT_MS_RESPOND=150 -CONFIG_MB_MASTER_DELAY_MS_CONVERT=200 -CONFIG_MB_QUEUE_LENGTH=20 -CONFIG_MB_SERIAL_TASK_STACK_SIZE=4096 -CONFIG_MB_SERIAL_BUF_SIZE=256 -CONFIG_MB_SERIAL_TASK_PRIO=10 -CONFIG_MB_CONTROLLER_SLAVE_ID_SUPPORT=y -CONFIG_MB_CONTROLLER_SLAVE_ID=0x00112233 -CONFIG_MB_CONTROLLER_NOTIFY_TIMEOUT=20 -CONFIG_MB_CONTROLLER_NOTIFY_QUEUE_SIZE=20 -CONFIG_MB_CONTROLLER_STACK_SIZE=4096 -CONFIG_MB_EVENT_QUEUE_TIMEOUT=20 -CONFIG_MB_TIMER_PORT_ENABLED=y -CONFIG_MB_TIMER_GROUP=0 -CONFIG_MB_TIMER_INDEX=0 -# CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set CONFIG_TIMER_TASK_PRIORITY=1 CONFIG_TIMER_TASK_STACK_DEPTH=2048 CONFIG_TIMER_QUEUE_LENGTH=10 +# CONFIG_ENABLE_STATIC_TASK_CLEAN_UP_HOOK is not set +# CONFIG_HAL_ASSERTION_SILIENT is not set # CONFIG_L2_TO_L3_COPY is not set -# CONFIG_USE_ONLY_LWIP_SELECT is not set CONFIG_ESP_GRATUITOUS_ARP=y CONFIG_GARP_TMR_INTERVAL=60 CONFIG_TCPIP_RECVMBOX_SIZE=32 @@ -1302,7 +1664,6 @@ CONFIG_TCP_SND_BUF_DEFAULT=5744 CONFIG_TCP_WND_DEFAULT=5744 CONFIG_TCP_RECVMBOX_SIZE=6 CONFIG_TCP_QUEUE_OOSEQ=y -# CONFIG_ESP_TCP_KEEP_CONNECTION_WHEN_IP_CHANGES is not set CONFIG_TCP_OVERSIZE_MSS=y # CONFIG_TCP_OVERSIZE_QUARTER_MSS is not set # CONFIG_TCP_OVERSIZE_DISABLE is not set @@ -1312,6 +1673,12 @@ CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y # CONFIG_TCPIP_TASK_AFFINITY_CPU0 is not set CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF # CONFIG_PPP_SUPPORT is not set +CONFIG_ESP32S2_TIME_SYSCALL_USE_RTC_SYSTIMER=y +CONFIG_ESP32S2_TIME_SYSCALL_USE_RTC_FRC1=y +# CONFIG_ESP32S2_TIME_SYSCALL_USE_RTC is not set +# CONFIG_ESP32S2_TIME_SYSCALL_USE_SYSTIMER is not set +# CONFIG_ESP32S2_TIME_SYSCALL_USE_FRC1 is not set +# CONFIG_ESP32S2_TIME_SYSCALL_USE_NONE is not set CONFIG_ESP32_PTHREAD_TASK_PRIO_DEFAULT=5 CONFIG_ESP32_PTHREAD_TASK_STACK_SIZE_DEFAULT=3072 CONFIG_ESP32_PTHREAD_STACK_MIN=768 @@ -1320,6 +1687,7 @@ CONFIG_ESP32_PTHREAD_TASK_NAME_DEFAULT="pthread" CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ABORTS=y # CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_FAILS is not set # CONFIG_SPI_FLASH_WRITING_DANGEROUS_REGIONS_ALLOWED is not set +# CONFIG_ESP32S2_ULP_COPROC_ENABLED is not set CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y CONFIG_SUPPORT_TERMIOS=y CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1 From fae3a46e47cd734d9b52beb8797f48c73060178c Mon Sep 17 00:00:00 2001 From: alufers Date: Sun, 28 May 2023 02:29:41 +0200 Subject: [PATCH 10/21] Add missing includes of esp_chip_info.h and esp_mac.h Needed for esp-idf v5.0.2 --- main/cli/cli-commands-device-info.c | 3 ++- main/network-http.c | 3 +++ main/network.c | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/main/cli/cli-commands-device-info.c b/main/cli/cli-commands-device-info.c index 856a74d..8a1fa1c 100644 --- a/main/cli/cli-commands-device-info.c +++ b/main/cli/cli-commands-device-info.c @@ -5,6 +5,7 @@ #include #include #include +#include "esp_chip_info.h" void cli_device_info(Cli* cli, mstring_t* args) { uint8_t mac_addr[8] = {0}; @@ -156,4 +157,4 @@ void cli_device_info(Cli* cli, mstring_t* args) { cli, "chip_feature_IEEE802154: %s", (chip_info.features & CHIP_FEATURE_IEEE802154) ? "true" : "false"); -} \ No newline at end of file +} diff --git a/main/network-http.c b/main/network-http.c index c7ad087..4e79ac9 100644 --- a/main/network-http.c +++ b/main/network-http.c @@ -5,12 +5,15 @@ #include #include #include +#include +#include #include "network.h" #include "nvs.h" #include "nvs-config.h" #include "led.h" #include "helpers.h" + #define TAG "network-http" #define JSON_ERROR(error_text) "{\"error\": \"" error_text "\"}" #define JSON_RESULT(result_text) "{\"result\": \"" result_text "\"}" diff --git a/main/network.c b/main/network.c index fd0cf8b..2f3c752 100644 --- a/main/network.c +++ b/main/network.c @@ -3,6 +3,7 @@ #include "network.h" #include #include +#include #include #include #include From 01b8aefdf2e5509c5dee350cdb00b353cc4cc8dc Mon Sep 17 00:00:00 2001 From: alufers Date: Sun, 28 May 2023 02:30:35 +0200 Subject: [PATCH 11/21] Change usage of nvs_entry_find to suit idf v5.0.2 --- main/cli/cli-commands-config.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/main/cli/cli-commands-config.c b/main/cli/cli-commands-config.c index c204c7a..5acfecd 100644 --- a/main/cli/cli-commands-config.c +++ b/main/cli/cli-commands-config.c @@ -295,7 +295,12 @@ void cli_nvs_dump(Cli* cli, mstring_t* args) { cli_write_eol(cli); do { - nvs_iterator_t it = nvs_entry_find(partitions[i], NULL, NVS_TYPE_ANY); + nvs_iterator_t it; + if(nvs_entry_find(partitions[i], NULL, NVS_TYPE_ANY, &it) != ESP_OK) { + cli_write_str(cli, "ERR"); + cli_write_eol(cli); + break; + } while(it != NULL) { nvs_entry_info_t info; nvs_entry_info(it, &info); From 6b1c89f723c633d76e05a9f134ed3ffc23fa76cf Mon Sep 17 00:00:00 2001 From: alufers Date: Sun, 28 May 2023 02:31:22 +0200 Subject: [PATCH 12/21] Temporarily remove reading of IP address This has changed in idf v5.0.2, need to rewrite --- main/cli/cli-commands-wifi.c | 133 +++++++++++++++++------------------ main/network.c | 17 ++--- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/main/cli/cli-commands-wifi.c b/main/cli/cli-commands-wifi.c index 3fe0c50..f39cd00 100644 --- a/main/cli/cli-commands-wifi.c +++ b/main/cli/cli-commands-wifi.c @@ -164,70 +164,69 @@ void cli_wifi_sta_info(Cli* cli, mstring_t* args) { } void cli_wifi_ip(Cli* cli, mstring_t* args) { - wifi_mode_t mode; - tcpip_adapter_ip_info_t ip_info; - - if(esp_wifi_get_mode(&mode) == ESP_OK) { - if(mode == WIFI_MODE_STA) { - if(tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &ip_info) == ESP_OK) { - cli_printf( - cli, - "ip: %d.%d.%d.%d", - (ip_info.ip.addr >> 0) & 0xFF, - (ip_info.ip.addr >> 8) & 0xFF, - (ip_info.ip.addr >> 16) & 0xFF, - (ip_info.ip.addr >> 24) & 0xFF); - cli_write_eol(cli); - cli_printf( - cli, - "mask: %d.%d.%d.%d", - (ip_info.netmask.addr >> 0) & 0xFF, - (ip_info.netmask.addr >> 8) & 0xFF, - (ip_info.netmask.addr >> 16) & 0xFF, - (ip_info.netmask.addr >> 24) & 0xFF); - cli_write_eol(cli); - cli_printf( - cli, - "gw: %d.%d.%d.%d", - (ip_info.gw.addr >> 0) & 0xFF, - (ip_info.gw.addr >> 8) & 0xFF, - (ip_info.gw.addr >> 16) & 0xFF, - (ip_info.gw.addr >> 24) & 0xFF); - } else { - cli_write_str(cli, "FAIL"); - } - } else if(mode == WIFI_MODE_APSTA) { - if(tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &ip_info) == ESP_OK) { - cli_printf( - cli, - "ip: %d.%d.%d.%d", - (ip_info.ip.addr >> 0) & 0xFF, - (ip_info.ip.addr >> 8) & 0xFF, - (ip_info.ip.addr >> 16) & 0xFF, - (ip_info.ip.addr >> 24) & 0xFF); - cli_write_eol(cli); - cli_printf( - cli, - "mask: %d.%d.%d.%d", - (ip_info.netmask.addr >> 0) & 0xFF, - (ip_info.netmask.addr >> 8) & 0xFF, - (ip_info.netmask.addr >> 16) & 0xFF, - (ip_info.netmask.addr >> 24) & 0xFF); - cli_write_eol(cli); - cli_printf( - cli, - "gw: %d.%d.%d.%d", - (ip_info.gw.addr >> 0) & 0xFF, - (ip_info.gw.addr >> 8) & 0xFF, - (ip_info.gw.addr >> 16) & 0xFF, - (ip_info.gw.addr >> 24) & 0xFF); - } else { - cli_write_str(cli, "FAIL"); - } - } else { - cli_write_str(cli, "FAIL"); - } - } else { - cli_write_str(cli, "FAIL"); - } -} \ No newline at end of file + // wifi_mode_t mode; + + // if(esp_wifi_get_mode(&mode) == ESP_OK) { + // if(mode == WIFI_MODE_STA) { + // if(tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &ip_info) == ESP_OK) { + // cli_printf( + // cli, + // "ip: %d.%d.%d.%d", + // (ip_info.ip.addr >> 0) & 0xFF, + // (ip_info.ip.addr >> 8) & 0xFF, + // (ip_info.ip.addr >> 16) & 0xFF, + // (ip_info.ip.addr >> 24) & 0xFF); + // cli_write_eol(cli); + // cli_printf( + // cli, + // "mask: %d.%d.%d.%d", + // (ip_info.netmask.addr >> 0) & 0xFF, + // (ip_info.netmask.addr >> 8) & 0xFF, + // (ip_info.netmask.addr >> 16) & 0xFF, + // (ip_info.netmask.addr >> 24) & 0xFF); + // cli_write_eol(cli); + // cli_printf( + // cli, + // "gw: %d.%d.%d.%d", + // (ip_info.gw.addr >> 0) & 0xFF, + // (ip_info.gw.addr >> 8) & 0xFF, + // (ip_info.gw.addr >> 16) & 0xFF, + // (ip_info.gw.addr >> 24) & 0xFF); + // } else { + // cli_write_str(cli, "FAIL"); + // } + // } else if(mode == WIFI_MODE_APSTA) { + // if(tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &ip_info) == ESP_OK) { + // cli_printf( + // cli, + // "ip: %d.%d.%d.%d", + // (ip_info.ip.addr >> 0) & 0xFF, + // (ip_info.ip.addr >> 8) & 0xFF, + // (ip_info.ip.addr >> 16) & 0xFF, + // (ip_info.ip.addr >> 24) & 0xFF); + // cli_write_eol(cli); + // cli_printf( + // cli, + // "mask: %d.%d.%d.%d", + // (ip_info.netmask.addr >> 0) & 0xFF, + // (ip_info.netmask.addr >> 8) & 0xFF, + // (ip_info.netmask.addr >> 16) & 0xFF, + // (ip_info.netmask.addr >> 24) & 0xFF); + // cli_write_eol(cli); + // cli_printf( + // cli, + // "gw: %d.%d.%d.%d", + // (ip_info.gw.addr >> 0) & 0xFF, + // (ip_info.gw.addr >> 8) & 0xFF, + // (ip_info.gw.addr >> 16) & 0xFF, + // (ip_info.gw.addr >> 24) & 0xFF); + // } else { + // cli_write_str(cli, "FAIL"); + // } + // } else { + // cli_write_str(cli, "FAIL"); + // } + // } else { + // cli_write_str(cli, "FAIL"); + // } +} diff --git a/main/network.c b/main/network.c index 2f3c752..d2409b6 100644 --- a/main/network.c +++ b/main/network.c @@ -35,14 +35,15 @@ static WiFiMode wifi_mode = WiFiModeSTA; uint32_t network_get_ip(void) { - tcpip_adapter_ip_info_t ip_info; - if(wifi_mode == WiFiModeSTA) { - tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &ip_info); - } else { - tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &ip_info); - } - - return ip_info.ip.addr; + // tcpip_adapter_ip_info_t ip_info; + // if(wifi_mode == WiFiModeSTA) { + // tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &ip_info); + // } else { + // tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &ip_info); + // } + + // return ip_info.ip.addr; + return 0; } static void From e9c4ba74d0637c921a283cae02dbd5f8816432f4 Mon Sep 17 00:00:00 2001 From: alufers Date: Sun, 28 May 2023 14:42:37 +0200 Subject: [PATCH 13/21] Rewrite functions that obtain the IP addresses to use esp_netif --- main/CMakeLists.txt | 2 +- main/cli/cli-commands-wifi.c | 103 +++++++++++++---------------------- main/network.c | 27 +++++---- 3 files changed, 56 insertions(+), 76 deletions(-) diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 074b27e..6146835 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -76,4 +76,4 @@ message(STATUS "FW branch: ${FW_GIT_BRANCH}") message(STATUS "FW branch num: ${FW_GIT_BRANCH_NUM}") message(STATUS "FW version: ${FW_GIT_VERSION}") -set_property(SOURCE "cli/cli-commands-device-info.c" APPEND PROPERTY COMPILE_OPTIONS ${INFO_FLAGS}) \ No newline at end of file +set_property(SOURCE "cli/cli-commands-device-info.c" APPEND PROPERTY COMPILE_OPTIONS ${INFO_FLAGS}) diff --git a/main/cli/cli-commands-wifi.c b/main/cli/cli-commands-wifi.c index f39cd00..6abd436 100644 --- a/main/cli/cli-commands-wifi.c +++ b/main/cli/cli-commands-wifi.c @@ -164,69 +164,42 @@ void cli_wifi_sta_info(Cli* cli, mstring_t* args) { } void cli_wifi_ip(Cli* cli, mstring_t* args) { - // wifi_mode_t mode; - - // if(esp_wifi_get_mode(&mode) == ESP_OK) { - // if(mode == WIFI_MODE_STA) { - // if(tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &ip_info) == ESP_OK) { - // cli_printf( - // cli, - // "ip: %d.%d.%d.%d", - // (ip_info.ip.addr >> 0) & 0xFF, - // (ip_info.ip.addr >> 8) & 0xFF, - // (ip_info.ip.addr >> 16) & 0xFF, - // (ip_info.ip.addr >> 24) & 0xFF); - // cli_write_eol(cli); - // cli_printf( - // cli, - // "mask: %d.%d.%d.%d", - // (ip_info.netmask.addr >> 0) & 0xFF, - // (ip_info.netmask.addr >> 8) & 0xFF, - // (ip_info.netmask.addr >> 16) & 0xFF, - // (ip_info.netmask.addr >> 24) & 0xFF); - // cli_write_eol(cli); - // cli_printf( - // cli, - // "gw: %d.%d.%d.%d", - // (ip_info.gw.addr >> 0) & 0xFF, - // (ip_info.gw.addr >> 8) & 0xFF, - // (ip_info.gw.addr >> 16) & 0xFF, - // (ip_info.gw.addr >> 24) & 0xFF); - // } else { - // cli_write_str(cli, "FAIL"); - // } - // } else if(mode == WIFI_MODE_APSTA) { - // if(tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &ip_info) == ESP_OK) { - // cli_printf( - // cli, - // "ip: %d.%d.%d.%d", - // (ip_info.ip.addr >> 0) & 0xFF, - // (ip_info.ip.addr >> 8) & 0xFF, - // (ip_info.ip.addr >> 16) & 0xFF, - // (ip_info.ip.addr >> 24) & 0xFF); - // cli_write_eol(cli); - // cli_printf( - // cli, - // "mask: %d.%d.%d.%d", - // (ip_info.netmask.addr >> 0) & 0xFF, - // (ip_info.netmask.addr >> 8) & 0xFF, - // (ip_info.netmask.addr >> 16) & 0xFF, - // (ip_info.netmask.addr >> 24) & 0xFF); - // cli_write_eol(cli); - // cli_printf( - // cli, - // "gw: %d.%d.%d.%d", - // (ip_info.gw.addr >> 0) & 0xFF, - // (ip_info.gw.addr >> 8) & 0xFF, - // (ip_info.gw.addr >> 16) & 0xFF, - // (ip_info.gw.addr >> 24) & 0xFF); - // } else { - // cli_write_str(cli, "FAIL"); - // } - // } else { - // cli_write_str(cli, "FAIL"); - // } - // } else { - // cli_write_str(cli, "FAIL"); - // } + esp_netif_ip_info_t ip_info; + esp_netif_t *netif = NULL; + wifi_mode_t mode; + + if (esp_wifi_get_mode(&mode) == ESP_OK) { + if (mode == WIFI_MODE_STA) { + netif = esp_netif_get_handle_from_ifkey("WIFI_STA_DEF"); + } else if (mode == WIFI_MODE_APSTA) { + netif = esp_netif_get_handle_from_ifkey("WIFI_AP_STA_DEF"); + } + + if (netif != NULL) { + esp_netif_get_ip_info(netif, &ip_info); + + cli_printf(cli, "ip: %d.%d.%d.%d", + (ip_info.ip.addr >> 0) & 0xFF, + (ip_info.ip.addr >> 8) & 0xFF, + (ip_info.ip.addr >> 16) & 0xFF, + (ip_info.ip.addr >> 24) & 0xFF); + cli_write_eol(cli); + cli_printf(cli, "mask: %d.%d.%d.%d", + (ip_info.netmask.addr >> 0) & 0xFF, + (ip_info.netmask.addr >> 8) & 0xFF, + (ip_info.netmask.addr >> 16) & 0xFF, + (ip_info.netmask.addr >> 24) & 0xFF); + cli_write_eol(cli); + cli_printf(cli, "gw: %d.%d.%d.%d", + (ip_info.gw.addr >> 0) & 0xFF, + (ip_info.gw.addr >> 8) & 0xFF, + (ip_info.gw.addr >> 16) & 0xFF, + (ip_info.gw.addr >> 24) & 0xFF); + } else { + cli_write_str(cli, "FAIL"); + } + } else { + cli_write_str(cli, "FAIL"); + } } + diff --git a/main/network.c b/main/network.c index d2409b6..d8ff07a 100644 --- a/main/network.c +++ b/main/network.c @@ -34,18 +34,25 @@ static WiFiMode wifi_mode = WiFiModeSTA; -uint32_t network_get_ip(void) { - // tcpip_adapter_ip_info_t ip_info; - // if(wifi_mode == WiFiModeSTA) { - // tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_STA, &ip_info); - // } else { - // tcpip_adapter_get_ip_info(TCPIP_ADAPTER_IF_AP, &ip_info); - // } - - // return ip_info.ip.addr; - return 0; +uint32_t network_get_ip() +{ + esp_netif_ip_info_t ip_info; + esp_netif_t *netif = NULL; + wifi_mode_t wifi_mode; + + esp_wifi_get_mode(&wifi_mode); + + if (wifi_mode == WIFI_MODE_STA) { + netif = esp_netif_get_handle_from_ifkey("WIFI_STA_DEF"); + } else { + netif = esp_netif_get_handle_from_ifkey("WIFI_AP_DEF"); + } + + esp_netif_get_ip_info(netif, &ip_info); + return ip_info.ip.addr; } + static void sta_event_handler(void* arg, esp_event_base_t event_base, int32_t event_id, void* event_data) { if(event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START) { From e992956ec45af9c58babd5769bab67b1622ce588 Mon Sep 17 00:00:00 2001 From: alufers Date: Sun, 28 May 2023 14:45:38 +0200 Subject: [PATCH 14/21] Update readme to point to ESP-IDF version v5.0.2 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dd0bf50..6a4b0af 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ You must recursively clone the submodules, which `--recursive` will do for you. # Develop with ESP-IDF -Set up __ESP-IDF v4.4__ following [Espressif's instructions](https://docs.espressif.com/projects/esp-idf/en/release-v4.4/esp32/get-started/index.html). Make sure `idf.py` is in your PATH and you can successfully run the program. +Set up __ESP-IDF v5.0.2__ following [Espressif's instructions](https://docs.espressif.com/projects/esp-idf/en/v5.0.2/esp32/get-started/index.html). Make sure `idf.py` is in your PATH and you can successfully run the program. ## Build with ESP-IDF From ceabc924e5b5b8855325c0e77cf7b161b6e7bf20 Mon Sep 17 00:00:00 2001 From: alufers Date: Sun, 28 May 2023 14:50:52 +0200 Subject: [PATCH 15/21] Update CI script --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0f26239..0a1a9a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,8 +63,12 @@ jobs: run: npm run build working-directory: components/svelte-portal - - name: 'Build firmware' - uses: Intake-Health/esp-idf-ci-action@release-v4.4 + - name: esp-idf build + uses: espressif/esp-idf-ci-action@v1 + with: + esp_idf_version: v5.0.2 + target: esp32s2 + path: './' - name: 'Fix ownership' uses: peter-murray/reset-workspace-ownership-action@v1 From 9b4f1864cea3826c8d4064f4fe12b2eeb24a5045 Mon Sep 17 00:00:00 2001 From: SG Date: Wed, 5 Jun 2024 14:55:52 +0100 Subject: [PATCH 16/21] usb-glue: add flush --- components/usbglue/drivers/usb-glue.c | 9 +- dependencies.lock | 12 +- sdkconfig | 183 +++++++++----------------- 3 files changed, 77 insertions(+), 127 deletions(-) diff --git a/components/usbglue/drivers/usb-glue.c b/components/usbglue/drivers/usb-glue.c index c93c0c4..6d14d74 100644 --- a/components/usbglue/drivers/usb-glue.c +++ b/components/usbglue/drivers/usb-glue.c @@ -1,5 +1,6 @@ #include #include +#include #include "dap-link/dap-link-descriptors.h" #include "dual-cdc/dual-cdc-descriptors.h" @@ -249,9 +250,8 @@ void tud_cdc_line_coding_cb(uint8_t interface, cdc_line_coding_t const* p_line_c #include #include - -#define GPIO_FUNC_IN_HIGH 0x38 -#define GPIO_FUNC_IN_LOW 0x3C +#define GPIO_FUNC_IN_HIGH 0x38 +#define GPIO_FUNC_IN_LOW 0x3C static void usb_hal_init_pins(usb_hal_context_t* usb) { /* usb_periph_iopins currently configures USB_OTG as USB Device. @@ -449,6 +449,9 @@ size_t usb_glue_gdb_receive(uint8_t* buf, size_t len) { void usb_glue_dap_send(const uint8_t* buf, size_t len, bool flush) { if(usb_device_type == USBDeviceTypeDapLink) { tud_vendor_write(buf, len); + if(flush) { + tud_vendor_write_flush(); + } } else { esp_system_abort("Wrong USB device type"); } diff --git a/dependencies.lock b/dependencies.lock index d0f962c..a90a96a 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -1,21 +1,21 @@ dependencies: espressif/mdns: - component_hash: 46ee81d32fbf850462d8af1e83303389602f6a6a9eddd2a55104cb4c063858ed + component_hash: 31117d76cae83a6d83ffd7f035f6fdae5bd05b914fc30b641afeb208b84de19a source: service_url: https://api.components.espressif.com/ type: service - version: 1.1.0 + version: 1.3.2 espressif/tinyusb: - component_hash: 68e971ee08d20180b1a092e5ee727877a3b3d8c815fde0a91fc6fdff06d41ead + component_hash: 256fd8aee92ae9f1014538b8601508907a2da386b64f6d42f35a67f9288d1b20 source: service_url: https://api.components.espressif.com/ type: service - version: 0.14.3 + version: 0.15.0~9 idf: component_hash: null source: type: idf - version: 5.0.2 -manifest_hash: c64f6ab4afe7b51976719443799f4b2bed8d651d0bd98b9fc4ed18e4c4647f17 + version: 5.0.0 +manifest_hash: 04b3564edaaf5e6104c57c153c7731c16711f464deb0b5ef2fd604b5c46a79bc target: esp32s2 version: 1.0.0 diff --git a/sdkconfig b/sdkconfig index 00bc650..c72a83b 100644 --- a/sdkconfig +++ b/sdkconfig @@ -73,7 +73,7 @@ CONFIG_SOC_GPIO_PIN_COUNT=47 CONFIG_SOC_GPIO_SUPPORT_RTC_INDEPENDENT=y CONFIG_SOC_GPIO_SUPPORT_FORCE_HOLD=y CONFIG_SOC_GPIO_VALID_GPIO_MASK=0x7FFFFFFFFFFF -CONFIG_SOC_GPIO_VALID_DIGITAL_IO_PAD_MASK=0x00007FFFFC000000 +CONFIG_SOC_GPIO_SUPPORT_SLP_SWITCH=y CONFIG_SOC_DEDIC_GPIO_OUT_CHANNELS_NUM=8 CONFIG_SOC_DEDIC_GPIO_IN_CHANNELS_NUM=8 CONFIG_SOC_DEDIC_GPIO_ALLOW_REG_ACCESS=y @@ -193,11 +193,6 @@ CONFIG_SOC_SHA_SUPPORT_SHA512_T=y CONFIG_SOC_RSA_MAX_BIT_LEN=4096 CONFIG_SOC_AES_SUPPORT_DMA=y CONFIG_SOC_AES_SUPPORT_GCM=y -CONFIG_SOC_EFUSE_DIS_DOWNLOAD_DCACHE=y -CONFIG_SOC_EFUSE_HARD_DIS_JTAG=y -CONFIG_SOC_EFUSE_SOFT_DIS_JTAG=y -CONFIG_SOC_EFUSE_DIS_BOOT_REMAP=y -CONFIG_SOC_EFUSE_DIS_LEGACY_SPI_BOOT=y CONFIG_SOC_SECURE_BOOT_V2_RSA=y CONFIG_SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS=3 CONFIG_SOC_EFUSE_REVOKE_BOOT_KEY_DIGESTS=y @@ -221,9 +216,9 @@ CONFIG_SOC_SPI_MEM_SUPPORT_SW_SUSPEND=y CONFIG_SOC_SPI_MEM_SUPPORT_CONFIG_GPIO_BY_EFUSE=y CONFIG_SOC_PM_SUPPORT_EXT_WAKEUP=y CONFIG_SOC_PM_SUPPORT_WIFI_WAKEUP=y -CONFIG_SOC_PM_SUPPORT_TOUCH_SENSOR_WAKEUP=y CONFIG_SOC_PM_SUPPORT_WIFI_PD=y CONFIG_SOC_PM_SUPPORT_RTC_PERIPH_PD=y +CONFIG_SOC_PM_SUPPORT_TOUCH_SENSOR_WAKEUP=y CONFIG_SOC_PM_SUPPORT_RTC_FAST_MEM_PD=y CONFIG_SOC_PM_SUPPORT_RTC_SLOW_MEM_PD=y CONFIG_SOC_COEX_HW_PTI=y @@ -305,7 +300,7 @@ CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16 # end of Application manager CONFIG_ESP_ROM_HAS_CRC_LE=y -CONFIG_ESP_ROM_HAS_MZ_CRC32=y +CONFIG_ESP_ROM_SUPPORT_MULTIPLE_UART=y CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y # @@ -434,7 +429,6 @@ CONFIG_ADC_DISABLE_DAC=y # TWAI Configuration # # CONFIG_TWAI_ISR_IN_IRAM is not set -CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM=y # end of TWAI Configuration # @@ -519,63 +513,12 @@ CONFIG_ESP_TLS_USE_DS_PERIPHERAL=y # end of ESP-TLS # -# ESP32S2-specific -# -# CONFIG_ESP32S2_DEFAULT_CPU_FREQ_80 is not set -# CONFIG_ESP32S2_DEFAULT_CPU_FREQ_160 is not set -CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y -CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ=240 - -# -# Cache config -# -CONFIG_ESP32S2_INSTRUCTION_CACHE_8KB=y -# CONFIG_ESP32S2_INSTRUCTION_CACHE_16KB is not set -# CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_16B is not set -CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_32B=y -CONFIG_ESP32S2_DATA_CACHE_0KB=y -# CONFIG_ESP32S2_DATA_CACHE_8KB is not set -# CONFIG_ESP32S2_DATA_CACHE_16KB is not set -# CONFIG_ESP32S2_DATA_CACHE_LINE_16B is not set -CONFIG_ESP32S2_DATA_CACHE_LINE_32B=y -# CONFIG_ESP32S2_INSTRUCTION_CACHE_WRAP is not set -# CONFIG_ESP32S2_DATA_CACHE_WRAP is not set -# end of Cache config - -# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set -# CONFIG_ESP32S2_TRAX is not set -CONFIG_ESP32S2_TRACEMEM_RESERVE_DRAM=0x0 -# CONFIG_ESP32S2_ULP_COPROC_ENABLED is not set -CONFIG_ESP32S2_ULP_COPROC_RESERVE_MEM=0 -CONFIG_ESP32S2_DEBUG_OCDAWARE=y -CONFIG_ESP32S2_BROWNOUT_DET=y -CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_7=y -# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_6 is not set -# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_5 is not set -# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_4 is not set -# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_3 is not set -# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_2 is not set -# CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_1 is not set -CONFIG_ESP32S2_BROWNOUT_DET_LVL=7 -CONFIG_ESP32S2_TIME_SYSCALL_USE_RTC_FRC1=y -# CONFIG_ESP32S2_TIME_SYSCALL_USE_RTC is not set -# CONFIG_ESP32S2_TIME_SYSCALL_USE_FRC1 is not set -# CONFIG_ESP32S2_TIME_SYSCALL_USE_NONE is not set -CONFIG_ESP32S2_RTC_CLK_SRC_INT_RC=y -# CONFIG_ESP32S2_RTC_CLK_SRC_EXT_CRYS is not set -# CONFIG_ESP32S2_RTC_CLK_SRC_EXT_OSC is not set -# CONFIG_ESP32S2_RTC_CLK_SRC_INT_8MD256 is not set -CONFIG_ESP32S2_RTC_CLK_CAL_CYCLES=576 -# CONFIG_ESP32S2_NO_BLOBS is not set -# CONFIG_ESP32S2_KEEP_USB_ALIVE is not set -# CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM is not set -# CONFIG_ESP32S2_USE_FIXED_STATIC_RAM_SIZE is not set -# end of ESP32S2-specific - -# -# ADC-Calibration +# ADC and ADC Calibration # -# end of ADC-Calibration +# CONFIG_ADC_ONESHOT_CTRL_FUNC_IN_IRAM is not set +# CONFIG_ADC_CONTINUOUS_ISR_IRAM_SAFE is not set +CONFIG_ADC_DISABLE_DAC_OUTPUT=y +# end of ADC and ADC Calibration # # Common ESP-related @@ -625,7 +568,8 @@ CONFIG_HTTPD_MAX_URI_LEN=512 CONFIG_HTTPD_ERR_RESP_NO_DELAY=y CONFIG_HTTPD_PURGE_BUF_LEN=32 # CONFIG_HTTPD_LOG_PURGE_DATA is not set -# CONFIG_HTTPD_WS_SUPPORT is not set +CONFIG_HTTPD_WS_SUPPORT=y +# CONFIG_HTTPD_QUEUE_WORK_BLOCKING is not set # end of HTTP Server # @@ -645,21 +589,6 @@ CONFIG_HTTPD_PURGE_BUF_LEN=32 # Hardware Settings # -# -# Chip revision -# -CONFIG_ESP32S2_REV_MIN_0=y -# CONFIG_ESP32S2_REV_MIN_1 is not set -CONFIG_ESP32S2_REV_MIN_FULL=0 -CONFIG_ESP_REV_MIN_FULL=0 - -# -# Maximum Supported ESP32-S2 Revision (Rev v1.99) -# -CONFIG_ESP32S2_REV_MAX_FULL=199 -CONFIG_ESP_REV_MAX_FULL=199 -# end of Chip revision - # # MAC Config # @@ -675,8 +604,9 @@ CONFIG_ESP32S2_UNIVERSAL_MAC_ADDRESSES=2 # CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y # CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set -# CONFIG_ESP_SLEEP_PSRAM_LEAKAGE_WORKAROUND is not set +CONFIG_ESP_SLEEP_PSRAM_LEAKAGE_WORKAROUND=y # CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND is not set +# CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU is not set # end of Sleep Config # @@ -695,6 +625,14 @@ CONFIG_RTC_CLK_CAL_CYCLES=576 # CONFIG_PERIPH_CTRL_FUNC_IN_IRAM is not set # end of Peripheral Control +# +# MMU Config +# +CONFIG_MMU_PAGE_SIZE_64KB=y +CONFIG_MMU_PAGE_MODE="64KB" +CONFIG_MMU_PAGE_SIZE=0x10000 +# end of MMU Config + # # Main XTAL Config # @@ -749,7 +687,40 @@ CONFIG_ESP_PHY_REDUCE_TX_POWER=y # # ESP PSRAM # -# CONFIG_SPIRAM is not set +CONFIG_SPIRAM=y + +# +# SPI RAM config +# +CONFIG_SPIRAM_MODE_QUAD=y +CONFIG_SPIRAM_TYPE_AUTO=y +# CONFIG_SPIRAM_TYPE_ESPPSRAM16 is not set +# CONFIG_SPIRAM_TYPE_ESPPSRAM32 is not set +# CONFIG_SPIRAM_TYPE_ESPPSRAM64 is not set +CONFIG_SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY=y + +# +# PSRAM clock and cs IO for ESP32S2 +# +CONFIG_DEFAULT_PSRAM_CLK_IO=30 +CONFIG_DEFAULT_PSRAM_CS_IO=26 +# end of PSRAM clock and cs IO for ESP32S2 + +# CONFIG_SPIRAM_FETCH_INSTRUCTIONS is not set +# CONFIG_SPIRAM_RODATA is not set +CONFIG_SPIRAM_SPEED_80M=y +# CONFIG_SPIRAM_SPEED_40M is not set +# CONFIG_SPIRAM_SPEED_26M is not set +# CONFIG_SPIRAM_SPEED_20M is not set +CONFIG_SPIRAM_SPEED=80 +CONFIG_SPIRAM_BOOT_INIT=y +# CONFIG_SPIRAM_USE_MEMMAP is not set +CONFIG_SPIRAM_USE_CAPS_ALLOC=y +# CONFIG_SPIRAM_USE_MALLOC is not set +CONFIG_SPIRAM_MEMTEST=y +CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y +CONFIG_SPIRAM_ALLOW_BSS_SEG_EXTERNAL_MEMORY=y +# end of SPI RAM config # end of ESP PSRAM # @@ -774,8 +745,7 @@ CONFIG_ESP32S2_INSTRUCTION_CACHE_8KB=y # CONFIG_ESP32S2_INSTRUCTION_CACHE_16KB is not set # CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_16B is not set CONFIG_ESP32S2_INSTRUCTION_CACHE_LINE_32B=y -CONFIG_ESP32S2_DATA_CACHE_0KB=y -# CONFIG_ESP32S2_DATA_CACHE_8KB is not set +CONFIG_ESP32S2_DATA_CACHE_8KB=y # CONFIG_ESP32S2_DATA_CACHE_16KB is not set # CONFIG_ESP32S2_DATA_CACHE_LINE_16B is not set CONFIG_ESP32S2_DATA_CACHE_LINE_32B=y @@ -827,8 +797,7 @@ CONFIG_ESP_CONSOLE_NONE=y CONFIG_ESP_CONSOLE_MULTIPLE_UART=y CONFIG_ESP_CONSOLE_UART_NUM=-1 # CONFIG_ESP_INT_WDT is not set -CONFIG_ESP_TASK_WDT_EN=y -# CONFIG_ESP_TASK_WDT_INIT is not set +# CONFIG_ESP_TASK_WDT is not set # CONFIG_ESP_PANIC_HANDLER_IRAM is not set # CONFIG_ESP_DEBUG_STUBS_ENABLE is not set CONFIG_ESP_DEBUG_OCDAWARE=y @@ -899,13 +868,11 @@ CONFIG_ESP32_WIFI_ENABLE_WPA3_OWE_STA=y # CONFIG_ESP_WIFI_GMAC_SUPPORT is not set CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y # CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set -CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=7 # end of Wi-Fi # # Core dump # -# CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH is not set # CONFIG_ESP_COREDUMP_ENABLE_TO_UART is not set CONFIG_ESP_COREDUMP_ENABLE_TO_NONE=y # end of Core dump @@ -1064,7 +1031,6 @@ CONFIG_LOG_TIMESTAMP_SOURCE_RTOS=y CONFIG_LWIP_LOCAL_HOSTNAME="blackmagic.local" # CONFIG_LWIP_NETIF_API is not set # CONFIG_LWIP_TCPIP_CORE_LOCKING is not set -# CONFIG_LWIP_CHECK_THREAD_SAFETY is not set CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y # CONFIG_LWIP_L2_TO_L3_COPY is not set # CONFIG_LWIP_IRAM_OPTIMIZATION is not set @@ -1084,8 +1050,6 @@ CONFIG_LWIP_IP6_FRAG=y # CONFIG_LWIP_STATS is not set CONFIG_LWIP_ESP_GRATUITOUS_ARP=y CONFIG_LWIP_GARP_TMR_INTERVAL=60 -CONFIG_LWIP_ESP_MLDV6_REPORT=y -CONFIG_LWIP_MLDV6_TMR_INTERVAL=40 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y # CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set @@ -1093,7 +1057,6 @@ CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID=y # CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set CONFIG_LWIP_DHCP_OPTIONS_LEN=68 CONFIG_LWIP_NUM_NETIF_CLIENT_DATA=0 -CONFIG_LWIP_DHCP_COARSE_TIMER_SECS=1 # # DHCP server @@ -1393,14 +1356,6 @@ CONFIG_PTHREAD_TASK_CORE_DEFAULT=-1 CONFIG_PTHREAD_TASK_NAME_DEFAULT="pthread" # end of PThreads -# -# MMU Config -# -CONFIG_MMU_PAGE_SIZE_64KB=y -CONFIG_MMU_PAGE_MODE="64KB" -CONFIG_MMU_PAGE_SIZE=0x10000 -# end of MMU Config - # # SPI Flash driver # @@ -1512,15 +1467,6 @@ CONFIG_USB_HOST_CONTROL_TRANSFER_MAX_SIZE=256 CONFIG_USB_HOST_HW_BUFFER_BIAS_BALANCED=y # CONFIG_USB_HOST_HW_BUFFER_BIAS_IN is not set # CONFIG_USB_HOST_HW_BUFFER_BIAS_PERIODIC_OUT is not set - -# -# Root Hub configuration -# -CONFIG_USB_HOST_DEBOUNCE_DELAY_MS=250 -CONFIG_USB_HOST_RESET_HOLD_MS=30 -CONFIG_USB_HOST_RESET_RECOVERY_MS=30 -CONFIG_USB_HOST_SET_ADDR_RECOVERY_MS=10 -# end of Root Hub configuration # end of USB-OTG # @@ -1553,8 +1499,6 @@ CONFIG_WL_SECTOR_SIZE=4096 CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16 CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30 CONFIG_WIFI_PROV_BLE_FORCE_ENCRYPTION=y -CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y -# CONFIG_WIFI_PROV_STA_FAST_SCAN is not set # end of Wi-Fi Provisioning Manager # @@ -1580,6 +1524,7 @@ CONFIG_WPA_MBEDTLS_TLS_CLIENT=y CONFIG_MDNS_MAX_INTERFACES=3 CONFIG_MDNS_MAX_SERVICES=10 CONFIG_MDNS_TASK_PRIORITY=1 +CONFIG_MDNS_ACTION_QUEUE_LEN=16 CONFIG_MDNS_TASK_STACK_SIZE=4096 # CONFIG_MDNS_TASK_AFFINITY_NO_AFFINITY is not set CONFIG_MDNS_TASK_AFFINITY_CPU0=y @@ -1589,6 +1534,7 @@ CONFIG_MDNS_TIMER_PERIOD_MS=100 # CONFIG_MDNS_NETWORKING_SOCKET is not set # CONFIG_MDNS_SKIP_SUPPRESSING_OWN_QUERIES is not set # CONFIG_MDNS_ENABLE_DEBUG_PRINTS is not set +CONFIG_MDNS_ENABLE_CONSOLE_CLI=y # CONFIG_MDNS_RESPOND_REVERSE_QUERIES is not set CONFIG_MDNS_MULTIPLE_INSTANCE=y @@ -1640,16 +1586,19 @@ CONFIG_ADC2_DISABLE_DAC=y # CONFIG_EVENT_LOOP_PROFILING is not set CONFIG_POST_EVENTS_FROM_ISR=y CONFIG_POST_EVENTS_FROM_IRAM_ISR=y -CONFIG_ESP_SYSTEM_PD_FLASH=y -# CONFIG_ESP32C3_LIGHTSLEEP_GPIO_RESET_WORKAROUND is not set -CONFIG_IPC_TASK_STACK_SIZE=1024 +# CONFIG_OTA_ALLOW_HTTP is not set +CONFIG_ESP32S2_RTC_CLK_SRC_INT_RC=y +# CONFIG_ESP32S2_RTC_CLK_SRC_EXT_CRYS is not set +# CONFIG_ESP32S2_RTC_CLK_SRC_EXT_OSC is not set +# CONFIG_ESP32S2_RTC_CLK_SRC_INT_8MD256 is not set +CONFIG_ESP32S2_RTC_CLK_CAL_CYCLES=576 CONFIG_ESP32_PHY_CALIBRATION_AND_DATA_STORAGE=y # CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION is not set CONFIG_ESP32_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP32_PHY_MAX_TX_POWER=20 CONFIG_REDUCE_PHY_TX_POWER=y CONFIG_ESP32_REDUCE_PHY_TX_POWER=y -# CONFIG_ESP32S2_SPIRAM_SUPPORT is not set +CONFIG_ESP32S2_SPIRAM_SUPPORT=y # CONFIG_ESP32S2_DEFAULT_CPU_FREQ_80 is not set # CONFIG_ESP32S2_DEFAULT_CPU_FREQ_160 is not set CONFIG_ESP32S2_DEFAULT_CPU_FREQ_240=y @@ -1671,7 +1620,6 @@ CONFIG_ESP_CONSOLE_UART_NONE=y CONFIG_CONSOLE_UART_NUM=-1 # CONFIG_INT_WDT is not set # CONFIG_TASK_WDT is not set -# CONFIG_ESP_TASK_WDT is not set # CONFIG_ESP32_DEBUG_STUBS_ENABLE is not set CONFIG_ESP32S2_DEBUG_OCDAWARE=y CONFIG_BROWNOUT_DET=y @@ -1696,7 +1644,6 @@ CONFIG_ESP32S2_BROWNOUT_DET_LVL=7 CONFIG_IPC_TASK_STACK_SIZE=1024 CONFIG_TIMER_TASK_STACK_SIZE=3584 # CONFIG_EXTERNAL_COEX_ENABLE is not set -# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set # CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y CONFIG_TIMER_TASK_PRIORITY=1 From 7cecdcaaf9c8b522fc4c7b7cb4c1817d89762029 Mon Sep 17 00:00:00 2001 From: SG Date: Wed, 5 Jun 2024 15:13:12 +0100 Subject: [PATCH 17/21] update submodules --- .gitmodules | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 1a12eb3..27f6802 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,7 +4,6 @@ [submodule "components/mlib/mlib"] path = components/mlib/mlib url = https://github.com/P-p-H-d/mlib.git - url = https://github.com/hathach/tinyusb [submodule "components/dap-link/free-dap"] path = components/dap-link/free-dap url = https://github.com/ataradov/free-dap From ebdca0a1d0c004922c57c3dbd44cb104a80c68a5 Mon Sep 17 00:00:00 2001 From: Anna Antonenko Date: Tue, 17 Dec 2024 21:51:25 +0400 Subject: [PATCH 18/21] ci: empty commit to trigger ci/cd From 8255edf0ba0137addee0901cee4627eb886c8e4e Mon Sep 17 00:00:00 2001 From: Anna Antonenko Date: Tue, 17 Dec 2024 22:47:35 +0400 Subject: [PATCH 19/21] ci: pin component versions --- components/usbglue/idf_component.yml | 2 +- main/idf_component.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/usbglue/idf_component.yml b/components/usbglue/idf_component.yml index 637acd8..bb889c6 100644 --- a/components/usbglue/idf_component.yml +++ b/components/usbglue/idf_component.yml @@ -4,4 +4,4 @@ dependencies: idf: version: ">=4.1.0" tinyusb: - version: ">=0.14.3" + version: "==0.14.3" diff --git a/main/idf_component.yml b/main/idf_component.yml index 633bd80..e82fd36 100644 --- a/main/idf_component.yml +++ b/main/idf_component.yml @@ -4,4 +4,4 @@ dependencies: idf: version: ">=5.0.0" espressif/mdns: - version: ">=1.1.0" + version: "==1.1.0" From 3c22320e9cafee621f4d5b640cc6e0339826663c Mon Sep 17 00:00:00 2001 From: Anna Antonenko Date: Tue, 17 Dec 2024 22:57:37 +0400 Subject: [PATCH 20/21] ci: upgrade pinned tinyusb --- components/usbglue/idf_component.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/usbglue/idf_component.yml b/components/usbglue/idf_component.yml index bb889c6..ab430b6 100644 --- a/components/usbglue/idf_component.yml +++ b/components/usbglue/idf_component.yml @@ -4,4 +4,4 @@ dependencies: idf: version: ">=4.1.0" tinyusb: - version: "==0.14.3" + version: "==0.15.0~9" From 7583d79ce1a526280e9ec3da26b086fe18c366b8 Mon Sep 17 00:00:00 2001 From: Anna Antonenko Date: Tue, 17 Dec 2024 23:03:15 +0400 Subject: [PATCH 21/21] ci: downgrade tinyusb to 0.15.0~3 --- components/usbglue/idf_component.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/usbglue/idf_component.yml b/components/usbglue/idf_component.yml index ab430b6..f7bf9a6 100644 --- a/components/usbglue/idf_component.yml +++ b/components/usbglue/idf_component.yml @@ -4,4 +4,4 @@ dependencies: idf: version: ">=4.1.0" tinyusb: - version: "==0.15.0~9" + version: "==0.15.0~3"