fixed internal Encoder
This commit is contained in:
376
sdkconfig.old
376
sdkconfig.old
@@ -1,10 +1,6 @@
|
||||
#
|
||||
# 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"
|
||||
@@ -18,7 +14,6 @@ CONFIG_SOC_GPTIMER_SUPPORTED=y
|
||||
CONFIG_SOC_SDMMC_HOST_SUPPORTED=y
|
||||
CONFIG_SOC_BT_SUPPORTED=y
|
||||
CONFIG_SOC_PCNT_SUPPORTED=y
|
||||
CONFIG_SOC_PHY_SUPPORTED=y
|
||||
CONFIG_SOC_WIFI_SUPPORTED=y
|
||||
CONFIG_SOC_SDIO_SLAVE_SUPPORTED=y
|
||||
CONFIG_SOC_TWAI_SUPPORTED=y
|
||||
@@ -48,22 +43,9 @@ 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
|
||||
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
|
||||
@@ -103,9 +85,7 @@ CONFIG_SOC_GPIO_IN_RANGE_MAX=39
|
||||
CONFIG_SOC_GPIO_OUT_RANGE_MAX=33
|
||||
CONFIG_SOC_GPIO_VALID_DIGITAL_IO_PAD_MASK=0xEF0FEA
|
||||
CONFIG_SOC_GPIO_CLOCKOUT_BY_IO_MUX=y
|
||||
CONFIG_SOC_GPIO_CLOCKOUT_CHANNEL_NUM=3
|
||||
CONFIG_SOC_I2C_NUM=2
|
||||
CONFIG_SOC_HP_I2C_NUM=2
|
||||
CONFIG_SOC_I2C_FIFO_LEN=32
|
||||
CONFIG_SOC_I2C_CMD_REG_NUM=16
|
||||
CONFIG_SOC_I2C_SUPPORT_SLAVE=y
|
||||
@@ -182,31 +162,12 @@ 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
|
||||
@@ -262,32 +223,16 @@ CONFIG_SOC_BLE_SUPPORTED=y
|
||||
CONFIG_SOC_BLE_MESH_SUPPORTED=y
|
||||
CONFIG_SOC_BT_CLASSIC_SUPPORTED=y
|
||||
CONFIG_SOC_BLUFI_SUPPORTED=y
|
||||
CONFIG_SOC_BT_H2C_ENC_KEY_CTRL_ENH_VSC_SUPPORTED=y
|
||||
CONFIG_SOC_ULP_HAS_ADC=y
|
||||
CONFIG_SOC_PHY_COMBO_MODULE=y
|
||||
CONFIG_SOC_EMAC_RMII_CLK_OUT_INTERNAL_LOOPBACK=y
|
||||
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
|
||||
@@ -375,28 +320,8 @@ CONFIG_ESP_ROM_HAS_MZ_CRC32=y
|
||||
CONFIG_ESP_ROM_HAS_JPEG_DECODE=y
|
||||
CONFIG_ESP_ROM_HAS_UART_BUF_SWITCH=y
|
||||
CONFIG_ESP_ROM_NEEDS_SWSETUP_WORKAROUND=y
|
||||
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
|
||||
@@ -564,45 +489,13 @@ CONFIG_APPTRACE_LOCK_ENABLE=y
|
||||
# CONFIG_BT_ENABLED is not set
|
||||
# end of Bluetooth
|
||||
|
||||
#
|
||||
# Console Library
|
||||
#
|
||||
# CONFIG_CONSOLE_SORTED_HELP is not set
|
||||
# end of Console Library
|
||||
|
||||
#
|
||||
# Driver Configurations
|
||||
#
|
||||
|
||||
#
|
||||
<<<<<<< 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
|
||||
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
|
||||
|
||||
#
|
||||
# Legacy ADC Driver Configuration
|
||||
#
|
||||
CONFIG_ADC_DISABLE_DAC=y
|
||||
# CONFIG_ADC_SUPPRESS_DEPRECATE_WARN is not set
|
||||
|
||||
@@ -614,60 +507,37 @@ 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 Driver Configuration
|
||||
# end of Legacy ADC Configuration
|
||||
|
||||
#
|
||||
<<<<<<< HEAD
|
||||
# Legacy DAC Driver Configurations
|
||||
=======
|
||||
<<<<<<< Updated upstream
|
||||
# GPIO Configuration
|
||||
>>>>>>> d54f489 (add sdkconfig to gitignore)
|
||||
# TWAI Configuration
|
||||
#
|
||||
# CONFIG_DAC_SUPPRESS_DEPRECATE_WARN is not set
|
||||
# end of Legacy DAC Driver Configurations
|
||||
# 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
|
||||
|
||||
#
|
||||
# Legacy MCPWM Driver Configurations
|
||||
# UART Configuration
|
||||
#
|
||||
# CONFIG_MCPWM_SUPPRESS_DEPRECATE_WARN is not set
|
||||
# end of Legacy MCPWM Driver Configurations
|
||||
# CONFIG_UART_ISR_IN_IRAM is not set
|
||||
# end of UART Configuration
|
||||
|
||||
#
|
||||
# Legacy Timer Group Driver Configurations
|
||||
#
|
||||
# CONFIG_GPTIMER_SUPPRESS_DEPRECATE_WARN is not set
|
||||
# end of Legacy Timer Group Driver Configurations
|
||||
|
||||
#
|
||||
# Legacy RMT Driver Configurations
|
||||
#
|
||||
# CONFIG_RMT_SUPPRESS_DEPRECATE_WARN is not set
|
||||
# end of Legacy RMT Driver Configurations
|
||||
|
||||
#
|
||||
# Legacy I2S Driver Configurations
|
||||
#
|
||||
# CONFIG_I2S_SUPPRESS_DEPRECATE_WARN is not set
|
||||
# end of Legacy I2S Driver Configurations
|
||||
|
||||
#
|
||||
# Legacy PCNT Driver Configurations
|
||||
#
|
||||
# CONFIG_PCNT_SUPPRESS_DEPRECATE_WARN is not set
|
||||
# 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
|
||||
# CONFIG_LEDC_CTRL_FUNC_IN_IRAM is not set
|
||||
# end of LEDC Configuration
|
||||
|
||||
#
|
||||
# I2C Configuration
|
||||
#
|
||||
# CONFIG_I2C_ISR_IRAM_SAFE is not set
|
||||
# CONFIG_I2C_ENABLE_DEBUG_LOG is not set
|
||||
# end of I2C Configuration
|
||||
# end of Driver Configurations
|
||||
|
||||
#
|
||||
@@ -699,12 +569,6 @@ 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
|
||||
@@ -716,16 +580,11 @@ 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
|
||||
|
||||
#
|
||||
# Wireless Coexistence
|
||||
#
|
||||
CONFIG_ESP_COEX_ENABLED=y
|
||||
# end of Wireless Coexistence
|
||||
|
||||
#
|
||||
@@ -739,10 +598,7 @@ 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
|
||||
@@ -760,52 +616,24 @@ 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
|
||||
# CONFIG_I2C_ENABLE_DEBUG_LOG is not set
|
||||
# end of ESP-Driver:I2C Configurations
|
||||
|
||||
#
|
||||
# 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
|
||||
|
||||
@@ -814,10 +642,7 @@ 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
|
||||
|
||||
@@ -826,10 +651,7 @@ 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
|
||||
|
||||
@@ -837,10 +659,7 @@ 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
|
||||
|
||||
@@ -854,23 +673,6 @@ 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
|
||||
# CONFIG_TOUCH_ISR_IRAM_SAFE is not set
|
||||
# CONFIG_TOUCH_ENABLE_DEBUG_LOG is not set
|
||||
# end of ESP-Driver:Touch Sensor Configurations
|
||||
|
||||
#
|
||||
# ESP-Driver:UART Configurations
|
||||
#
|
||||
# CONFIG_UART_ISR_IN_IRAM is not set
|
||||
# end of ESP-Driver:UART Configurations
|
||||
|
||||
#
|
||||
=======
|
||||
>>>>>>> d54f489 (add sdkconfig to gitignore)
|
||||
# Ethernet
|
||||
#
|
||||
CONFIG_ETH_ENABLED=y
|
||||
@@ -957,28 +759,10 @@ 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
|
||||
|
||||
#
|
||||
@@ -989,7 +773,6 @@ 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_ESP_MAC_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
|
||||
@@ -1004,17 +787,8 @@ 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
|
||||
@@ -1084,7 +858,6 @@ CONFIG_ESP_NETIF_USES_TCPIP_WITH_BSD_API=y
|
||||
#
|
||||
# PHY
|
||||
#
|
||||
CONFIG_ESP_PHY_ENABLED=y
|
||||
CONFIG_ESP_PHY_CALIBRATION_AND_DATA_STORAGE=y
|
||||
# CONFIG_ESP_PHY_INIT_DATA_IN_PARTITION is not set
|
||||
CONFIG_ESP_PHY_MAX_WIFI_TX_POWER=20
|
||||
@@ -1165,7 +938,6 @@ CONFIG_ESP_CONSOLE_UART_DEFAULT=y
|
||||
# CONFIG_ESP_CONSOLE_NONE is not set
|
||||
CONFIG_ESP_CONSOLE_UART=y
|
||||
CONFIG_ESP_CONSOLE_UART_NUM=0
|
||||
CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM=0
|
||||
CONFIG_ESP_CONSOLE_UART_BAUDRATE=115200
|
||||
CONFIG_ESP_INT_WDT=y
|
||||
CONFIG_ESP_INT_WDT_TIMEOUT_MS=300
|
||||
@@ -1210,7 +982,7 @@ CONFIG_ESP_IPC_ISR_ENABLE=y
|
||||
# end of IPC (Inter-Processor Call)
|
||||
|
||||
#
|
||||
# ESP Timer (High Resolution Timer)
|
||||
# High resolution timer (esp_timer)
|
||||
#
|
||||
# CONFIG_ESP_TIMER_PROFILING is not set
|
||||
CONFIG_ESP_TIME_FUNCS_USE_RTC_TIMER=y
|
||||
@@ -1223,7 +995,7 @@ CONFIG_ESP_TIMER_TASK_AFFINITY_CPU0=y
|
||||
CONFIG_ESP_TIMER_ISR_AFFINITY_CPU0=y
|
||||
# CONFIG_ESP_TIMER_SUPPORTS_ISR_DISPATCH_METHOD is not set
|
||||
CONFIG_ESP_TIMER_IMPL_TG0_LAC=y
|
||||
# end of ESP Timer (High Resolution Timer)
|
||||
# end of High resolution timer (esp_timer)
|
||||
|
||||
#
|
||||
# Wi-Fi
|
||||
@@ -1257,16 +1029,8 @@ 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
|
||||
@@ -1402,7 +1166,6 @@ CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y
|
||||
CONFIG_FREERTOS_DEBUG_OCDAWARE=y
|
||||
CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT=y
|
||||
CONFIG_FREERTOS_PLACE_SNAPSHOT_FUNS_INTO_FLASH=y
|
||||
CONFIG_FREERTOS_NUMBER_OF_CORES=2
|
||||
# end of FreeRTOS
|
||||
|
||||
#
|
||||
@@ -1532,7 +1295,6 @@ CONFIG_LWIP_TCP_FIN_WAIT_TIMEOUT=20000
|
||||
CONFIG_LWIP_TCP_SND_BUF_DEFAULT=5760
|
||||
CONFIG_LWIP_TCP_WND_DEFAULT=5760
|
||||
CONFIG_LWIP_TCP_RECVMBOX_SIZE=6
|
||||
CONFIG_LWIP_TCP_ACCEPTMBOX_SIZE=6
|
||||
CONFIG_LWIP_TCP_QUEUE_OOSEQ=y
|
||||
CONFIG_LWIP_TCP_OOSEQ_TIMEOUT=6
|
||||
CONFIG_LWIP_TCP_OOSEQ_MAX_PBUFS=4
|
||||
@@ -1588,20 +1350,8 @@ CONFIG_LWIP_MAX_RAW_PCBS=16
|
||||
CONFIG_LWIP_SNTP_MAX_SERVERS=1
|
||||
# CONFIG_LWIP_DHCP_GET_NTP_SRV is not set
|
||||
CONFIG_LWIP_SNTP_UPDATE_DELAY=3600000
|
||||
CONFIG_LWIP_SNTP_STARTUP_DELAY=y
|
||||
CONFIG_LWIP_SNTP_MAXIMUM_STARTUP_DELAY=5000
|
||||
# end of SNTP
|
||||
|
||||
<<<<<<< HEAD
|
||||
#
|
||||
# DNS
|
||||
#
|
||||
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
|
||||
|
||||
@@ -1669,23 +1419,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
|
||||
<<<<<<< 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
|
||||
@@ -1879,22 +1613,7 @@ 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
|
||||
|
||||
@@ -1989,11 +1708,6 @@ CONFIG_WS_BUFFER_SIZE=1024
|
||||
# Ultra Low Power (ULP) Co-processor
|
||||
#
|
||||
# CONFIG_ULP_COPROC_ENABLED is not set
|
||||
|
||||
#
|
||||
# ULP Debugging Options
|
||||
#
|
||||
# end of ULP Debugging Options
|
||||
# end of Ultra Low Power (ULP) Co-processor
|
||||
|
||||
#
|
||||
@@ -2009,37 +1723,11 @@ 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
|
||||
@@ -2126,21 +1814,7 @@ CONFIG_POST_EVENTS_FROM_IRAM_ISR=y
|
||||
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
|
||||
@@ -2154,10 +1828,6 @@ 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
|
||||
|
||||
Reference in New Issue
Block a user