add sdkconfig to gitignore

sdkconfig.old

@@ -1,6 +1,10 @@
 #
 # Automatically generated file. DO NOT EDIT.
+<<<<<<< HEAD
 # Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Configuration
+=======
+# Espressif IoT Development Framework (ESP-IDF) 5.3.0 Project Configuration
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 #
 CONFIG_SOC_BROWNOUT_RESET_SUPPORTED="Not determined"
 CONFIG_SOC_TWAI_BRP_DIV_SUPPORTED="Not determined"
@@ -44,6 +48,7 @@ CONFIG_SOC_CLK_TREE_SUPPORTED=y
 CONFIG_SOC_MPU_SUPPORTED=y
 CONFIG_SOC_WDT_SUPPORTED=y
 CONFIG_SOC_SPI_FLASH_SUPPORTED=y
+<<<<<<< HEAD
 CONFIG_SOC_RNG_SUPPORTED=y
 CONFIG_SOC_LIGHT_SLEEP_SUPPORTED=y
 CONFIG_SOC_DEEP_SLEEP_SUPPORTED=y
@@ -51,6 +56,14 @@ CONFIG_SOC_LP_PERIPH_SHARE_INTERRUPT=y
 CONFIG_SOC_PM_SUPPORTED=y
 CONFIG_SOC_DPORT_WORKAROUND_DIS_INTERRUPT_LVL=5
 CONFIG_SOC_XTAL_SUPPORT_26M=y
+=======
+<<<<<<< Updated upstream
+=======
+CONFIG_SOC_RNG_SUPPORTED=y
+CONFIG_SOC_DPORT_WORKAROUND_DIS_INTERRUPT_LVL=5
+CONFIG_SOC_XTAL_SUPPORT_26M=y
+>>>>>>> Stashed changes
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 CONFIG_SOC_XTAL_SUPPORT_40M=y
 CONFIG_SOC_XTAL_SUPPORT_AUTO_DETECT=y
 CONFIG_SOC_ADC_RTC_CTRL_SUPPORTED=y
@@ -169,12 +182,31 @@ CONFIG_SOC_MEMSPI_SRC_FREQ_26M_SUPPORTED=y
 CONFIG_SOC_MEMSPI_SRC_FREQ_20M_SUPPORTED=y
 CONFIG_SOC_TIMER_GROUPS=2
 CONFIG_SOC_TIMER_GROUP_TIMERS_PER_GROUP=2
+<<<<<<< HEAD
 CONFIG_SOC_TIMER_GROUP_COUNTER_BIT_WIDTH=64
 CONFIG_SOC_TIMER_GROUP_TOTAL_TIMERS=4
 CONFIG_SOC_TIMER_GROUP_SUPPORT_APB=y
 CONFIG_SOC_TOUCH_SENSOR_VERSION=1
 CONFIG_SOC_TOUCH_SENSOR_NUM=10
 CONFIG_SOC_TOUCH_SAMPLE_CFG_NUM=1
+=======
+CONFIG_SOC_TIMER_GROUP_COUNTER_BIT_WIDTH=54
+CONFIG_SOC_TIMER_GROUP_SUPPORT_XTAL=y
+CONFIG_SOC_TIMER_GROUP_SUPPORT_APB=y
+<<<<<<< Updated upstream
+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_TOUCH_PAD_MEASURE_WAIT_MAX=0xFF
+=======
+CONFIG_SOC_TOUCH_SENSOR_VERSION=1
+CONFIG_SOC_TOUCH_SENSOR_NUM=10
+CONFIG_SOC_TOUCH_SAMPLER_NUM=1
+>>>>>>> Stashed changes
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 CONFIG_SOC_TWAI_CONTROLLER_NUM=1
 CONFIG_SOC_TWAI_BRP_MIN=2
 CONFIG_SOC_TWAI_CLK_SUPPORT_APB=y
@@ -238,10 +270,24 @@ CONFIG_IDF_CMAKE=y
 CONFIG_IDF_TOOLCHAIN="gcc"
 CONFIG_IDF_TARGET_ARCH_XTENSA=y
 CONFIG_IDF_TARGET_ARCH="xtensa"
