diff --git a/.project b/.project index a6448e1..9536c23 100644 --- a/.project +++ b/.project @@ -103,11 +103,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/esp_adc/adc_continuous.c - - build/ide/esp_idf_components/esp_adc/adc_filter.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_adc/adc_filter.c - build/ide/esp_idf_components/esp_adc/adc_oneshot.c 1 @@ -158,21 +153,11 @@ 1 /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/esp_clk.c - - build/ide/esp_idf_components/esp_hw_support/esp_ds.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/esp_ds.c - build/ide/esp_idf_components/esp_hw_support/esp_gpio_reserve.c 1 /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/esp_gpio_reserve.c - - build/ide/esp_idf_components/esp_hw_support/esp_hmac.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/esp_hmac.c - build/ide/esp_idf_components/esp_hw_support/esp_memory_utils.c 1 @@ -193,11 +178,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/mac_addr.c - - build/ide/esp_idf_components/esp_hw_support/mspi_timing_tuning.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/mspi_timing_tuning.c - build/ide/esp_idf_components/esp_hw_support/periph_ctrl.c 1 @@ -219,23 +199,15 @@ /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/rtc_module.c -<<<<<<< HEAD build/ide/esp_idf_components/esp_hw_support/rtc_wdt.c 1 /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/rtc_wdt.c -======= ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/esp_hw_support/sar_periph_ctrl_common.c 1 /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/sar_periph_ctrl_common.c - - build/ide/esp_idf_components/esp_hw_support/sleep_cpu.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/sleep_cpu.c - build/ide/esp_idf_components/esp_hw_support/sleep_gpio.c 1 @@ -257,14 +229,11 @@ /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/sleep_wake_stub.c -<<<<<<< HEAD build/ide/esp_idf_components/esp_mm/cache_esp32.c 1 /home/bogd/esp-idf-v5.1.2/components/esp_mm/cache_esp32.c -======= ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/esp_mm/esp_cache.c 1 /home/bogd/esp-idf-v5.1.2/components/esp_mm/esp_cache.c @@ -429,40 +398,21 @@ 1 /home/bogd/esp-idf-v5.1.2/components/hal/brownout_hal.c - - build/ide/esp_idf_components/hal/cache_hal.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/hal/cache_hal.c - - - build/ide/esp_idf_components/hal/ds_hal.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/hal/ds_hal.c - build/ide/esp_idf_components/hal/efuse_hal.c 1 /home/bogd/esp-idf-v5.1.2/components/hal/efuse_hal.c - build/ide/esp_idf_components/hal/gdma_hal.c + build/ide/esp_idf_components/hal/emac_hal.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/hal/emac_hal.c -======= - /home/bogdan/esp-idf-v5.1.1/components/hal/gdma_hal.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/hal/gpio_hal.c 1 /home/bogd/esp-idf-v5.1.2/components/hal/gpio_hal.c - - build/ide/esp_idf_components/hal/hmac_hal.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/hal/hmac_hal.c - build/ide/esp_idf_components/hal/i2c_hal.c 1 @@ -478,11 +428,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/hal/i2s_hal.c - - build/ide/esp_idf_components/hal/lcd_hal.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/hal/lcd_hal.c - build/ide/esp_idf_components/hal/ledc_hal.c 1 @@ -524,14 +469,11 @@ /home/bogd/esp-idf-v5.1.2/components/hal/rtc_io_hal.c -<<<<<<< HEAD build/ide/esp_idf_components/hal/sdio_slave_hal.c 1 /home/bogd/esp-idf-v5.1.2/components/hal/sdio_slave_hal.c -======= ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/hal/sdm_hal.c 1 /home/bogd/esp-idf-v5.1.2/components/hal/sdm_hal.c @@ -551,11 +493,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/hal/spi_flash_hal.c - - build/ide/esp_idf_components/hal/spi_flash_hal_gpspi.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/hal/spi_flash_hal_gpspi.c - build/ide/esp_idf_components/hal/spi_flash_hal_iram.c 1 @@ -581,16 +518,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/hal/spi_slave_hal_iram.c - - build/ide/esp_idf_components/hal/spi_slave_hd_hal.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/hal/spi_slave_hd_hal.c - - - build/ide/esp_idf_components/hal/systimer_hal.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/hal/systimer_hal.c - build/ide/esp_idf_components/hal/timer_hal.c 1 @@ -622,28 +549,9 @@ /home/bogd/esp-idf-v5.1.2/components/hal/uart_hal_iram.c - build/ide/esp_idf_components/hal/usb_dwc_hal.c + build/ide/esp_idf_components/hal/wdt_hal_iram.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/hal/wdt_hal_iram.c -======= - /home/bogdan/esp-idf-v5.1.1/components/hal/usb_dwc_hal.c - - - build/ide/esp_idf_components/hal/usb_hal.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/hal/usb_hal.c - - - build/ide/esp_idf_components/hal/usb_phy_hal.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/hal/usb_phy_hal.c - - - build/ide/esp_idf_components/hal/xt_wdt_hal.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/hal/xt_wdt_hal.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/heap/heap_caps.c @@ -915,11 +823,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/spi_flash/spi_flash_chip_winbond.c - - build/ide/esp_idf_components/spi_flash/spi_flash_hpm_enable.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/spi_flash/spi_flash_hpm_enable.c - build/ide/esp_idf_components/spi_flash/spi_flash_os_func_app.c 1 @@ -970,26 +873,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/tcp_transport/transport_ws.c - - build/ide/esp_idf_components/touch_element/touch_button.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/touch_element/touch_button.c - - - build/ide/esp_idf_components/touch_element/touch_element.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/touch_element/touch_element.c - - - build/ide/esp_idf_components/touch_element/touch_matrix.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/touch_element/touch_matrix.c - - - build/ide/esp_idf_components/touch_element/touch_slider.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/touch_element/touch_slider.c - build/ide/esp_idf_components/unity/unity_port_esp32.c 1 @@ -1015,41 +898,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/unity/unity_utils_memory.c - - build/ide/esp_idf_components/usb/hcd_dwc.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/usb/hcd_dwc.c - - - build/ide/esp_idf_components/usb/hub.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/usb/hub.c - - - build/ide/esp_idf_components/usb/usb_helpers.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/usb/usb_helpers.c - - - build/ide/esp_idf_components/usb/usb_host.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/usb/usb_host.c - - - build/ide/esp_idf_components/usb/usb_phy.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/usb/usb_phy.c - - - build/ide/esp_idf_components/usb/usb_private.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/usb/usb_private.c - - - build/ide/esp_idf_components/usb/usbh.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/usb/usbh.c - build/ide/esp_idf_components/vfs/vfs.c 1 @@ -1075,11 +923,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/vfs/vfs_uart.c - - build/ide/esp_idf_components/vfs/vfs_usb_serial_jtag.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/vfs/vfs_usb_serial_jtag.c - build/ide/esp_idf_components/wear_levelling/Partition.cpp 1 @@ -1171,13 +1014,9 @@ /home/bogd/esp-idf-v5.1.2/components/bootloader_support/src/bootloader_random.c - build/ide/esp_idf_components/bootloader_support/src/bootloader_random_esp32s3.c + build/ide/esp_idf_components/bootloader_support/src/bootloader_random_esp32.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/bootloader_support/src/bootloader_random_esp32.c -======= - /home/bogdan/esp-idf-v5.1.1/components/bootloader_support/src/bootloader_random_esp32s3.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/bootloader_support/src/bootloader_utility.c @@ -1280,7 +1119,6 @@ /home/bogd/esp-idf-v5.1.2/components/console/linenoise/linenoise.c -<<<<<<< HEAD build/ide/esp_idf_components/driver/dac/dac_common.c 1 /home/bogd/esp-idf-v5.1.2/components/driver/dac/dac_common.c @@ -1301,34 +1139,26 @@ /home/bogd/esp-idf-v5.1.2/components/driver/dac/dac_oneshot.c -======= ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/driver/deprecated/adc_dma_legacy.c 1 /home/bogd/esp-idf-v5.1.2/components/driver/deprecated/adc_dma_legacy.c -<<<<<<< HEAD build/ide/esp_idf_components/driver/deprecated/adc_i2s_deprecated.c 1 /home/bogd/esp-idf-v5.1.2/components/driver/deprecated/adc_i2s_deprecated.c -======= ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/driver/deprecated/adc_legacy.c 1 /home/bogd/esp-idf-v5.1.2/components/driver/deprecated/adc_legacy.c -<<<<<<< HEAD build/ide/esp_idf_components/driver/deprecated/dac_common_legacy.c 1 /home/bogd/esp-idf-v5.1.2/components/driver/deprecated/dac_common_legacy.c -======= ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/driver/deprecated/i2s_legacy.c 1 /home/bogd/esp-idf-v5.1.2/components/driver/deprecated/i2s_legacy.c @@ -1348,11 +1178,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/driver/deprecated/rmt_legacy.c - - build/ide/esp_idf_components/driver/deprecated/rtc_temperature_legacy.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/driver/deprecated/rtc_temperature_legacy.c - build/ide/esp_idf_components/driver/deprecated/sigma_delta_legacy.c 1 @@ -1363,11 +1188,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/driver/deprecated/timer_legacy.c - - build/ide/esp_idf_components/driver/gpio/dedic_gpio.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/driver/gpio/dedic_gpio.c - build/ide/esp_idf_components/driver/gpio/gpio.c 1 @@ -1378,11 +1198,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/driver/gpio/gpio_glitch_filter_ops.c - - build/ide/esp_idf_components/driver/gpio/gpio_pin_glitch_filter.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/driver/gpio/gpio_pin_glitch_filter.c - build/ide/esp_idf_components/driver/gpio/rtc_io.c 1 @@ -1418,11 +1233,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/driver/i2s/i2s_std.c - - build/ide/esp_idf_components/driver/i2s/i2s_tdm.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/driver/i2s/i2s_tdm.c - build/ide/esp_idf_components/driver/ledc/ledc.c 1 @@ -1494,14 +1304,11 @@ /home/bogd/esp-idf-v5.1.2/components/driver/rmt/rmt_tx.c -<<<<<<< HEAD build/ide/esp_idf_components/driver/sdio_slave/sdio_slave.c 1 /home/bogd/esp-idf-v5.1.2/components/driver/sdio_slave/sdio_slave.c -======= ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/driver/sdmmc/sdmmc_host.c 1 /home/bogd/esp-idf-v5.1.2/components/driver/sdmmc/sdmmc_host.c @@ -1521,11 +1328,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/driver/spi/spi_bus_lock.c - - build/ide/esp_idf_components/driver/temperature_sensor/temperature_sensor.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/driver/temperature_sensor/temperature_sensor.c - build/ide/esp_idf_components/driver/touch_sensor/touch_sensor_common.c 1 @@ -1542,46 +1344,19 @@ /home/bogd/esp-idf-v5.1.2/components/driver/uart/uart.c - build/ide/esp_idf_components/driver/usb_serial_jtag/usb_serial_jtag.c + build/ide/esp_idf_components/efuse/esp32/esp_efuse_fields.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/efuse/esp32/esp_efuse_fields.c -======= - /home/bogdan/esp-idf-v5.1.1/components/driver/usb_serial_jtag/usb_serial_jtag.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/driver/usb_serial_jtag/usb_serial_jtag_connection_monitor.c + build/ide/esp_idf_components/efuse/esp32/esp_efuse_table.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/efuse/esp32/esp_efuse_table.c -======= - /home/bogdan/esp-idf-v5.1.1/components/driver/usb_serial_jtag/usb_serial_jtag_connection_monitor.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/efuse/esp32s3/esp_efuse_fields.c + build/ide/esp_idf_components/efuse/esp32/esp_efuse_utility.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/efuse/esp32/esp_efuse_utility.c -======= - /home/bogdan/esp-idf-v5.1.1/components/efuse/esp32s3/esp_efuse_fields.c - - - build/ide/esp_idf_components/efuse/esp32s3/esp_efuse_rtc_calib.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/efuse/esp32s3/esp_efuse_rtc_calib.c - - - build/ide/esp_idf_components/efuse/esp32s3/esp_efuse_table.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/efuse/esp32s3/esp_efuse_table.c - - - build/ide/esp_idf_components/efuse/esp32s3/esp_efuse_utility.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/efuse/esp32s3/esp_efuse_utility.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/efuse/src/esp_efuse_api.c @@ -1609,22 +1384,14 @@ /home/bogd/esp-idf-v5.1.2/components/esp_adc/deprecated/esp_adc_cal_common_legacy.c - build/ide/esp_idf_components/esp_adc/esp32s3/curve_fitting_coefficients.c + build/ide/esp_idf_components/esp_adc/esp32/adc_cali_line_fitting.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_adc/esp32/adc_cali_line_fitting.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_adc/esp32s3/curve_fitting_coefficients.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_coex/esp32s3/esp_coex_adapter.c + build/ide/esp_idf_components/esp_coex/esp32/esp_coex_adapter.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_coex/esp32/esp_coex_adapter.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_coex/esp32s3/esp_coex_adapter.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/esp_common/src/esp_err_to_name.c @@ -1637,14 +1404,11 @@ /home/bogd/esp-idf-v5.1.2/components/esp_eth/src/esp_eth.c -<<<<<<< HEAD build/ide/esp_idf_components/esp_eth/src/esp_eth_mac_esp.c 1 /home/bogd/esp-idf-v5.1.2/components/esp_eth/src/esp_eth_mac_esp.c -======= ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/esp_eth/src/esp_eth_netif_glue.c 1 /home/bogd/esp-idf-v5.1.2/components/esp_eth/src/esp_eth_netif_glue.c @@ -1655,7 +1419,6 @@ /home/bogd/esp-idf-v5.1.2/components/esp_eth/src/esp_eth_phy_802_3.c -<<<<<<< HEAD build/ide/esp_idf_components/esp_eth/src/esp_eth_phy_dp83848.c 1 /home/bogd/esp-idf-v5.1.2/components/esp_eth/src/esp_eth_phy_dp83848.c @@ -1681,8 +1444,6 @@ /home/bogd/esp-idf-v5.1.2/components/esp_eth/src/esp_eth_phy_rtl8201.c -======= ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/esp_gdbstub/src/gdbstub.c 1 /home/bogd/esp-idf-v5.1.2/components/esp_gdbstub/src/gdbstub.c @@ -1762,31 +1523,11 @@ 1 /home/bogd/esp-idf-v5.1.2/components/esp_https_ota/src/esp_https_ota.c - - build/ide/esp_idf_components/esp_hw_support/dma/async_memcpy_impl_gdma.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/dma/async_memcpy_impl_gdma.c - - - build/ide/esp_idf_components/esp_hw_support/dma/esp_async_memcpy.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/dma/esp_async_memcpy.c - - - build/ide/esp_idf_components/esp_hw_support/dma/gdma.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/dma/gdma.c - build/ide/esp_idf_components/esp_hw_support/port/esp_clk_tree_common.c 1 /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/port/esp_clk_tree_common.c - - build/ide/esp_idf_components/esp_hw_support/port/esp_memprot_conv.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/port/esp_memprot_conv.c - build/ide/esp_idf_components/esp_lcd/src/esp_lcd_common.c 1 @@ -1803,13 +1544,9 @@ /home/bogd/esp-idf-v5.1.2/components/esp_lcd/src/esp_lcd_panel_io_i2c.c - build/ide/esp_idf_components/esp_lcd/src/esp_lcd_panel_io_i80.c + build/ide/esp_idf_components/esp_lcd/src/esp_lcd_panel_io_i2s.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_lcd/src/esp_lcd_panel_io_i2s.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_lcd/src/esp_lcd_panel_io_i80.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/esp_lcd/src/esp_lcd_panel_io_spi.c @@ -1826,11 +1563,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/esp_lcd/src/esp_lcd_panel_ops.c - - build/ide/esp_idf_components/esp_lcd/src/esp_lcd_panel_rgb.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_lcd/src/esp_lcd_panel_rgb.c - build/ide/esp_idf_components/esp_lcd/src/esp_lcd_panel_ssd1306.c 1 @@ -1901,16 +1633,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/esp_phy/src/phy_override.c - - build/ide/esp_idf_components/esp_rom/patches/esp_rom_cache_esp32s2_esp32s3.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_rom/patches/esp_rom_cache_esp32s2_esp32s3.c - - - build/ide/esp_idf_components/esp_rom/patches/esp_rom_cache_writeback_esp32s3.S - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_rom/patches/esp_rom_cache_writeback_esp32s3.S - build/ide/esp_idf_components/esp_rom/patches/esp_rom_crc.c 1 @@ -1936,21 +1658,11 @@ 1 /home/bogd/esp-idf-v5.1.2/components/esp_rom/patches/esp_rom_sys.c - - build/ide/esp_idf_components/esp_rom/patches/esp_rom_systimer.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_rom/patches/esp_rom_systimer.c - build/ide/esp_idf_components/esp_rom/patches/esp_rom_uart.c 1 /home/bogd/esp-idf-v5.1.2/components/esp_rom/patches/esp_rom_uart.c - - build/ide/esp_idf_components/esp_rom/patches/esp_rom_wdt.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_rom/patches/esp_rom_wdt.c - build/ide/esp_idf_components/esp_system/port/brownout.c 1 @@ -1992,13 +1704,9 @@ /home/bogd/esp-idf-v5.1.2/components/esp_timer/src/esp_timer_impl_common.c - build/ide/esp_idf_components/esp_timer/src/esp_timer_impl_systimer.c + build/ide/esp_idf_components/esp_timer/src/esp_timer_impl_lac.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_timer/src/esp_timer_impl_lac.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_timer/src/esp_timer_impl_systimer.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/esp_timer/src/ets_timer_legacy.c @@ -2011,13 +1719,9 @@ /home/bogd/esp-idf-v5.1.2/components/esp_timer/src/system_time.c - build/ide/esp_idf_components/esp_wifi/esp32s3/esp_adapter.c + build/ide/esp_idf_components/esp_wifi/esp32/esp_adapter.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_wifi/esp32/esp_adapter.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_wifi/esp32s3/esp_adapter.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/esp_wifi/src/mesh_event.c @@ -2175,45 +1879,29 @@ /home/bogd/esp-idf-v5.1.2/components/freertos/esp_additions/idf_additions.c - build/ide/esp_idf_components/hal/esp32s3/clk_tree_hal.c + build/ide/esp_idf_components/hal/esp32/cache_hal_esp32.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/hal/esp32/cache_hal_esp32.c -======= - /home/bogdan/esp-idf-v5.1.1/components/hal/esp32s3/clk_tree_hal.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/hal/esp32s3/efuse_hal.c + build/ide/esp_idf_components/hal/esp32/clk_tree_hal.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/hal/esp32/clk_tree_hal.c -======= - /home/bogdan/esp-idf-v5.1.1/components/hal/esp32s3/efuse_hal.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/hal/esp32s3/rtc_cntl_hal.c + build/ide/esp_idf_components/hal/esp32/efuse_hal.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/hal/esp32/efuse_hal.c -======= - /home/bogdan/esp-idf-v5.1.1/components/hal/esp32s3/rtc_cntl_hal.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/hal/esp32s3/touch_sensor_hal.c + build/ide/esp_idf_components/hal/esp32/gpio_hal_workaround.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/hal/esp32/gpio_hal_workaround.c build/ide/esp_idf_components/hal/esp32/touch_sensor_hal.c 1 /home/bogd/esp-idf-v5.1.2/components/hal/esp32/touch_sensor_hal.c -======= - /home/bogdan/esp-idf-v5.1.1/components/hal/esp32s3/touch_sensor_hal.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/heap/port/memory_layout_utils.c @@ -2376,218 +2064,109 @@ /home/bogd/esp-idf-v5.1.2/components/protocomm/proto-c/session.pb-c.c - build/ide/esp_idf_components/soc/esp32s3/adc_periph.c + build/ide/esp_idf_components/soc/esp32/adc_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/adc_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/adc_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/dedic_gpio_periph.c + build/ide/esp_idf_components/soc/esp32/dac_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/dac_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/dedic_gpio_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/gdma_periph.c + build/ide/esp_idf_components/soc/esp32/dport_access.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/dport_access.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/gdma_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/gpio_periph.c + build/ide/esp_idf_components/soc/esp32/gpio_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/gpio_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/gpio_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/i2c_periph.c + build/ide/esp_idf_components/soc/esp32/i2c_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/i2c_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/i2c_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/i2s_periph.c + build/ide/esp_idf_components/soc/esp32/i2s_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/i2s_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/i2s_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/interrupts.c + build/ide/esp_idf_components/soc/esp32/interrupts.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/interrupts.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/interrupts.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/lcd_periph.c + build/ide/esp_idf_components/soc/esp32/lcd_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/lcd_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/lcd_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/ledc_periph.c + build/ide/esp_idf_components/soc/esp32/ledc_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/ledc_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/ledc_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/mcpwm_periph.c + build/ide/esp_idf_components/soc/esp32/mcpwm_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/mcpwm_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/mcpwm_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/pcnt_periph.c + build/ide/esp_idf_components/soc/esp32/pcnt_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/pcnt_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/pcnt_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/rmt_periph.c + build/ide/esp_idf_components/soc/esp32/rmt_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/rmt_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/rmt_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/rtc_io_periph.c + build/ide/esp_idf_components/soc/esp32/rtc_io_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/rtc_io_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/rtc_io_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/sdm_periph.c + build/ide/esp_idf_components/soc/esp32/sdio_slave_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/sdio_slave_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/sdm_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/sdmmc_periph.c + build/ide/esp_idf_components/soc/esp32/sdm_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/sdm_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/sdmmc_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/spi_periph.c + build/ide/esp_idf_components/soc/esp32/sdmmc_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/sdmmc_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/spi_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/temperature_sensor_periph.c + build/ide/esp_idf_components/soc/esp32/spi_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/spi_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/temperature_sensor_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/timer_periph.c + build/ide/esp_idf_components/soc/esp32/timer_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/timer_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/timer_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/touch_sensor_periph.c + build/ide/esp_idf_components/soc/esp32/touch_sensor_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/touch_sensor_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/touch_sensor_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/twai_periph.c + build/ide/esp_idf_components/soc/esp32/twai_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/twai_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/twai_periph.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/soc/esp32s3/uart_periph.c + build/ide/esp_idf_components/soc/esp32/uart_periph.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/soc/esp32/uart_periph.c -======= - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/uart_periph.c - - - build/ide/esp_idf_components/soc/esp32s3/usb_otg_periph.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/usb_otg_periph.c - - - build/ide/esp_idf_components/soc/esp32s3/usb_periph.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/soc/esp32s3/usb_periph.c - - - build/ide/esp_idf_components/spi_flash/esp32s3/spi_flash_oct_flash_init.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/spi_flash/esp32s3/spi_flash_oct_flash_init.c - - - build/ide/esp_idf_components/ulp/ulp_common/ulp_adc.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/ulp/ulp_common/ulp_adc.c - - - build/ide/esp_idf_components/ulp/ulp_common/ulp_common.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/ulp/ulp_common/ulp_common.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/wifi_provisioning/proto-c/wifi_config.pb-c.c @@ -2660,13 +2239,9 @@ /home/bogd/esp-idf-v5.1.2/components/bootloader_support/bootloader_flash/src/bootloader_flash.c - build/ide/esp_idf_components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c + build/ide/esp_idf_components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32.c -======= - /home/bogdan/esp-idf-v5.1.1/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32s3.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/bootloader_support/bootloader_flash/src/flash_qio_mode.c @@ -2684,7 +2259,6 @@ /home/bogd/esp-idf-v5.1.2/components/cmock/CMock/src/cmock.c -<<<<<<< HEAD build/ide/esp_idf_components/driver/dac/esp32/dac_dma.c 1 /home/bogd/esp-idf-v5.1.2/components/driver/dac/esp32/dac_dma.c @@ -2695,8 +2269,6 @@ /home/bogd/esp-idf-v5.1.2/components/driver/deprecated/esp32/dac_legacy.c -======= ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/driver/spi/gpspi/spi_common.c 1 /home/bogd/esp-idf-v5.1.2/components/driver/spi/gpspi/spi_common.c @@ -2711,11 +2283,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/driver/spi/gpspi/spi_slave.c - - build/ide/esp_idf_components/driver/spi/gpspi/spi_slave_hd.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/driver/spi/gpspi/spi_slave_hd.c - build/ide/esp_idf_components/driver/spi/sdspi/sdspi_crc.c 1 @@ -2732,22 +2299,14 @@ /home/bogd/esp-idf-v5.1.2/components/driver/spi/sdspi/sdspi_transaction.c - build/ide/esp_idf_components/driver/touch_sensor/esp32s3/touch_sensor.c + build/ide/esp_idf_components/driver/touch_sensor/esp32/touch_sensor.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/driver/touch_sensor/esp32/touch_sensor.c -======= - /home/bogdan/esp-idf-v5.1.1/components/driver/touch_sensor/esp32s3/touch_sensor.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_adc/deprecated/esp32s3/esp_adc_cal_legacy.c + build/ide/esp_idf_components/esp_adc/deprecated/esp32/esp_adc_cal_legacy.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_adc/deprecated/esp32/esp_adc_cal_legacy.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_adc/deprecated/esp32s3/esp_adc_cal_legacy.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/esp_http_server/src/util/ctrl_sock.c @@ -2755,127 +2314,64 @@ /home/bogd/esp-idf-v5.1.2/components/esp_http_server/src/util/ctrl_sock.c - build/ide/esp_idf_components/esp_hw_support/port/esp32s3/chip_info.c + build/ide/esp_idf_components/esp_hw_support/port/esp32/cache_sram_mmu.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/port/esp32/cache_sram_mmu.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/port/esp32s3/chip_info.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_hw_support/port/esp32s3/cpu_region_protect.c + build/ide/esp_idf_components/esp_hw_support/port/esp32/chip_info.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/port/esp32/chip_info.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/port/esp32s3/cpu_region_protect.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_hw_support/port/esp32s3/esp_clk_tree.c + build/ide/esp_idf_components/esp_hw_support/port/esp32/cpu_region_protect.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/port/esp32/cpu_region_protect.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/port/esp32s3/esp_clk_tree.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_hw_support/port/esp32s3/esp_crypto_lock.c + build/ide/esp_idf_components/esp_hw_support/port/esp32/esp_clk_tree.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/port/esp32/esp_clk_tree.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/port/esp32s3/esp_crypto_lock.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_hw_support/port/esp32s3/esp_memprot.c + build/ide/esp_idf_components/esp_hw_support/port/esp32/io_mux.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/port/esp32/io_mux.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/port/esp32s3/esp_memprot.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_hw_support/port/esp32s3/io_mux.c + build/ide/esp_idf_components/esp_hw_support/port/esp32/rtc_clk.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/port/esp32/rtc_clk.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/port/esp32s3/io_mux.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_hw_support/port/esp32s3/mspi_timing_config.c + build/ide/esp_idf_components/esp_hw_support/port/esp32/rtc_clk_init.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/port/esp32/rtc_clk_init.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/port/esp32s3/mspi_timing_config.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_hw_support/port/esp32s3/rtc_clk.c + build/ide/esp_idf_components/esp_hw_support/port/esp32/rtc_init.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/port/esp32/rtc_init.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/port/esp32s3/rtc_clk.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_hw_support/port/esp32s3/rtc_clk_init.c + build/ide/esp_idf_components/esp_hw_support/port/esp32/rtc_sleep.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/port/esp32/rtc_sleep.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/port/esp32s3/rtc_clk_init.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_hw_support/port/esp32s3/rtc_init.c + build/ide/esp_idf_components/esp_hw_support/port/esp32/rtc_time.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/port/esp32/rtc_time.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/port/esp32s3/rtc_init.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_hw_support/port/esp32s3/rtc_sleep.c + build/ide/esp_idf_components/esp_hw_support/port/esp32/sar_periph_ctrl.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_hw_support/port/esp32/sar_periph_ctrl.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/port/esp32s3/rtc_sleep.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_hw_support/port/esp32s3/rtc_time.c + build/ide/esp_idf_components/esp_mm/port/esp32/ext_mem_layout.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_mm/port/esp32/ext_mem_layout.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/port/esp32s3/rtc_time.c - - - build/ide/esp_idf_components/esp_hw_support/port/esp32s3/sar_periph_ctrl.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/port/esp32s3/sar_periph_ctrl.c - - - build/ide/esp_idf_components/esp_hw_support/port/esp32s3/systimer.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_hw_support/port/esp32s3/systimer.c - - - build/ide/esp_idf_components/esp_mm/port/esp32s3/ext_mem_layout.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_mm/port/esp32s3/ext_mem_layout.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/esp_netif/lwip/netif/esp_pbuf_ref.c @@ -2903,13 +2399,9 @@ /home/bogd/esp-idf-v5.1.2/components/freertos/FreeRTOS-Kernel/portable/port_systick.c - build/ide/esp_idf_components/heap/port/esp32s3/memory_layout.c + build/ide/esp_idf_components/heap/port/esp32/memory_layout.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/heap/port/esp32/memory_layout.c -======= - /home/bogdan/esp-idf-v5.1.1/components/heap/port/esp32s3/memory_layout.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/lwip/apps/dhcpserver/dhcpserver.c @@ -3502,23 +2994,9 @@ /home/bogd/esp-idf-v5.1.2/components/mbedtls/port/aes/esp_aes_xts.c - build/ide/esp_idf_components/mbedtls/port/crypto_shared_gdma/esp_crypto_shared_gdma.c + build/ide/esp_idf_components/mbedtls/port/esp32/bignum.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/mbedtls/port/esp32/bignum.c -======= - /home/bogdan/esp-idf-v5.1.1/components/mbedtls/port/crypto_shared_gdma/esp_crypto_shared_gdma.c - - - build/ide/esp_idf_components/mbedtls/port/esp32s3/bignum.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/mbedtls/port/esp32s3/bignum.c - - - build/ide/esp_idf_components/mbedtls/port/esp_ds/esp_rsa_sign_alt.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/mbedtls/port/esp_ds/esp_rsa_sign_alt.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/mbedtls/port/md/esp_md.c @@ -4076,54 +3554,29 @@ /home/bogd/esp-idf-v5.1.2/components/esp_system/port/arch/xtensa/trax.c - build/ide/esp_idf_components/esp_system/port/soc/esp32s3/apb_backup_dma.c + build/ide/esp_idf_components/esp_system/port/soc/esp32/cache_err_int.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_system/port/soc/esp32/cache_err_int.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_system/port/soc/esp32s3/apb_backup_dma.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_system/port/soc/esp32s3/cache_err_int.c + build/ide/esp_idf_components/esp_system/port/soc/esp32/clk.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_system/port/soc/esp32/clk.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_system/port/soc/esp32s3/cache_err_int.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_system/port/soc/esp32s3/clk.c + build/ide/esp_idf_components/esp_system/port/soc/esp32/highint_hdl.S 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_system/port/soc/esp32/highint_hdl.S -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_system/port/soc/esp32s3/clk.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_system/port/soc/esp32s3/highint_hdl.S + build/ide/esp_idf_components/esp_system/port/soc/esp32/reset_reason.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_system/port/soc/esp32/reset_reason.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_system/port/soc/esp32s3/highint_hdl.S ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/esp_system/port/soc/esp32s3/reset_reason.c + build/ide/esp_idf_components/esp_system/port/soc/esp32/system_internal.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/esp_system/port/soc/esp32/system_internal.c -======= - /home/bogdan/esp-idf-v5.1.1/components/esp_system/port/soc/esp32s3/reset_reason.c - - - build/ide/esp_idf_components/esp_system/port/soc/esp32s3/system_internal.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/esp_system/port/soc/esp32s3/system_internal.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/espcoredump/src/port/xtensa/core_dump_port.c @@ -4316,59 +3769,29 @@ /home/bogd/esp-idf-v5.1.2/components/mbedtls/mbedtls/3rdparty/p256-m/p256-m_driver_entrypoints.c - build/ide/esp_idf_components/mbedtls/port/aes/dma/esp_aes.c + build/ide/esp_idf_components/mbedtls/port/aes/block/esp_aes.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/mbedtls/port/aes/block/esp_aes.c -======= - /home/bogdan/esp-idf-v5.1.1/components/mbedtls/port/aes/dma/esp_aes.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/mbedtls/port/aes/dma/esp_aes_gdma_impl.c + build/ide/esp_idf_components/mbedtls/port/sha/parallel_engine/esp_sha1.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/mbedtls/port/sha/parallel_engine/esp_sha1.c -======= - /home/bogdan/esp-idf-v5.1.1/components/mbedtls/port/aes/dma/esp_aes_gdma_impl.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/mbedtls/port/sha/dma/esp_sha1.c + build/ide/esp_idf_components/mbedtls/port/sha/parallel_engine/esp_sha256.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/mbedtls/port/sha/parallel_engine/esp_sha256.c -======= - /home/bogdan/esp-idf-v5.1.1/components/mbedtls/port/sha/dma/esp_sha1.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/mbedtls/port/sha/dma/esp_sha256.c + build/ide/esp_idf_components/mbedtls/port/sha/parallel_engine/esp_sha512.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/mbedtls/port/sha/parallel_engine/esp_sha512.c -======= - /home/bogdan/esp-idf-v5.1.1/components/mbedtls/port/sha/dma/esp_sha256.c ->>>>>>> refs/remotes/gitlab/main2 - build/ide/esp_idf_components/mbedtls/port/sha/dma/esp_sha512.c + build/ide/esp_idf_components/mbedtls/port/sha/parallel_engine/sha.c 1 -<<<<<<< HEAD /home/bogd/esp-idf-v5.1.2/components/mbedtls/port/sha/parallel_engine/sha.c -======= - /home/bogdan/esp-idf-v5.1.1/components/mbedtls/port/sha/dma/esp_sha512.c - - - build/ide/esp_idf_components/mbedtls/port/sha/dma/esp_sha_gdma_impl.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/mbedtls/port/sha/dma/esp_sha_gdma_impl.c - - - build/ide/esp_idf_components/mbedtls/port/sha/dma/sha.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/mbedtls/port/sha/dma/sha.c ->>>>>>> refs/remotes/gitlab/main2 build/ide/esp_idf_components/protocomm/src/crypto/srp6a/esp_srp.c @@ -4410,11 +3833,6 @@ 1 /home/bogd/esp-idf-v5.1.2/components/wpa_supplicant/esp_supplicant/src/crypto/tls_mbedtls.c - - build/ide/esp_idf_components/efuse/src/efuse_controller/keys/with_key_purposes/esp_efuse_api_key.c - 1 - /home/bogdan/esp-idf-v5.1.1/components/efuse/src/efuse_controller/keys/with_key_purposes/esp_efuse_api_key.c - build/ide/esp_idf_components/lwip/lwip/src/apps/netbiosns/netbiosns.c 1 @@ -4660,13 +4078,10 @@ 1 /home/bogd/esp-idf-v5.1.2/components/mbedtls/mbedtls/3rdparty/p256-m/p256-m/p256-m.c -<<<<<<< HEAD build/ide/esp_idf_components/efuse/src/efuse_controller/keys/without_key_purposes/three_key_blocks/esp_efuse_api_key.c 1 /home/bogd/esp-idf-v5.1.2/components/efuse/src/efuse_controller/keys/without_key_purposes/three_key_blocks/esp_efuse_api_key.c -======= ->>>>>>> refs/remotes/gitlab/main2 diff --git a/dependencies.lock b/dependencies.lock index 4e86d51..9acd967 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -25,5 +25,5 @@ dependencies: type: git version: b42825192c6455569f1a047b21140d6d1fe5e4ef manifest_hash: 8f589d1268303deabf12834b0018f40550b1250232bd389b225ab21bd88eef02 -target: esp32s3 +target: esp32 version: 1.0.0 diff --git a/sdkconfig b/sdkconfig index ade11bd..42d857f 100644 --- a/sdkconfig +++ b/sdkconfig @@ -2,128 +2,106 @@ # Automatically generated file. DO NOT EDIT. # Espressif IoT Development Framework (ESP-IDF) 5.1.2 Project Configuration # -CONFIG_SOC_MPU_MIN_REGION_SIZE=0x20000000 -CONFIG_SOC_MPU_REGIONS_MAX_NUM=8 +CONFIG_SOC_BROWNOUT_RESET_SUPPORTED="Not determined" +CONFIG_SOC_TWAI_BRP_DIV_SUPPORTED="Not determined" +CONFIG_SOC_DPORT_WORKAROUND="Not determined" +CONFIG_SOC_CAPS_ECO_VER_MAX=301 CONFIG_SOC_ADC_SUPPORTED=y +CONFIG_SOC_DAC_SUPPORTED=y CONFIG_SOC_UART_SUPPORTED=y +CONFIG_SOC_MCPWM_SUPPORTED=y +CONFIG_SOC_GPTIMER_SUPPORTED=y +CONFIG_SOC_SDMMC_HOST_SUPPORTED=y +CONFIG_SOC_BT_SUPPORTED=y CONFIG_SOC_PCNT_SUPPORTED=y CONFIG_SOC_WIFI_SUPPORTED=y +CONFIG_SOC_SDIO_SLAVE_SUPPORTED=y CONFIG_SOC_TWAI_SUPPORTED=y -CONFIG_SOC_GDMA_SUPPORTED=y -CONFIG_SOC_GPTIMER_SUPPORTED=y -CONFIG_SOC_LCDCAM_SUPPORTED=y -CONFIG_SOC_MCPWM_SUPPORTED=y -CONFIG_SOC_DEDICATED_GPIO_SUPPORTED=y -CONFIG_SOC_CACHE_SUPPORT_WRAP=y +CONFIG_SOC_EMAC_SUPPORTED=y CONFIG_SOC_ULP_SUPPORTED=y -CONFIG_SOC_ULP_FSM_SUPPORTED=y -CONFIG_SOC_RISCV_COPROC_SUPPORTED=y -CONFIG_SOC_BT_SUPPORTED=y -CONFIG_SOC_USB_OTG_SUPPORTED=y -CONFIG_SOC_USB_SERIAL_JTAG_SUPPORTED=y CONFIG_SOC_CCOMP_TIMER_SUPPORTED=y -CONFIG_SOC_ASYNC_MEMCPY_SUPPORTED=y -CONFIG_SOC_SUPPORTS_SECURE_DL_MODE=y -CONFIG_SOC_EFUSE_KEY_PURPOSE_FIELD=y -CONFIG_SOC_SDMMC_HOST_SUPPORTED=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_GPSPI_SUPPORTED=y CONFIG_SOC_LEDC_SUPPORTED=y CONFIG_SOC_I2C_SUPPORTED=y -CONFIG_SOC_SYSTIMER_SUPPORTED=y CONFIG_SOC_SUPPORT_COEXISTENCE=y -CONFIG_SOC_TEMP_SENSOR_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_BOD_SUPPORTED=y +CONFIG_SOC_ULP_FSM_SUPPORTED=y +CONFIG_SOC_DPORT_WORKAROUND_DIS_INTERRUPT_LVL=5 +CONFIG_SOC_XTAL_SUPPORT_26M=y CONFIG_SOC_XTAL_SUPPORT_40M=y -CONFIG_SOC_APPCPU_HAS_CLOCK_GATING_BUG=y +CONFIG_SOC_XTAL_SUPPORT_AUTO_DETECT=y CONFIG_SOC_ADC_RTC_CTRL_SUPPORTED=y CONFIG_SOC_ADC_DIG_CTRL_SUPPORTED=y -CONFIG_SOC_ADC_ARBITER_SUPPORTED=y -CONFIG_SOC_ADC_DIG_IIR_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=24 -CONFIG_SOC_ADC_DIGI_MIN_BITWIDTH=12 +CONFIG_SOC_ADC_PATT_LEN_MAX=16 +CONFIG_SOC_ADC_DIGI_MIN_BITWIDTH=9 CONFIG_SOC_ADC_DIGI_MAX_BITWIDTH=12 -CONFIG_SOC_ADC_DIGI_RESULT_BYTES=4 +CONFIG_SOC_ADC_DIGI_RESULT_BYTES=2 CONFIG_SOC_ADC_DIGI_DATA_BYTES_PER_CONV=4 -CONFIG_SOC_ADC_DIGI_IIR_FILTER_NUM=2 -CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_HIGH=83333 -CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=611 -CONFIG_SOC_ADC_RTC_MIN_BITWIDTH=12 +CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_HIGH=2 +CONFIG_SOC_ADC_SAMPLE_FREQ_THRES_LOW=20 +CONFIG_SOC_ADC_RTC_MIN_BITWIDTH=9 CONFIG_SOC_ADC_RTC_MAX_BITWIDTH=12 -CONFIG_SOC_ADC_CALIBRATION_V1_SUPPORTED=y -CONFIG_SOC_ADC_SELF_HW_CALI_SUPPORTED=y -CONFIG_SOC_APB_BACKUP_DMA=y -CONFIG_SOC_BROWNOUT_RESET_SUPPORTED=y -CONFIG_SOC_CACHE_WRITEBACK_SUPPORTED=y -CONFIG_SOC_CACHE_FREEZE_SUPPORTED=y +CONFIG_SOC_SHARED_IDCACHE_SUPPORTED=y +CONFIG_SOC_IDCACHE_PER_CORE=y CONFIG_SOC_CPU_CORES_NUM=2 CONFIG_SOC_CPU_INTR_NUM=32 CONFIG_SOC_CPU_HAS_FPU=y CONFIG_SOC_CPU_BREAKPOINTS_NUM=2 CONFIG_SOC_CPU_WATCHPOINTS_NUM=2 CONFIG_SOC_CPU_WATCHPOINT_SIZE=64 -CONFIG_SOC_DS_SIGNATURE_MAX_BIT_LEN=4096 -CONFIG_SOC_DS_KEY_PARAM_MD_IV_LENGTH=16 -CONFIG_SOC_DS_KEY_CHECK_MAX_WAIT_US=1100 -CONFIG_SOC_GDMA_GROUPS=y -CONFIG_SOC_GDMA_PAIRS_PER_GROUP=5 -CONFIG_SOC_GDMA_SUPPORT_PSRAM=y +CONFIG_SOC_DAC_CHAN_NUM=2 +CONFIG_SOC_DAC_RESOLUTION=8 +CONFIG_SOC_DAC_DMA_16BIT_ALIGN=y CONFIG_SOC_GPIO_PORT=1 -CONFIG_SOC_GPIO_PIN_COUNT=49 -CONFIG_SOC_GPIO_SUPPORT_PIN_GLITCH_FILTER=y -CONFIG_SOC_GPIO_FILTER_CLK_SUPPORT_APB=y -CONFIG_SOC_GPIO_SUPPORT_RTC_INDEPENDENT=y -CONFIG_SOC_GPIO_SUPPORT_FORCE_HOLD=y -CONFIG_SOC_GPIO_VALID_GPIO_MASK=0x1FFFFFFFFFFFF -CONFIG_SOC_GPIO_VALID_DIGITAL_IO_PAD_MASK=0x0001FFFFFC000000 -CONFIG_SOC_DEDIC_GPIO_OUT_CHANNELS_NUM=8 -CONFIG_SOC_DEDIC_GPIO_IN_CHANNELS_NUM=8 -CONFIG_SOC_DEDIC_GPIO_OUT_AUTO_ENABLE=y +CONFIG_SOC_GPIO_PIN_COUNT=40 +CONFIG_SOC_GPIO_VALID_GPIO_MASK=0xFFFFFFFFFF +CONFIG_SOC_GPIO_VALID_DIGITAL_IO_PAD_MASK=0xEF0FEA CONFIG_SOC_I2C_NUM=2 CONFIG_SOC_I2C_FIFO_LEN=32 -CONFIG_SOC_I2C_CMD_REG_NUM=8 +CONFIG_SOC_I2C_CMD_REG_NUM=16 CONFIG_SOC_I2C_SUPPORT_SLAVE=y -CONFIG_SOC_I2C_SUPPORT_HW_CLR_BUS=y -CONFIG_SOC_I2C_SUPPORT_XTAL=y -CONFIG_SOC_I2C_SUPPORT_RTC=y +CONFIG_SOC_I2C_SUPPORT_APB=y CONFIG_SOC_I2S_NUM=2 -CONFIG_SOC_I2S_HW_VERSION_2=y -CONFIG_SOC_I2S_SUPPORTS_XTAL=y +CONFIG_SOC_I2S_HW_VERSION_1=y +CONFIG_SOC_I2S_SUPPORTS_APLL=y CONFIG_SOC_I2S_SUPPORTS_PLL_F160M=y -CONFIG_SOC_I2S_SUPPORTS_PCM=y CONFIG_SOC_I2S_SUPPORTS_PDM=y CONFIG_SOC_I2S_SUPPORTS_PDM_TX=y -CONFIG_SOC_I2S_PDM_MAX_TX_LINES=2 +CONFIG_SOC_I2S_PDM_MAX_TX_LINES=1 CONFIG_SOC_I2S_SUPPORTS_PDM_RX=y -CONFIG_SOC_I2S_PDM_MAX_RX_LINES=4 -CONFIG_SOC_I2S_SUPPORTS_TDM=y +CONFIG_SOC_I2S_PDM_MAX_RX_LINES=1 +CONFIG_SOC_I2S_SUPPORTS_ADC_DAC=y +CONFIG_SOC_I2S_SUPPORTS_ADC=y +CONFIG_SOC_I2S_SUPPORTS_DAC=y +CONFIG_SOC_I2S_SUPPORTS_LCD_CAMERA=y +CONFIG_SOC_I2S_TRANS_SIZE_ALIGN_WORD=y +CONFIG_SOC_I2S_LCD_I80_VARIANT=y +CONFIG_SOC_LCD_I80_SUPPORTED=y +CONFIG_SOC_LCD_I80_BUSES=2 +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_XTAL_CLOCK=y +CONFIG_SOC_LEDC_SUPPORT_REF_TICK=y +CONFIG_SOC_LEDC_SUPPORT_HS_MODE=y CONFIG_SOC_LEDC_CHANNEL_NUM=8 -CONFIG_SOC_LEDC_TIMER_BIT_WIDTH=14 -CONFIG_SOC_LEDC_SUPPORT_FADE_STOP=y +CONFIG_SOC_LEDC_TIMER_BIT_WIDTH=20 CONFIG_SOC_MCPWM_GROUPS=2 CONFIG_SOC_MCPWM_TIMERS_PER_GROUP=3 CONFIG_SOC_MCPWM_OPERATORS_PER_GROUP=3 @@ -134,194 +112,112 @@ CONFIG_SOC_MCPWM_GPIO_FAULTS_PER_GROUP=3 CONFIG_SOC_MCPWM_CAPTURE_TIMERS_PER_GROUP=y CONFIG_SOC_MCPWM_CAPTURE_CHANNELS_PER_TIMER=3 CONFIG_SOC_MCPWM_GPIO_SYNCHROS_PER_GROUP=3 -CONFIG_SOC_MCPWM_SWSYNC_CAN_PROPAGATE=y -CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=1 -CONFIG_SOC_MMU_PERIPH_NUM=1 +CONFIG_SOC_MMU_PERIPH_NUM=2 +CONFIG_SOC_MMU_LINEAR_ADDRESS_REGION_NUM=3 +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_UNITS_PER_GROUP=8 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_TX_CANDIDATES_PER_GROUP=8 +CONFIG_SOC_RMT_RX_CANDIDATES_PER_GROUP=8 CONFIG_SOC_RMT_CHANNELS_PER_GROUP=8 -CONFIG_SOC_RMT_MEM_WORDS_PER_CHANNEL=48 -CONFIG_SOC_RMT_SUPPORT_RX_PINGPONG=y -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_LOOP_AUTO_STOP=y -CONFIG_SOC_RMT_SUPPORT_TX_SYNCHRO=y -CONFIG_SOC_RMT_SUPPORT_TX_CARRIER_DATA_ONLY=y -CONFIG_SOC_RMT_SUPPORT_XTAL=y -CONFIG_SOC_RMT_SUPPORT_RC_FAST=y +CONFIG_SOC_RMT_MEM_WORDS_PER_CHANNEL=64 +CONFIG_SOC_RMT_SUPPORT_REF_TICK=y CONFIG_SOC_RMT_SUPPORT_APB=y -CONFIG_SOC_RMT_SUPPORT_DMA=y -CONFIG_SOC_LCD_I80_SUPPORTED=y -CONFIG_SOC_LCD_RGB_SUPPORTED=y -CONFIG_SOC_LCD_I80_BUSES=1 -CONFIG_SOC_LCD_RGB_PANELS=1 -CONFIG_SOC_LCD_I80_BUS_WIDTH=16 -CONFIG_SOC_LCD_RGB_DATA_WIDTH=16 -CONFIG_SOC_LCD_SUPPORT_RGB_YUV_CONV=y -CONFIG_SOC_RTC_CNTL_CPU_PD_DMA_BUS_WIDTH=128 -CONFIG_SOC_RTC_CNTL_CPU_PD_REG_FILE_NUM=549 -CONFIG_SOC_RTC_CNTL_TAGMEM_PD_DMA_BUS_WIDTH=128 -CONFIG_SOC_RTCIO_PIN_COUNT=22 +CONFIG_SOC_RMT_CHANNEL_CLK_INDEPENDENT=y +CONFIG_SOC_RTCIO_PIN_COUNT=18 CONFIG_SOC_RTCIO_INPUT_OUTPUT_SUPPORTED=y CONFIG_SOC_RTCIO_HOLD_SUPPORTED=y CONFIG_SOC_RTCIO_WAKE_SUPPORTED=y -CONFIG_SOC_SDM_GROUPS=y +CONFIG_SOC_SDM_GROUPS=1 CONFIG_SOC_SDM_CHANNELS_PER_GROUP=8 CONFIG_SOC_SDM_CLK_SUPPORT_APB=y +CONFIG_SOC_SPI_HD_BOTH_INOUT_SUPPORTED=y +CONFIG_SOC_SPI_AS_CS_SUPPORTED=y CONFIG_SOC_SPI_PERIPH_NUM=3 -CONFIG_SOC_SPI_MAX_CS_NUM=6 -CONFIG_SOC_SPI_MAXIMUM_BUFFER_SIZE=64 -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_DMA_CHAN_NUM=2 +CONFIG_SOC_SPI_MAX_CS_NUM=3 CONFIG_SOC_SPI_SUPPORT_CLK_APB=y -CONFIG_SOC_SPI_SUPPORT_CLK_XTAL=y -CONFIG_SOC_SPI_PERIPH_SUPPORT_CONTROL_DUMMY_OUT=y -CONFIG_SOC_MEMSPI_IS_INDEPENDENT=y -CONFIG_SOC_SPI_MAX_PRE_DIVIDER=16 -CONFIG_SOC_SPI_SUPPORT_OCT=y -CONFIG_SOC_MEMSPI_SRC_FREQ_120M=y +CONFIG_SOC_SPI_MAXIMUM_BUFFER_SIZE=64 +CONFIG_SOC_SPI_MAX_PRE_DIVIDER=8192 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_SPIRAM_SUPPORTED=y -CONFIG_SOC_SPIRAM_XIP_SUPPORTED=y -CONFIG_SOC_SYSTIMER_COUNTER_NUM=2 -CONFIG_SOC_SYSTIMER_ALARM_NUM=3 -CONFIG_SOC_SYSTIMER_BIT_WIDTH_LO=32 -CONFIG_SOC_SYSTIMER_BIT_WIDTH_HI=20 -CONFIG_SOC_SYSTIMER_FIXED_DIVIDER=y -CONFIG_SOC_SYSTIMER_INT_LEVEL=y -CONFIG_SOC_SYSTIMER_ALARM_MISS_COMPENSATE=y CONFIG_SOC_TIMER_GROUPS=2 CONFIG_SOC_TIMER_GROUP_TIMERS_PER_GROUP=2 -CONFIG_SOC_TIMER_GROUP_COUNTER_BIT_WIDTH=54 -CONFIG_SOC_TIMER_GROUP_SUPPORT_XTAL=y -CONFIG_SOC_TIMER_GROUP_SUPPORT_APB=y +CONFIG_SOC_TIMER_GROUP_COUNTER_BIT_WIDTH=64 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_PROXIMITY_MEAS_DONE_SUPPORTED=y -CONFIG_SOC_TOUCH_PAD_THRESHOLD_MAX=0x1FFFFF +CONFIG_SOC_TIMER_GROUP_SUPPORT_APB=y +CONFIG_SOC_TOUCH_VERSION_1=y +CONFIG_SOC_TOUCH_SENSOR_NUM=10 CONFIG_SOC_TOUCH_PAD_MEASURE_WAIT_MAX=0xFF CONFIG_SOC_TWAI_CONTROLLER_NUM=1 -CONFIG_SOC_TWAI_CLK_SUPPORT_APB=y CONFIG_SOC_TWAI_BRP_MIN=2 -CONFIG_SOC_TWAI_BRP_MAX=16384 -CONFIG_SOC_TWAI_SUPPORTS_RX_STATUS=y +CONFIG_SOC_TWAI_CLK_SUPPORT_APB=y +CONFIG_SOC_TWAI_SUPPORT_MULTI_ADDRESS_LAYOUT=y CONFIG_SOC_UART_NUM=3 +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_UART_SUPPORT_FSM_TX_WAIT_SEND=y -CONFIG_SOC_UART_SUPPORT_WAKEUP_INT=y -CONFIG_SOC_UART_SUPPORT_APB_CLK=y -CONFIG_SOC_UART_SUPPORT_RTC_CLK=y -CONFIG_SOC_UART_SUPPORT_XTAL_CLK=y -CONFIG_SOC_UART_REQUIRE_CORE_RESET=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_GDMA=y +CONFIG_SOC_SPIRAM_SUPPORTED=y +CONFIG_SOC_SPI_MEM_SUPPORT_CONFIG_GPIO_BY_EFUSE=y +CONFIG_SOC_SHA_SUPPORT_PARALLEL_ENG=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_GDMA=y CONFIG_SOC_AES_SUPPORT_AES_128=y +CONFIG_SOC_AES_SUPPORT_AES_192=y CONFIG_SOC_AES_SUPPORT_AES_256=y +CONFIG_SOC_SECURE_BOOT_V1=y +CONFIG_SOC_EFUSE_SECURE_BOOT_KEY_DIGESTS=y +CONFIG_SOC_FLASH_ENCRYPTED_XTS_AES_BLOCK_MAX=32 +CONFIG_SOC_PHY_DIG_REGS_MEM_SIZE=21 CONFIG_SOC_PM_SUPPORT_EXT0_WAKEUP=y CONFIG_SOC_PM_SUPPORT_EXT1_WAKEUP=y CONFIG_SOC_PM_SUPPORT_EXT_WAKEUP=y -CONFIG_SOC_PM_SUPPORT_WIFI_WAKEUP=y -CONFIG_SOC_PM_SUPPORT_BT_WAKEUP=y CONFIG_SOC_PM_SUPPORT_TOUCH_SENSOR_WAKEUP=y -CONFIG_SOC_PM_SUPPORT_CPU_PD=y -CONFIG_SOC_PM_SUPPORT_TAGMEM_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_PM_SUPPORT_RC_FAST_PD=y CONFIG_SOC_PM_SUPPORT_VDDSDIO_PD=y -CONFIG_SOC_PM_SUPPORT_MAC_BB_PD=y CONFIG_SOC_PM_SUPPORT_MODEM_PD=y CONFIG_SOC_CONFIGURABLE_VDDSDIO_SUPPORTED=y -CONFIG_SOC_PM_SUPPORT_DEEPSLEEP_CHECK_STUB_ONLY=y -CONFIG_SOC_PM_CPU_RETENTION_BY_RTCCNTL=y -CONFIG_SOC_PM_MODEM_RETENTION_BY_BACKUPDMA=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_CLK_RC_FAST_D256_SUPPORTED=y CONFIG_SOC_RTC_SLOW_CLK_SUPPORT_RC_FAST_D256=y CONFIG_SOC_CLK_RC_FAST_SUPPORT_CALIBRATION=y CONFIG_SOC_CLK_XTAL32K_SUPPORTED=y -CONFIG_SOC_EFUSE_DIS_DOWNLOAD_ICACHE=y -CONFIG_SOC_EFUSE_DIS_DOWNLOAD_DCACHE=y -CONFIG_SOC_EFUSE_HARD_DIS_JTAG=y -CONFIG_SOC_EFUSE_DIS_USB_JTAG=y -CONFIG_SOC_EFUSE_SOFT_DIS_JTAG=y -CONFIG_SOC_EFUSE_DIS_DIRECT_BOOT=y -CONFIG_SOC_EFUSE_DIS_ICACHE=y -CONFIG_SOC_EFUSE_BLOCK9_KEY_PURPOSE_QUIRK=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=256 -CONFIG_SOC_PHY_DIG_REGS_MEM_SIZE=21 -CONFIG_SOC_MAC_BB_PD_MEM_SIZE=192 -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_AUTO_RESUME=y -CONFIG_SOC_SPI_MEM_SUPPORT_SW_SUSPEND=y -CONFIG_SOC_SPI_MEM_SUPPORT_OPI_MODE=y -CONFIG_SOC_SPI_MEM_SUPPORT_TIME_TUNING=y -CONFIG_SOC_SPI_MEM_SUPPORT_CONFIG_GPIO_BY_EFUSE=y -CONFIG_SOC_SPI_MEM_SUPPORT_WRAP=y -CONFIG_SOC_COEX_HW_PTI=y -CONFIG_SOC_EXTERNAL_COEX_LEADER_TX_LINE=y -CONFIG_SOC_SDMMC_USE_GPIO_MATRIX=y +CONFIG_SOC_SDMMC_USE_IOMUX=y CONFIG_SOC_SDMMC_NUM_SLOTS=2 -CONFIG_SOC_SDMMC_SUPPORT_XTAL_CLOCK=y -CONFIG_SOC_TEMPERATURE_SENSOR_SUPPORT_FAST_RC=y -CONFIG_SOC_WIFI_HW_TSF=y -CONFIG_SOC_WIFI_FTM_SUPPORT=y -CONFIG_SOC_WIFI_GCMP_SUPPORT=y CONFIG_SOC_WIFI_WAPI_SUPPORT=y CONFIG_SOC_WIFI_CSI_SUPPORT=y CONFIG_SOC_WIFI_MESH_SUPPORT=y CONFIG_SOC_WIFI_SUPPORT_VARIABLE_BEACON_WINDOW=y +CONFIG_SOC_WIFI_NAN_SUPPORT=y CONFIG_SOC_BLE_SUPPORTED=y CONFIG_SOC_BLE_MESH_SUPPORTED=y -CONFIG_SOC_BLE_50_SUPPORTED=y -CONFIG_SOC_BLE_DEVICE_PRIVACY_SUPPORTED=y +CONFIG_SOC_BT_CLASSIC_SUPPORTED=y CONFIG_SOC_BLUFI_SUPPORTED=y CONFIG_SOC_ULP_HAS_ADC=y CONFIG_SOC_PHY_COMBO_MODULE=y CONFIG_IDF_CMAKE=y CONFIG_IDF_TARGET_ARCH_XTENSA=y CONFIG_IDF_TARGET_ARCH="xtensa" -CONFIG_IDF_TARGET="esp32s3" -CONFIG_IDF_TARGET_ESP32S3=y -CONFIG_IDF_FIRMWARE_CHIP_ID=0x0009 +CONFIG_IDF_TARGET="esp32" +CONFIG_IDF_TARGET_ESP32=y +CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000 # # Build type @@ -333,12 +229,14 @@ 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 +# CONFIG_APP_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set +# CONFIG_APP_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set # end of Build type # # Bootloader config # -CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x0 +CONFIG_BOOTLOADER_OFFSET_IN_FLASH=0x1000 CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_DEBUG is not set # CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_PERF is not set @@ -350,6 +248,8 @@ CONFIG_BOOTLOADER_LOG_LEVEL_INFO=y # CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG is not set # CONFIG_BOOTLOADER_LOG_LEVEL_VERBOSE is not set CONFIG_BOOTLOADER_LOG_LEVEL=3 +# CONFIG_BOOTLOADER_SPI_CUSTOM_WP_PIN is not set +CONFIG_BOOTLOADER_SPI_WP_PIN=7 CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_9V=y # CONFIG_BOOTLOADER_FACTORY_RESET is not set # CONFIG_BOOTLOADER_APP_TEST is not set @@ -369,12 +269,10 @@ CONFIG_BOOTLOADER_FLASH_XMC_SUPPORT=y # # Security features # -CONFIG_SECURE_BOOT_V2_RSA_SUPPORTED=y -CONFIG_SECURE_BOOT_V2_PREFERRED=y +CONFIG_SECURE_BOOT_V1_SUPPORTED=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 # @@ -392,49 +290,24 @@ CONFIG_ESP_ROM_HAS_CRC_LE=y CONFIG_ESP_ROM_HAS_CRC_BE=y CONFIG_ESP_ROM_HAS_MZ_CRC32=y CONFIG_ESP_ROM_HAS_JPEG_DECODE=y -CONFIG_ESP_ROM_UART_CLK_IS_XTAL=y -CONFIG_ESP_ROM_HAS_RETARGETABLE_LOCKING=y -CONFIG_ESP_ROM_USB_SERIAL_DEVICE_NUM=4 -CONFIG_ESP_ROM_HAS_ERASE_0_REGION_BUG=y -CONFIG_ESP_ROM_GET_CLK_FREQ=y -CONFIG_ESP_ROM_HAS_HAL_WDT=y +CONFIG_ESP_ROM_HAS_UART_BUF_SWITCH=y CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y -CONFIG_ESP_ROM_HAS_LAYOUT_TABLE=y -CONFIG_ESP_ROM_HAS_SPI_FLASH=y -CONFIG_ESP_ROM_HAS_ETS_PRINTF_BUG=y CONFIG_ESP_ROM_HAS_NEWLIB_NANO_FORMAT=y -CONFIG_ESP_ROM_NEEDS_SET_CACHE_MMU_SIZE=y -CONFIG_ESP_ROM_RAM_APP_NEEDS_MMU_INIT=y -CONFIG_ESP_ROM_HAS_FLASH_COUNT_PAGES_BUG=y -CONFIG_ESP_ROM_HAS_CACHE_SUSPEND_WAITI_BUG=y -CONFIG_ESP_ROM_HAS_CACHE_WRITEBACK_BUG=y - -# -# Boot ROM Behavior -# -CONFIG_BOOT_ROM_LOG_ALWAYS_ON=y -# CONFIG_BOOT_ROM_LOG_ALWAYS_OFF is not set -# CONFIG_BOOT_ROM_LOG_ON_GPIO_HIGH is not set -# CONFIG_BOOT_ROM_LOG_ON_GPIO_LOW is not set -# end of Boot ROM Behavior # # Serial flasher config # # CONFIG_ESPTOOLPY_NO_STUB is not set -# CONFIG_ESPTOOLPY_OCT_FLASH is not set -CONFIG_ESPTOOLPY_FLASH_MODE_AUTO_DETECT=y CONFIG_ESPTOOLPY_FLASHMODE_QIO=y # CONFIG_ESPTOOLPY_FLASHMODE_QOUT is not set # CONFIG_ESPTOOLPY_FLASHMODE_DIO is not set # CONFIG_ESPTOOLPY_FLASHMODE_DOUT is not set CONFIG_ESPTOOLPY_FLASH_SAMPLE_MODE_STR=y CONFIG_ESPTOOLPY_FLASHMODE="dio" -# CONFIG_ESPTOOLPY_FLASHFREQ_120M is not set CONFIG_ESPTOOLPY_FLASHFREQ_80M=y # CONFIG_ESPTOOLPY_FLASHFREQ_40M is not set +# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set -CONFIG_ESPTOOLPY_FLASHFREQ_80M_DEFAULT=y CONFIG_ESPTOOLPY_FLASHFREQ="80m" # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set # CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set @@ -504,7 +377,6 @@ CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y CONFIG_APPTRACE_DEST_NONE=y # CONFIG_APPTRACE_DEST_UART1 is not set # CONFIG_APPTRACE_DEST_UART2 is not set -# CONFIG_APPTRACE_DEST_USB_CDC is not set CONFIG_APPTRACE_DEST_UART_NONE=y CONFIG_APPTRACE_UART_TASK_PRIO=1 CONFIG_APPTRACE_LOCK_ENABLE=y @@ -523,11 +395,15 @@ CONFIG_APPTRACE_LOCK_ENABLE=y # # Legacy ADC Configuration # +CONFIG_ADC_DISABLE_DAC=y # CONFIG_ADC_SUPPRESS_DEPRECATE_WARN is not set # # Legacy ADC Calibration Configuration # +CONFIG_ADC_CAL_EFUSE_TP_ENABLE=y +CONFIG_ADC_CAL_EFUSE_VREF_ENABLE=y +CONFIG_ADC_CAL_LUT_ENABLE=y # CONFIG_ADC_CALI_SUPPRESS_DEPRECATE_WARN is not set # end of Legacy ADC Calibration Configuration # end of Legacy ADC Configuration @@ -545,16 +421,13 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y # TWAI Configuration # # CONFIG_TWAI_ISR_IN_IRAM is not set +CONFIG_TWAI_ERRATA_FIX_BUS_OFF_REC=y +CONFIG_TWAI_ERRATA_FIX_TX_INTR_LOST=y +CONFIG_TWAI_ERRATA_FIX_RX_FRAME_INVALID=y +CONFIG_TWAI_ERRATA_FIX_RX_FIFO_CORRUPT=y 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 # @@ -564,6 +437,7 @@ CONFIG_TWAI_ERRATA_FIX_LISTEN_ONLY_DOM=y # # GPIO Configuration # +# CONFIG_GPIO_ESP32_SUPPORT_SWITCH_SLP_PULL is not set # CONFIG_GPIO_CTRL_FUNC_IN_IRAM is not set # end of GPIO Configuration @@ -620,9 +494,14 @@ CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y # end of I2S Configuration # -# USB Serial/JTAG Configuration +# DAC Configuration # -# end of USB Serial/JTAG Configuration +# CONFIG_DAC_CTRL_FUNC_IN_IRAM is not set +# CONFIG_DAC_ISR_IRAM_SAFE is not set +# CONFIG_DAC_SUPPRESS_DEPRECATE_WARN is not set +# CONFIG_DAC_ENABLE_DEBUG_LOG is not set +CONFIG_DAC_DMA_AUTO_16BIT_ALIGN=y +# end of DAC Configuration # end of Driver Configurations # @@ -630,14 +509,17 @@ CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y # # CONFIG_EFUSE_CUSTOM_TABLE is not set # CONFIG_EFUSE_VIRTUAL is not set -CONFIG_EFUSE_MAX_BLK_LEN=256 +# CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE is not set +CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y +# CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT is not set +CONFIG_EFUSE_MAX_BLK_LEN=192 # end of eFuse Bit Manager # # ESP-TLS # CONFIG_ESP_TLS_USING_MBEDTLS=y -CONFIG_ESP_TLS_USE_DS_PERIPHERAL=y +# CONFIG_ESP_TLS_USE_SECURE_ELEMENT is not set # CONFIG_ESP_TLS_CLIENT_SESSION_TICKETS is not set # CONFIG_ESP_TLS_SERVER is not set # CONFIG_ESP_TLS_PSK_VERIFICATION is not set @@ -649,13 +531,21 @@ CONFIG_ESP_TLS_USE_DS_PERIPHERAL=y # # CONFIG_ADC_ONESHOT_CTRL_FUNC_IN_IRAM is not set # CONFIG_ADC_CONTINUOUS_ISR_IRAM_SAFE is not set -# CONFIG_ADC_CONTINUOUS_FORCE_USE_ADC2_ON_C3_S3 is not set + +# +# ADC Calibration Configurations +# +CONFIG_ADC_CALI_EFUSE_TP_ENABLE=y +CONFIG_ADC_CALI_EFUSE_VREF_ENABLE=y +CONFIG_ADC_CALI_LUT_ENABLE=y +# end of ADC Calibration Configurations + +CONFIG_ADC_DISABLE_DAC_OUTPUT=y # end of ADC and ADC Calibration # # Wireless Coexistence # -# CONFIG_ESP_COEX_EXTERNAL_COEXIST_ENABLE is not set # end of Wireless Coexistence # @@ -668,7 +558,6 @@ CONFIG_ESP_ERR_TO_NAME_LOOKUP=y # Ethernet # CONFIG_ETH_ENABLED=y -<<<<<<< HEAD CONFIG_ETH_USE_ESP32_EMAC=y CONFIG_ETH_PHY_INTERFACE_RMII=y CONFIG_ETH_RMII_CLK_INPUT=y @@ -678,8 +567,6 @@ CONFIG_ETH_DMA_BUFFER_SIZE=512 CONFIG_ETH_DMA_RX_BUFFER_NUM=10 CONFIG_ETH_DMA_TX_BUFFER_NUM=10 # CONFIG_ETH_IRAM_OPTIMIZATION is not set -======= ->>>>>>> refs/remotes/gitlab/main2 CONFIG_ETH_USE_SPI_ETHERNET=y # CONFIG_ETH_SPI_ETHERNET_DM9051 is not set # CONFIG_ETH_SPI_ETHERNET_W5500 is not set @@ -741,17 +628,21 @@ CONFIG_HTTPD_PURGE_BUF_LEN=32 # # Chip revision # -CONFIG_ESP32S3_REV_MIN_0=y -# CONFIG_ESP32S3_REV_MIN_1 is not set -# CONFIG_ESP32S3_REV_MIN_2 is not set -CONFIG_ESP32S3_REV_MIN_FULL=0 +CONFIG_ESP32_REV_MIN_0=y +# CONFIG_ESP32_REV_MIN_1 is not set +# CONFIG_ESP32_REV_MIN_1_1 is not set +# CONFIG_ESP32_REV_MIN_2 is not set +# CONFIG_ESP32_REV_MIN_3 is not set +# CONFIG_ESP32_REV_MIN_3_1 is not set +CONFIG_ESP32_REV_MIN=0 +CONFIG_ESP32_REV_MIN_FULL=0 CONFIG_ESP_REV_MIN_FULL=0 # -# Maximum Supported ESP32-S3 Revision (Rev v0.99) +# Maximum Supported ESP32 Revision (Rev v3.99) # -CONFIG_ESP32S3_REV_MAX_FULL=99 -CONFIG_ESP_REV_MAX_FULL=99 +CONFIG_ESP32_REV_MAX_FULL=399 +CONFIG_ESP_REV_MAX_FULL=399 # end of Chip revision # @@ -762,9 +653,10 @@ CONFIG_ESP_MAC_ADDR_UNIVERSE_WIFI_AP=y CONFIG_ESP_MAC_ADDR_UNIVERSE_BT=y CONFIG_ESP_MAC_ADDR_UNIVERSE_ETH=y CONFIG_ESP_MAC_UNIVERSAL_MAC_ADDRESSES_FOUR=y -# CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_TWO is not set -CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES_FOUR=y -CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=4 +# CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_TWO is not set +CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES_FOUR=y +CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4 +# CONFIG_ESP_MAC_IGNORE_MAC_CRC_ERROR is not set # end of MAC Config # @@ -772,9 +664,9 @@ CONFIG_ESP32S3_UNIVERSAL_MAC_ADDRESSES=4 # # CONFIG_ESP_SLEEP_POWER_DOWN_FLASH is not set CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y -CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU=y +# CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU is not set CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y -CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y +# CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000 CONFIG_ESP_SLEEP_GPIO_ENABLE_INTERNAL_RESISTORS=y # end of Sleep Config @@ -795,17 +687,12 @@ CONFIG_RTC_CLK_CAL_CYCLES=1024 CONFIG_PERIPH_CTRL_FUNC_IN_IRAM=y # end of Peripheral Control -# -# GDMA Configuration -# -# CONFIG_GDMA_CTRL_FUNC_IN_IRAM is not set -# CONFIG_GDMA_ISR_IRAM_SAFE is not set -# end of GDMA Configuration - # # Main XTAL Config # +# CONFIG_XTAL_FREQ_26 is not set CONFIG_XTAL_FREQ_40=y +# CONFIG_XTAL_FREQ_AUTO is not set CONFIG_XTAL_FREQ=40 # end of Main XTAL Config # end of Hardware Settings @@ -823,8 +710,6 @@ CONFIG_XTAL_FREQ=40 # CONFIG_LCD_PANEL_IO_FORMAT_BUF_SIZE=32 # CONFIG_LCD_ENABLE_DEBUG_LOG is not set -# CONFIG_LCD_RGB_ISR_IRAM_SAFE is not set -# CONFIG_LCD_RGB_RESTART_IN_VSYNC is not set # end of LCD Peripheral Configuration # end of LCD and Touch Panel @@ -853,8 +738,6 @@ CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20 CONFIG_ESP_PHY_MAX_TX_POWER=20 # CONFIG_ESP_PHY_REDUCE_TX_POWER is not set -CONFIG_ESP_PHY_ENABLE_USB=y -# CONFIG_ESP_PHY_ENABLE_CERT_TEST is not set CONFIG_ESP_PHY_RF_CAL_PARTIAL=y # CONFIG_ESP_PHY_RF_CAL_NONE is not set # CONFIG_ESP_PHY_RF_CAL_FULL is not set @@ -865,8 +748,6 @@ CONFIG_ESP_PHY_CALIBRATION_MODE=0 # Power Management # # CONFIG_PM_ENABLE is not set -CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y -CONFIG_PM_POWER_DOWN_TAGMEM_IN_LIGHT_SLEEP=y # end of Power Management # @@ -889,43 +770,23 @@ CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_160=y # CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240 is not set CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ=160 -# -# Cache config -# -CONFIG_ESP32S3_INSTRUCTION_CACHE_16KB=y -# CONFIG_ESP32S3_INSTRUCTION_CACHE_32KB is not set -CONFIG_ESP32S3_INSTRUCTION_CACHE_SIZE=0x4000 -# CONFIG_ESP32S3_INSTRUCTION_CACHE_4WAYS is not set -CONFIG_ESP32S3_INSTRUCTION_CACHE_8WAYS=y -CONFIG_ESP32S3_ICACHE_ASSOCIATED_WAYS=8 -# CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_16B is not set -CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_32B=y -CONFIG_ESP32S3_INSTRUCTION_CACHE_LINE_SIZE=32 -# CONFIG_ESP32S3_DATA_CACHE_16KB is not set -CONFIG_ESP32S3_DATA_CACHE_32KB=y -# CONFIG_ESP32S3_DATA_CACHE_64KB is not set -CONFIG_ESP32S3_DATA_CACHE_SIZE=0x8000 -# CONFIG_ESP32S3_DATA_CACHE_4WAYS is not set -CONFIG_ESP32S3_DATA_CACHE_8WAYS=y -CONFIG_ESP32S3_DCACHE_ASSOCIATED_WAYS=8 -# CONFIG_ESP32S3_DATA_CACHE_LINE_16B is not set -CONFIG_ESP32S3_DATA_CACHE_LINE_32B=y -# CONFIG_ESP32S3_DATA_CACHE_LINE_64B is not set -CONFIG_ESP32S3_DATA_CACHE_LINE_SIZE=32 -# end of Cache config - # # Memory # -# CONFIG_ESP32S3_RTCDATA_IN_FAST_MEM is not set -# CONFIG_ESP32S3_USE_FIXED_STATIC_RAM_SIZE is not set +# CONFIG_ESP32_USE_FIXED_STATIC_RAM_SIZE is not set + +# +# Non-backward compatible options +# +# CONFIG_ESP_SYSTEM_ESP32_SRAM1_REGION_AS_IRAM is not set +# end of Non-backward compatible options # end of Memory # # Trace memory # -# CONFIG_ESP32S3_TRAX is not set -CONFIG_ESP32S3_TRACEMEM_RESERVE_DRAM=0x0 +# CONFIG_ESP32_TRAX is not set +CONFIG_ESP32_TRACEMEM_RESERVE_DRAM=0x0 # end of Trace memory # CONFIG_ESP_SYSTEM_PANIC_PRINT_HALT is not set @@ -934,14 +795,10 @@ CONFIG_ESP_SYSTEM_PANIC_PRINT_REBOOT=y # CONFIG_ESP_SYSTEM_PANIC_GDBSTUB is not set # CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set CONFIG_ESP_SYSTEM_PANIC_REBOOT_DELAY_SECONDS=0 -CONFIG_ESP_SYSTEM_RTC_FAST_MEM_AS_HEAP_DEPCHECK=y -CONFIG_ESP_SYSTEM_ALLOW_RTC_FAST_MEM_AS_HEAP=y # # Memory protection # -CONFIG_ESP_SYSTEM_MEMPROT_FEATURE=y -CONFIG_ESP_SYSTEM_MEMPROT_FEATURE_LOCK=y # end of Memory protection CONFIG_ESP_SYSTEM_EVENT_QUEUE_SIZE=32 @@ -953,13 +810,8 @@ CONFIG_ESP_MAIN_TASK_AFFINITY_CPU0=y CONFIG_ESP_MAIN_TASK_AFFINITY=0x0 CONFIG_ESP_MINIMAL_SHARED_STACK_SIZE=2048 CONFIG_ESP_CONSOLE_UART_DEFAULT=y -# CONFIG_ESP_CONSOLE_USB_CDC is not set -# CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG is not set # CONFIG_ESP_CONSOLE_UART_CUSTOM is not set # CONFIG_ESP_CONSOLE_NONE is not set -# CONFIG_ESP_CONSOLE_SECONDARY_NONE is not set -CONFIG_ESP_CONSOLE_SECONDARY_USB_SERIAL_JTAG=y -CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG_ENABLED=y CONFIG_ESP_CONSOLE_UART=y CONFIG_ESP_CONSOLE_MULTIPLE_UART=y CONFIG_ESP_CONSOLE_UART_NUM=0 @@ -976,29 +828,32 @@ CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1=y # 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_5 is not set 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_0=y # CONFIG_ESP_BROWNOUT_DET_LVL_SEL_1 is not set -CONFIG_ESP_BROWNOUT_DET_LVL=7 +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_2 is not set +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_ESP_BROWNOUT_DET_LVL_SEL_7 is not set +CONFIG_ESP_BROWNOUT_DET_LVL=0 # end of Brownout Detector +# CONFIG_ESP32_DISABLE_BASIC_ROM_CONSOLE is not set CONFIG_ESP_SYSTEM_BROWNOUT_INTR=y # end of ESP System Settings # # IPC (Inter-Processor Call) # -CONFIG_ESP_IPC_TASK_STACK_SIZE=1280 +CONFIG_ESP_IPC_TASK_STACK_SIZE=1024 CONFIG_ESP_IPC_USES_CALLERS_PRIORITY=y CONFIG_ESP_IPC_ISR_ENABLE=y # end of IPC (Inter-Processor Call) @@ -1017,7 +872,7 @@ CONFIG_ESP_TIMER_TASK_AFFINITY_CPU0=y CONFIG_ESP_TIMER_ISR_AFFINITY=0x1 CONFIG_ESP_TIMER_ISR_AFFINITY_CPU0=y # CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD is not set -CONFIG_ESP_TIMER_IMPL_SYSTIMER=y +CONFIG_ESP_TIMER_IMPL_TG0_LAC=y # end of High resolution timer (esp_timer) # @@ -1052,13 +907,12 @@ CONFIG_ESP_WIFI_ENABLE_SAE_PK=y CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT=y CONFIG_ESP_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=y -# CONFIG_ESP_WIFI_GCMP_SUPPORT 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 +# CONFIG_ESP_WIFI_NAN_ENABLE is not set CONFIG_ESP_WIFI_MBEDTLS_CRYPTO=y CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y # CONFIG_ESP_WIFI_WAPI_PSK is not set @@ -1165,10 +1019,11 @@ CONFIG_FREERTOS_TLSP_DELETION_CALLBACKS=y CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y CONFIG_FREERTOS_ISR_STACKSIZE=1536 CONFIG_FREERTOS_INTERRUPT_BACKTRACE=y -CONFIG_FREERTOS_TICK_SUPPORT_SYSTIMER=y -CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL1=y -# CONFIG_FREERTOS_CORETIMER_SYSTIMER_LVL3 is not set -CONFIG_FREERTOS_SYSTICK_USES_SYSTIMER=y +# CONFIG_FREERTOS_FPU_IN_ISR is not set +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 is not set # CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH is not set # CONFIG_FREERTOS_CHECK_PORT_CRITICAL_COMPLIANCE is not set @@ -1188,7 +1043,6 @@ CONFIG_HAL_ASSERTION_EQUALS_SYSTEM=y # CONFIG_HAL_ASSERTION_SILENT is not set # CONFIG_HAL_ASSERTION_ENABLE is not set CONFIG_HAL_DEFAULT_ASSERTION_LEVEL=2 -CONFIG_HAL_WDT_USE_ROM_IMPL=y CONFIG_HAL_SPI_MASTER_FUNC_IN_IRAM=y CONFIG_HAL_SPI_SLAVE_FUNC_IN_IRAM=y # end of Hardware Abstraction Layer (HAL) and Low Level (LL) @@ -1424,9 +1278,7 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200 # CONFIG_MBEDTLS_ECP_RESTARTABLE is not set CONFIG_MBEDTLS_CMAC_C=y CONFIG_MBEDTLS_HARDWARE_AES=y -CONFIG_MBEDTLS_AES_USE_INTERRUPT=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 @@ -1607,10 +1459,10 @@ CONFIG_MMU_PAGE_SIZE=0x10000 # CONFIG_SPI_FLASH_VERIFY_WRITE is not set # CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set CONFIG_SPI_FLASH_ROM_DRIVER_PATCH=y -# CONFIG_SPI_FLASH_ROM_IMPL is not set 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_SHARE_SPI1_BUS 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 @@ -1635,15 +1487,12 @@ CONFIG_SPI_FLASH_VENDOR_GD_SUPPORTED=y CONFIG_SPI_FLASH_VENDOR_ISSI_SUPPORTED=y CONFIG_SPI_FLASH_VENDOR_MXIC_SUPPORTED=y CONFIG_SPI_FLASH_VENDOR_WINBOND_SUPPORTED=y -CONFIG_SPI_FLASH_VENDOR_BOYA_SUPPORTED=y -CONFIG_SPI_FLASH_VENDOR_TH_SUPPORTED=y CONFIG_SPI_FLASH_SUPPORT_ISSI_CHIP=y CONFIG_SPI_FLASH_SUPPORT_MXIC_CHIP=y CONFIG_SPI_FLASH_SUPPORT_GD_CHIP=y CONFIG_SPI_FLASH_SUPPORT_WINBOND_CHIP=y -CONFIG_SPI_FLASH_SUPPORT_BOYA_CHIP=y -CONFIG_SPI_FLASH_SUPPORT_TH_CHIP=y -CONFIG_SPI_FLASH_SUPPORT_MXIC_OPI_CHIP=y +# CONFIG_SPI_FLASH_SUPPORT_BOYA_CHIP is not set +# CONFIG_SPI_FLASH_SUPPORT_TH_CHIP is not set # end of Auto-detect flash chips CONFIG_SPI_FLASH_ENABLE_ENCRYPTED_READ_WRITE=y @@ -1716,24 +1565,10 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y # CONFIG_UNITY_ENABLE_BACKTRACE_ON_FAIL is not set # end of Unity unit testing library -# -# USB-OTG -# -CONFIG_USB_OTG_SUPPORTED=y -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 # # Virtual file system @@ -1774,14 +1609,14 @@ CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y # WebGUIApp # CONFIG_GPIO_RANGE_MIN=0 -CONFIG_GPIO_RANGE_MAX=48 +CONFIG_GPIO_RANGE_MAX=39 CONFIG_BOARD_HARDWARE_REVISION=1 CONFIG_BOARD_HARDWARE_OPTION="Base version" CONFIG_DEVICE_MODEL_NAME="DEVICE MODEL NAME" CONFIG_WEBGUIAPP_HOSTNAME="DEVICE_HOSTNAME" CONFIG_WEBGUIAPP_USERNAME="user" CONFIG_WEBGUIAPP_USERPASS="password" -CONFIG_MAIN_FUNCTIONAL_BUTTON_GPIO=-1 +CONFIG_MAIN_FUNCTIONAL_BUTTON_GPIO=15 CONFIG_DEBUG_MODE_ENABLE=y # CONFIG_RESET_MODE_ENABLE is not set @@ -1832,9 +1667,9 @@ CONFIG_WEBGUIAPP_CRON_NUMBER=16 # CONFIG_WEBGUIAPP_SPI_ENABLE=y CONFIG_SPI_HOST=1 -CONFIG_SPI_SCLK_GPIO=36 -CONFIG_SPI_MOSI_GPIO=35 -CONFIG_SPI_MISO_GPIO=37 +CONFIG_SPI_SCLK_GPIO=18 +CONFIG_SPI_MOSI_GPIO=23 +CONFIG_SPI_MISO_GPIO=19 # end of SPI settings # @@ -1842,8 +1677,8 @@ CONFIG_SPI_MISO_GPIO=37 # CONFIG_WEBGUIAPP_I2C_ENABLE=y CONFIG_I2C_HOST=0 -CONFIG_I2C_SCL_GPIO=15 -CONFIG_I2C_SDA_GPIO=16 +CONFIG_I2C_SCL_GPIO=22 +CONFIG_I2C_SDA_GPIO=21 CONFIG_I2C_CLOCK=400000 # end of I2C settings @@ -1972,6 +1807,9 @@ CONFIG_TTN_PROVISION_UART_NUM=0 # Deprecated options for backward compatibility # CONFIG_APP_BUILD_TYPE_ELF_RAM is not set # CONFIG_NO_BLOBS is not set +# CONFIG_ESP32_NO_BLOBS is not set +# CONFIG_ESP32_COMPATIBLE_PRE_V2_1_BOOTLOADERS is not set +# CONFIG_ESP32_COMPATIBLE_PRE_V3_1_BOOTLOADERS is not set # CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set # CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set # CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set @@ -2003,32 +1841,47 @@ CONFIG_STACK_CHECK_NONE=y # CONFIG_ESP32_APPTRACE_DEST_TRAX is not set CONFIG_ESP32_APPTRACE_DEST_NONE=y CONFIG_ESP32_APPTRACE_LOCK_ENABLE=y +CONFIG_ADC2_DISABLE_DAC=y # CONFIG_MCPWM_ISR_IN_IRAM is not set -# CONFIG_EXTERNAL_COEX_ENABLE is not set -# CONFIG_ESP_WIFI_EXTERNAL_COEXIST_ENABLE is not set # 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_TWO_UNIVERSAL_MAC_ADDRESS is not set +CONFIG_FOUR_UNIVERSAL_MAC_ADDRESS=y +CONFIG_NUMBER_OF_UNIVERSAL_MAC_ADDRESS=4 # CONFIG_ESP_SYSTEM_PD_FLASH is not set -CONFIG_ESP32S3_DEEP_SLEEP_WAKEUP_DELAY=2000 -CONFIG_ESP32S3_RTC_CLK_SRC_INT_RC=y -# CONFIG_ESP32S3_RTC_CLK_SRC_EXT_CRYS is not set -# CONFIG_ESP32S3_RTC_CLK_SRC_EXT_OSC is not set -# CONFIG_ESP32S3_RTC_CLK_SRC_INT_8MD256 is not set -CONFIG_ESP32S3_RTC_CLK_CAL_CYCLES=1024 +CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000 +CONFIG_ESP32_RTC_CLK_SRC_INT_RC=y +CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y +# CONFIG_ESP32_RTC_CLK_SRC_EXT_CRYS is not set +# CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL is not set +# CONFIG_ESP32_RTC_CLK_SRC_EXT_OSC is not set +# CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_OSC is not set +# CONFIG_ESP32_RTC_CLK_SRC_INT_8MD256 is not set +# CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_8MD256 is not set +CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024 +# CONFIG_ESP32_XTAL_FREQ_26 is not set +CONFIG_ESP32_XTAL_FREQ_40=y +# CONFIG_ESP32_XTAL_FREQ_AUTO is not set +CONFIG_ESP32_XTAL_FREQ=40 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 is not set # CONFIG_ESP32_REDUCE_PHY_TX_POWER is not set -CONFIG_ESP_SYSTEM_PM_POWER_DOWN_CPU=y -# CONFIG_ESP32S3_SPIRAM_SUPPORT is not set -# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_80 is not set -CONFIG_ESP32S3_DEFAULT_CPU_FREQ_160=y -# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240 is not set -CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ=160 +# CONFIG_SPIRAM_SUPPORT is not set +# CONFIG_ESP32_SPIRAM_SUPPORT is not set +# CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set +CONFIG_ESP32_DEFAULT_CPU_FREQ_160=y +# CONFIG_ESP32_DEFAULT_CPU_FREQ_240 is not set +CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=160 +CONFIG_TRACEMEM_RESERVE_DRAM=0x0 +# CONFIG_ESP32_PANIC_PRINT_HALT is not set +CONFIG_ESP32_PANIC_PRINT_REBOOT=y +# CONFIG_ESP32_PANIC_SILENT_REBOOT is not set +# CONFIG_ESP32_PANIC_GDBSTUB is not set CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32 CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=2304 CONFIG_MAIN_TASK_STACK_SIZE=3584 @@ -2049,27 +1902,29 @@ CONFIG_TASK_WDT_TIMEOUT_S=5 CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=y CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU1=y # CONFIG_ESP32_DEBUG_STUBS_ENABLE is not set -CONFIG_ESP32S3_DEBUG_OCDAWARE=y +CONFIG_ESP32_DEBUG_OCDAWARE=y CONFIG_BROWNOUT_DET=y -CONFIG_ESP32S3_BROWNOUT_DET=y -CONFIG_ESP32S3_BROWNOUT_DET=y -CONFIG_BROWNOUT_DET_LVL_SEL_7=y -CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_7=y -# CONFIG_BROWNOUT_DET_LVL_SEL_6 is not set -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_6 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_5 is not set -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_5 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_4 is not set -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_4 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_3 is not set -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_3 is not set -# CONFIG_BROWNOUT_DET_LVL_SEL_2 is not set -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_2 is not set +CONFIG_ESP32_BROWNOUT_DET=y +CONFIG_BROWNOUT_DET_LVL_SEL_0=y +CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_0=y # CONFIG_BROWNOUT_DET_LVL_SEL_1 is not set -# CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_1 is not set -CONFIG_BROWNOUT_DET_LVL=7 -CONFIG_ESP32S3_BROWNOUT_DET_LVL=7 -CONFIG_IPC_TASK_STACK_SIZE=1280 +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_1 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_2 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_2 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_3 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_4 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_5 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_6 is not set +# CONFIG_BROWNOUT_DET_LVL_SEL_7 is not set +# CONFIG_ESP32_BROWNOUT_DET_LVL_SEL_7 is not set +CONFIG_BROWNOUT_DET_LVL=0 +CONFIG_ESP32_BROWNOUT_DET_LVL=0 +# CONFIG_DISABLE_BASIC_ROM_CONSOLE is not set +CONFIG_IPC_TASK_STACK_SIZE=1024 CONFIG_TIMER_TASK_STACK_SIZE=3584 CONFIG_ESP32_WIFI_ENABLED=y CONFIG_ESP32_WIFI_STATIC_RX_BUFFER_NUM=10 @@ -2135,12 +1990,12 @@ CONFIG_TCPIP_TASK_AFFINITY_NO_AFFINITY=y # CONFIG_TCPIP_TASK_AFFINITY_CPU1 is not set CONFIG_TCPIP_TASK_AFFINITY=0x7FFFFFFF # CONFIG_PPP_SUPPORT is not set -CONFIG_ESP32S3_TIME_SYSCALL_USE_RTC_SYSTIMER=y -CONFIG_ESP32S3_TIME_SYSCALL_USE_RTC_FRC1=y -# CONFIG_ESP32S3_TIME_SYSCALL_USE_RTC is not set -# CONFIG_ESP32S3_TIME_SYSCALL_USE_SYSTIMER is not set -# CONFIG_ESP32S3_TIME_SYSCALL_USE_FRC1 is not set -# CONFIG_ESP32S3_TIME_SYSCALL_USE_NONE is not set +CONFIG_ESP32_TIME_SYSCALL_USE_RTC_HRT=y +CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y +# CONFIG_ESP32_TIME_SYSCALL_USE_RTC is not set +# CONFIG_ESP32_TIME_SYSCALL_USE_HRT is not set +# CONFIG_ESP32_TIME_SYSCALL_USE_FRC1 is not set +# CONFIG_ESP32_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 @@ -2152,6 +2007,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_ESP32_ULP_COPROC_ENABLED is not set CONFIG_SUPPRESS_SELECT_DEBUG_OUTPUT=y CONFIG_SUPPORT_TERMIOS=y CONFIG_SEMIHOSTFS_MAX_MOUNT_POINTS=1