+<<<<<<< HEAD
 CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_INIT_VERSION="5.3.1"
 CONFIG_IDF_TARGET_ESP32=y
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
+=======
+<<<<<<< Updated upstream
+CONFIG_IDF_TARGET="esp32s3"
+CONFIG_IDF_INIT_VERSION="5.2.3"
+CONFIG_IDF_TARGET_ESP32S3=y
+CONFIG_IDF_FIRMWARE_CHIP_ID=0x0009
+=======
+CONFIG_IDF_TARGET="esp32"
+CONFIG_IDF_INIT_VERSION="$IDF_INIT_VERSION"
+CONFIG_IDF_TARGET_ESP32=y
+CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
+>>>>>>> Stashed changes
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 
 #
 # Build type
@@ -333,9 +379,24 @@ CONFIG_ESP_ROM_HAS_NEWLIB=y
 CONFIG_ESP_ROM_HAS_NEWLIB_NANO_FORMAT=y
 CONFIG_ESP_ROM_HAS_NEWLIB_32BIT_TIME=y
 CONFIG_ESP_ROM_HAS_SW_FLOAT=y
+<<<<<<< HEAD
 CONFIG_ESP_ROM_USB_OTG_NUM=-1
 CONFIG_ESP_ROM_USB_SERIAL_DEVICE_NUM=-1
 CONFIG_ESP_ROM_SUPPORT_DEEP_SLEEP_WAKEUP_STUB=y
+=======
+<<<<<<< Updated upstream
+
+#
+# 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
+=======
+>>>>>>> Stashed changes
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 
 #
 # Serial flasher config
@@ -395,7 +456,7 @@ CONFIG_ENV_GPIO_OUT_RANGE_MAX=33
 #
 # ADC 1 configurations
 #
-CONFIG_U_SENSE_ADC=5
+CONFIG_U_SENSE_ADC=9
 CONFIG_I_SENSE_ADC=7
 CONFIG_I_SENSE_U_V_W_ADC="6, 3, 0"
 CONFIG_TORQUE_ADC=4
@@ -479,8 +540,6 @@ CONFIG_COMPILER_STACK_CHECK_MODE_NONE=y
 # CONFIG_COMPILER_DUMP_RTL_FILES is not set
 CONFIG_COMPILER_RT_LIB_GCCLIB=y
 CONFIG_COMPILER_RT_LIB_NAME="gcc"
-# CONFIG_COMPILER_ORPHAN_SECTIONS_WARNING is not set
-CONFIG_COMPILER_ORPHAN_SECTIONS_PLACE=y
 # end of Compiler options
 
 #
@@ -503,7 +562,6 @@ CONFIG_APPTRACE_LOCK_ENABLE=y
 # Bluetooth
 #
 # CONFIG_BT_ENABLED is not set
-CONFIG_BT_ALARM_MAX_NUM=50
 # end of Bluetooth
 
 #
@@ -517,6 +575,21 @@ CONFIG_BT_ALARM_MAX_NUM=50
 #
 
 #
+<<<<<<< HEAD
+=======
+# Legacy ADC Configuration
+#
+# CONFIG_ADC_SUPPRESS_DEPRECATE_WARN is not set
+
+#
+# Legacy ADC Calibration Configuration
+#
+# CONFIG_ADC_CALI_SUPPRESS_DEPRECATE_WARN is not set
+# end of Legacy ADC Calibration Configuration
+# end of Legacy ADC Configuration
+
+#
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 # TWAI Configuration
 #
 # CONFIG_TWAI_ISR_IN_IRAM is not set
@@ -544,7 +617,12 @@ CONFIG_ADC_CAL_LUT_ENABLE=y
 # end of Legacy ADC Driver Configuration
 
 #
+<<<<<<< HEAD
 # Legacy DAC Driver Configurations
+=======
+<<<<<<< Updated upstream
+# GPIO Configuration
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 #
 # CONFIG_DAC_SUPPRESS_DEPRECATE_WARN is not set
 # end of Legacy DAC Driver Configurations
@@ -580,7 +658,13 @@ CONFIG_ADC_CAL_LUT_ENABLE=y
 # end of Legacy PCNT Driver Configurations
 
 #
+<<<<<<< HEAD
 # Legacy SDM Driver Configurations
+=======
+=======
+>>>>>>> Stashed changes
+# LEDC Configuration
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 #
 # CONFIG_SDM_SUPPRESS_DEPRECATE_WARN is not set
 # end of Legacy SDM Driver Configurations
@@ -615,6 +699,12 @@ CONFIG_ESP_TLS_USING_MBEDTLS=y
 #
 # CONFIG_ADC_ONESHOT_CTRL_FUNC_IN_IRAM is not set
 # CONFIG_ADC_CONTINUOUS_ISR_IRAM_SAFE is not set
+<<<<<<< HEAD
+=======
+<<<<<<< Updated upstream
+# CONFIG_ADC_CONTINUOUS_FORCE_USE_ADC2_ON_C3_S3 is not set
+=======
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 
 #
 # ADC Calibration Configurations
@@ -626,6 +716,10 @@ CONFIG_ADC_CALI_LUT_ENABLE=y
 
 CONFIG_ADC_DISABLE_DAC_OUTPUT=y
 # CONFIG_ADC_ENABLE_DEBUG_LOG is not set
+<<<<<<< HEAD
+=======
+>>>>>>> Stashed changes
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 # end of ADC and ADC Calibration
 
 #
@@ -645,6 +739,10 @@ CONFIG_ESP_ERR_TO_NAME_LOOKUP=y
 #
 # CONFIG_DAC_CTRL_FUNC_IN_IRAM is not set
 # CONFIG_DAC_ISR_IRAM_SAFE is not set
+<<<<<<< HEAD
+=======
+# CONFIG_DAC_SUPPRESS_DEPRECATE_WARN is not set
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 # CONFIG_DAC_ENABLE_DEBUG_LOG is not set
 CONFIG_DAC_DMA_AUTO_16BIT_ALIGN=y
 # end of ESP-Driver:DAC Configurations
@@ -662,10 +760,15 @@ CONFIG_DAC_DMA_AUTO_16BIT_ALIGN=y
 CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y
 # CONFIG_GPTIMER_CTRL_FUNC_IN_IRAM is not set
 # CONFIG_GPTIMER_ISR_IRAM_SAFE is not set
+<<<<<<< HEAD
+=======
+# CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 # CONFIG_GPTIMER_ENABLE_DEBUG_LOG is not set
 # end of ESP-Driver:GPTimer Configurations
 
 #
+<<<<<<< HEAD
 # ESP-Driver:I2C Configurations
 #
 # CONFIG_I2C_ISR_IRAM_SAFE is not set
@@ -676,20 +779,33 @@ CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y
 # ESP-Driver:I2S Configurations
 #
 # CONFIG_I2S_ISR_IRAM_SAFE is not set
+=======
+# ESP-Driver:I2S Configurations
+#
+# CONFIG_I2S_ISR_IRAM_SAFE is not set
+# CONFIG_I2S_SUPPRESS_DEPRECATE_WARN is not set
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 # CONFIG_I2S_ENABLE_DEBUG_LOG is not set
 # end of ESP-Driver:I2S Configurations
 
 #
+<<<<<<< HEAD
 # ESP-Driver:LEDC Configurations
 #
 # CONFIG_LEDC_CTRL_FUNC_IN_IRAM is not set
 # end of ESP-Driver:LEDC Configurations
 
 #
+=======
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 # ESP-Driver:MCPWM Configurations
 #
 # CONFIG_MCPWM_ISR_IRAM_SAFE is not set
 # CONFIG_MCPWM_CTRL_FUNC_IN_IRAM is not set
+<<<<<<< HEAD
+=======
+# CONFIG_MCPWM_SUPPRESS_DEPRECATE_WARN is not set
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 # CONFIG_MCPWM_ENABLE_DEBUG_LOG is not set
 # end of ESP-Driver:MCPWM Configurations
 
@@ -698,6 +814,10 @@ CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y
 #
 # CONFIG_PCNT_CTRL_FUNC_IN_IRAM is not set
 # CONFIG_PCNT_ISR_IRAM_SAFE is not set
+<<<<<<< HEAD
+=======
+# CONFIG_PCNT_SUPPRESS_DEPRECATE_WARN is not set
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 # CONFIG_PCNT_ENABLE_DEBUG_LOG is not set
 # end of ESP-Driver:PCNT Configurations
 
@@ -706,6 +826,10 @@ CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y
 #
 # CONFIG_RMT_ISR_IRAM_SAFE is not set
 # CONFIG_RMT_RECV_FUNC_IN_IRAM is not set
+<<<<<<< HEAD
+=======
+# CONFIG_RMT_SUPPRESS_DEPRECATE_WARN is not set
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 # CONFIG_RMT_ENABLE_DEBUG_LOG is not set
 # end of ESP-Driver:RMT Configurations
 
@@ -713,6 +837,10 @@ CONFIG_GPTIMER_ISR_HANDLER_IN_IRAM=y
 # ESP-Driver:Sigma Delta Modulator Configurations
 #
 # CONFIG_SDM_CTRL_FUNC_IN_IRAM is not set
+<<<<<<< HEAD
+=======
+# CONFIG_SDM_SUPPRESS_DEPRECATE_WARN is not set
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 # CONFIG_SDM_ENABLE_DEBUG_LOG is not set
 # end of ESP-Driver:Sigma Delta Modulator Configurations
 
@@ -726,6 +854,7 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # end of ESP-Driver:SPI Configurations
 
 #
+<<<<<<< HEAD
 # ESP-Driver:Touch Sensor Configurations
 #
 # CONFIG_TOUCH_CTRL_FUNC_IN_IRAM is not set
@@ -740,6 +869,8 @@ CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 # end of ESP-Driver:UART Configurations
 
 #
+=======
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 # Ethernet
 #
 CONFIG_ETH_ENABLED=y
@@ -771,10 +902,7 @@ CONFIG_ESP_EVENT_POST_FROM_IRAM_ISR=y
 #
 # GDB Stub
 #
-CONFIG_ESP_GDBSTUB_ENABLED=y
 # CONFIG_ESP_SYSTEM_GDBSTUB_RUNTIME is not set
-CONFIG_ESP_GDBSTUB_SUPPORT_TASKS=y
-CONFIG_ESP_GDBSTUB_MAX_TASKS=32
 # end of GDB Stub
 
 #
@@ -829,10 +957,28 @@ CONFIG_ESP32_REV_MIN_FULL=0
 CONFIG_ESP_REV_MIN_FULL=0
 
 #
+<<<<<<< HEAD
 # Maximum Supported ESP32 Revision (Rev v3.99)
 #
 CONFIG_ESP32_REV_MAX_FULL=399
 CONFIG_ESP_REV_MAX_FULL=399
+=======
+# Maximum Supported ESP32-S3 Revision (Rev v0.99)
+#
+<<<<<<< Updated upstream
+CONFIG_ESP32S3_REV_MAX_FULL=99
+CONFIG_ESP_REV_MAX_FULL=99
+CONFIG_ESP_EFUSE_BLOCK_REV_MIN_FULL=0
+CONFIG_ESP_EFUSE_BLOCK_REV_MAX_FULL=199
+
+#
+# Maximum Supported ESP32-S3 eFuse Block Revision (eFuse Block Rev v1.99)
+#
+=======
+CONFIG_ESP32_REV_MAX_FULL=399
+CONFIG_ESP_REV_MAX_FULL=399
+>>>>>>> Stashed changes
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 # end of Chip revision
 
 #
@@ -858,8 +1004,17 @@ CONFIG_ESP32_UNIVERSAL_MAC_ADDRESSES=4
 CONFIG_ESP_SLEEP_FLASH_LEAKAGE_WORKAROUND=y
 # CONFIG_ESP_SLEEP_MSPI_NEED_ALL_IO_PU is not set
 CONFIG_ESP_SLEEP_RTC_BUS_ISO_WORKAROUND=y
+<<<<<<< HEAD
 # CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
+=======
+<<<<<<< Updated upstream
+CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND=y
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 CONFIG_ESP_SLEEP_WAIT_FLASH_READY_EXTRA_DELAY=2000
+=======
+# CONFIG_ESP_SLEEP_GPIO_RESET_WORKAROUND is not set
+CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000
+>>>>>>> Stashed changes
 # CONFIG_ESP_SLEEP_CACHE_SAFE_ASSERTION is not set
 # CONFIG_ESP_SLEEP_DEBUG is not set
 CONFIG_ESP_SLEEP_GPIO_ENABLE_INTERNAL_RESISTORS=y
@@ -939,7 +1094,6 @@ 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
 CONFIG_ESP_PHY_CALIBRATION_MODE=0
-# CONFIG_ESP_PHY_PLL_TRACK_DEBUG is not set
 # end of PHY
 
 #
@@ -1103,11 +1257,16 @@ 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
+<<<<<<< Updated upstream
 CONFIG_ESP_WIFI_SLP_DEFAULT_MIN_ACTIVE_TIME=50
 CONFIG_ESP_WIFI_SLP_DEFAULT_MAX_ACTIVE_TIME=10
 CONFIG_ESP_WIFI_SLP_DEFAULT_WAIT_BROADCAST_DATA_TIME=15
 CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y
 CONFIG_ESP_WIFI_GMAC_SUPPORT=y
+=======
+CONFIG_ESP_WIFI_STA_DISCONNECTED_PM_ENABLE=y
+# CONFIG_ESP_WIFI_GMAC_SUPPORT is not set
+>>>>>>> Stashed changes
 CONFIG_ESP_WIFI_SOFTAP_SUPPORT=y
 # CONFIG_ESP_WIFI_SLP_BEACON_LOST_OPT is not set
 CONFIG_ESP_WIFI_ESPNOW_MAX_ENCRYPT_NUM=7
@@ -1131,7 +1290,6 @@ CONFIG_ESP_WIFI_MBEDTLS_TLS_CLIENT=y
 # CONFIG_ESP_WIFI_DEBUG_PRINT is not set
 # CONFIG_ESP_WIFI_TESTING_OPTIONS is not set
 CONFIG_ESP_WIFI_ENTERPRISE_SUPPORT=y
-# CONFIG_ESP_WIFI_ENT_FREE_DYNAMIC_BUFFER is not set
 # end of Wi-Fi
 
 #
@@ -1216,7 +1374,6 @@ CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=1
 # CONFIG_FREERTOS_USE_TRACE_FACILITY is not set
 # CONFIG_FREERTOS_USE_LIST_DATA_INTEGRITY_CHECK_BYTES is not set
 # CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS is not set
-# CONFIG_FREERTOS_USE_APPLICATION_TASK_TAG is not set
 # end of Kernel
 
 #
@@ -1275,6 +1432,9 @@ CONFIG_HEAP_TRACING_OFF=y
 # CONFIG_HEAP_PLACE_FUNCTION_INTO_FLASH is not set
 # end of Heap memory debugging
 
+CONFIG_IEEE802154_CCA_THRESHOLD=-60
+CONFIG_IEEE802154_PENDING_TABLE_SIZE=20
+
 #
 # Log output
 #
@@ -1318,7 +1478,6 @@ CONFIG_LWIP_SO_REUSE=y
 CONFIG_LWIP_SO_REUSE_RXTOALL=y
 # CONFIG_LWIP_SO_RCVBUF is not set
 # CONFIG_LWIP_NETBUF_RECVINFO is not set
-CONFIG_LWIP_IP_DEFAULT_TTL=64
 CONFIG_LWIP_IP4_FRAG=y
 CONFIG_LWIP_IP6_FRAG=y
 # CONFIG_LWIP_IP4_REASSEMBLY is not set
@@ -1433,6 +1592,7 @@ CONFIG_LWIP_SNTP_STARTUP_DELAY=y
 CONFIG_LWIP_SNTP_MAXIMUM_STARTUP_DELAY=5000
 # end of SNTP
 
+<<<<<<< HEAD
 #
 # DNS
 #
@@ -1440,6 +1600,8 @@ CONFIG_LWIP_DNS_MAX_SERVERS=3
 # CONFIG_LWIP_FALLBACK_DNS_SERVER_SUPPORT is not set
 # end of DNS
 
+=======
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 CONFIG_LWIP_BRIDGEIF_MAX_PORTS=7
 CONFIG_LWIP_ESP_LWIP_ASSERT=y
 
@@ -1507,9 +1669,23 @@ CONFIG_MBEDTLS_CERTIFICATE_BUNDLE_MAX_CERTS=200
 # CONFIG_MBEDTLS_ECP_RESTARTABLE is not set
 CONFIG_MBEDTLS_CMAC_C=y
 CONFIG_MBEDTLS_HARDWARE_AES=y
+<<<<<<< HEAD
 CONFIG_MBEDTLS_GCM_SUPPORT_NON_AES_CIPHER=y
 CONFIG_MBEDTLS_HARDWARE_MPI=y
 # CONFIG_MBEDTLS_LARGE_KEY_SOFTWARE_MPI is not set
+=======
+<<<<<<< Updated upstream
+CONFIG_MBEDTLS_AES_USE_INTERRUPT=y
+CONFIG_MBEDTLS_AES_INTERRUPT_LEVEL=0
+# CONFIG_MBEDTLS_GCM_SUPPORT_NON_AES_CIPHER is not set
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+# CONFIG_MBEDTLS_LARGE_KEY_SOFTWARE_MPI is not set
+CONFIG_MBEDTLS_MPI_USE_INTERRUPT=y
+CONFIG_MBEDTLS_MPI_INTERRUPT_LEVEL=0
+=======
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+>>>>>>> Stashed changes
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 CONFIG_MBEDTLS_HARDWARE_SHA=y
 CONFIG_MBEDTLS_ROM_MD5=y
 # CONFIG_MBEDTLS_ATCA_HW_ECDSA_SIGN is not set
@@ -1594,7 +1770,7 @@ CONFIG_MBEDTLS_ECP_FIXED_POINT_OPTIM=y
 # CONFIG_MBEDTLS_CHACHA20_C is not set
 # CONFIG_MBEDTLS_HKDF_C is not set
 # CONFIG_MBEDTLS_THREADING_C is not set
-CONFIG_MBEDTLS_ERROR_STRINGS=y
+# CONFIG_MBEDTLS_LARGE_KEY_SOFTWARE_MPI is not set
 # end of mbedTLS
 
 #
@@ -1654,13 +1830,6 @@ CONFIG_OPENTHREAD_NETWORK_PSKC="104810e2315100afd6bc9215a6bfac53"
 # end of Thread Operational Dataset
 
 CONFIG_OPENTHREAD_XTAL_ACCURACY=130
-# CONFIG_OPENTHREAD_SPINEL_ONLY is not set
-CONFIG_OPENTHREAD_RX_ON_WHEN_IDLE=y
-
-#
-# Thread Address Query Config
-#
-# end of Thread Address Query Config
 # end of OpenThread
 
 #
@@ -1710,7 +1879,22 @@ CONFIG_SPI_FLASH_BROWNOUT_RESET=y
 #
 # Features here require specific hardware (READ DOCS FIRST!)
 #
+<<<<<<< HEAD
 CONFIG_SPI_FLASH_SUSPEND_TSUS_VAL_US=50
+=======
+<<<<<<< Updated upstream
+# CONFIG_SPI_FLASH_HPM_ENA is not set
+CONFIG_SPI_FLASH_HPM_AUTO=y
+# CONFIG_SPI_FLASH_HPM_DIS is not set
+CONFIG_SPI_FLASH_HPM_ON=y
+CONFIG_SPI_FLASH_HPM_DC_AUTO=y
+# CONFIG_SPI_FLASH_HPM_DC_DISABLE is not set
+CONFIG_SPI_FLASH_SUSPEND_QVL_SUPPORTED=y
+# CONFIG_SPI_FLASH_AUTO_SUSPEND is not set
+=======
+CONFIG_SPI_FLASH_SUSPEND_TSUS_VAL_US=50
+>>>>>>> Stashed changes
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 # end of Optional and Experimental Features (READ DOCS FIRST)
 # end of Main Flash configuration
 
@@ -1825,6 +2009,37 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=y
 # end of Unity unit testing library
 
 #
+<<<<<<< HEAD
+=======
+<<<<<<< Updated upstream
+# USB-OTG
+#
+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
+
+CONFIG_USB_OTG_SUPPORTED=y
+# CONFIG_USB_HOST_ENABLE_ENUM_FILTER_CALLBACK is not set
+# end of USB-OTG
+
+=======
+# Root Hub configuration
+#
+# end of Root Hub configuration
+
+>>>>>>> Stashed changes
+#
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 # Virtual file system
 #
 CONFIG_VFS_SUPPORT_IO=y
@@ -1906,15 +2121,26 @@ 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_GDBSTUB_SUPPORT_TASKS=y
-CONFIG_GDBSTUB_MAX_TASKS=32
 # 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
+<<<<<<< HEAD
 CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=2000
 CONFIG_ESP_SLEEP_DEEP_SLEEP_WAKEUP_DELAY=2000
+=======
+<<<<<<< Updated upstream
+CONFIG_ESP32S3_DEEP_SLEEP_WAKEUP_DELAY=2000
+CONFIG_ESP_SLEEP_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
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 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
@@ -1928,6 +2154,10 @@ CONFIG_ESP32_RTC_CLK_CAL_CYCLES=1024
 CONFIG_ESP32_XTAL_FREQ_40=y
 # CONFIG_ESP32_XTAL_FREQ_AUTO is not set
 CONFIG_ESP32_XTAL_FREQ=40
+<<<<<<< HEAD
+=======
+>>>>>>> Stashed changes
+>>>>>>> d54f489 (add sdkconfig to gitignore)
 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