From bdbcab00657ad6396c995eadc95bad7a708c0092 Mon Sep 17 00:00:00 2001 From: der_zaske Date: Tue, 3 Dec 2024 15:13:40 +0100 Subject: [PATCH] fixed internal Encoder --- dependencies.lock | 2 +- main/Kconfig.projbuild | 59 +++--- main/app_main.c | 13 +- main/functions.c | 162 +++++++---------- main/include/functions.h | 4 +- sdkconfig | 37 ++-- sdkconfig.old | 376 +++------------------------------------ 7 files changed, 135 insertions(+), 518 deletions(-) diff --git a/dependencies.lock b/dependencies.lock index aec1905..4d8d5e2 100644 --- a/dependencies.lock +++ b/dependencies.lock @@ -2,7 +2,7 @@ dependencies: idf: source: type: idf - version: 5.3.1 + version: 5.3.0 manifest_hash: 482e2222071e855d99a96f5a61a37a4f589f24e7994d6610de1e65027e5a15a9 target: esp32 version: 2.0.0 diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index 97cede3..78229d0 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -30,25 +30,6 @@ menu "DIY Power PCB Configuration" default "26, 14, 13" help GPIO numbers of the Highside controling pins, seperate by comma! - config ENABLE_PWM_HIN - bool "Enable PWM for Highsides" - default y - help - Enable PWM on the Highside Switches, probably mendatory because of bootstrap capacitors - if ENABLE_PWM_HIN - config FREQ_PWM_HIN - int "frequency" - range 20000 60000 - default 20000 - help - The base Frequency of the PWM in Hz min: 20KHz max: 60KHz - config DUTY_PWM_HIN - int "duty cycle" - range 0 100 - default 50 - help - The inital duty-cycle - endif endmenu menu "Lowside pin configurations (LIN)" config LIN_U_V_W_GPIO @@ -56,25 +37,27 @@ menu "DIY Power PCB Configuration" default "25, 27, 12" help GPIO numbers of the Lowside controling pins, seperate by comma! - config ENABLE_PWM_LIN - bool "Enable PWM for Lowsides" - default n - help - Enable PWM on the Lowside Switches, probably not mendatory because of Highside PWM more important - if ENABLE_PWM_LIN - config FREQ_PWM_LIN - int "frequency" - range 20000 60000 - default 20000 - help - The base Frequency of the PWM in Hz min: 20KHz max: 60KHz - config DUTY_PWM_LIN - int "duty cycle" - range 0 100 - default 50 - help - The inital duty-cycle - endif + endmenu + menu "PWM configuration" + config ENABLE_PWM + bool "Enable PWM" + default y + help + Enable PWM + if ENABLE_PWM + config FREQ_PWM + int "frequency" + range 20000 80000 + default 20000 + help + The base Frequency of the PWM in Hz min: 20KHz max: 60KHz + config DUTY_PWM + int "duty cycle" + range 0 100 + default 50 + help + The inital duty-cycle in percent + endif endmenu menu "Hall Sensor pin configurations" config HALL_A_B_C_GPIO diff --git a/main/app_main.c b/main/app_main.c index b78bd1b..7e43d7d 100644 --- a/main/app_main.c +++ b/main/app_main.c @@ -32,17 +32,20 @@ void app_main(void) //gpio_set_level(CONFIG_HIN_V_GPIO, 1); while (1) { //ssd1306_clear_screen(dev_pt, false); - // Die Anzeige der OLED mit der richtigen Nachricht + /* Die Anzeige der OLED mit der richtigen Nachricht Torque = get_torque(adc1_handle); Voltage_IN = get_voltage_in(adc1_handle); Current_U = get_current_ASC712(adc1_handle,CONFIG_I_SENSE_U_ADC); - Current_V = get_current_ASC712(adc1_handle,CONFIG_I_SENSE_U_ADC); - Current_W = get_current_ASC712(adc1_handle,CONFIG_I_SENSE_U_ADC); - + Current_V = get_current_ASC712(adc1_handle,CONFIG_I_SENSE_V_ADC); + Current_W = get_current_ASC712(adc1_handle,CONFIG_I_SENSE_W_ADC); + */ /* Hall_A_On = get_Hall(CONFIG_HALL_A_GPIO); Hall_B_On = get_Hall(CONFIG_HALL_B_GPIO); Hall_C_On = get_Hall(CONFIG_HALL_C_GPIO); */ + int a = gpio_get_level(CONFIG_IN_ENC_A_GPIO); + int b = gpio_get_level(CONFIG_IN_ENC_B_GPIO); + ESP_LOGI("ENCODER_IN", "A=%d B=%d",a ,b); Speed_indx = get_speed_index(); Speed_AB = get_speed_AB(); direction = get_direction(); @@ -82,7 +85,7 @@ void app_main(void) } - snprintf(display_message, sizeof(display_message), "count: %d", enc_counter); + snprintf(display_message, sizeof(display_message), "count: %i", enc_counter); ssd1306_display_text(dev_pt, 1, display_message, 10, false); snprintf(display_message, sizeof(display_message), "Torque: %lu", Torque); ssd1306_display_text(dev_pt, 2, display_message, 11, false); diff --git a/main/functions.c b/main/functions.c index eef2d9e..aa032b3 100644 --- a/main/functions.c +++ b/main/functions.c @@ -4,8 +4,8 @@ uint64_t delta_index_time = 0; uint64_t last_index_time = 0; uint64_t delta_AB_time = 0; volatile int enc_in_counter = 0; -volatile bool enc_in_b_flag=false; volatile bool enc_in_a_flag=false; +volatile bool enc_in_b_flag=false; portMUX_TYPE mux = portMUX_INITIALIZER_UNLOCKED; uint64_t last_AB_time = 0; // Definition der Variablen @@ -15,30 +15,7 @@ adc_cali_handle_t cali_handle= NULL; /*############################################*/ /*############### GPIO-Setup #################*/ /*############################################*/ -void IRAM_ATTR enc_in_a_isr_handler(void *arg){ - - portENTER_CRITICAL_ISR(&mux); - if (enc_in_b_flag){ - enc_in_counter++; - enc_in_b_flag = false; - } - else{ - enc_in_a_flag = true; - } - portEXIT_CRITICAL_ISR(&mux); -} -void IRAM_ATTR enc_in_b_isr_handler(void *arg){ - portENTER_CRITICAL_ISR(&mux); - if (enc_in_a_flag){ - enc_in_counter--; - enc_in_a_flag = false; - } - else{ - enc_in_b_flag = true; - } - portEXIT_CRITICAL_ISR(&mux); -} void configure_GPIO_dir(const char *TAG) { /* reset every used GPIO-pin * @@ -79,6 +56,7 @@ void configure_GPIO_dir(const char *TAG) gpio_set_direction(CONFIG_IN_ENC_A_GPIO, GPIO_MODE_INPUT); gpio_set_direction(CONFIG_IN_ENC_B_GPIO, GPIO_MODE_INPUT); + //gpio_set_pull_mode(CONFIG_IN_ENC_B_GPIO, GPIO_PULLUP_ENABLE); gpio_set_direction(CONFIG_IN_ENC_BUT_GPIO, GPIO_MODE_INPUT); //gpio_set_direction(CONFIG_BUTTON_GPIO, GPIO_MODE_INPUT); @@ -93,14 +71,14 @@ void configure_GPIO_dir(const char *TAG) io_conf.pin_bit_mask = (1ULL << CONFIG_EXT_ENC_INDX_GPIO)| (1ULL << CONFIG_HALL_A_GPIO)| (1ULL << CONFIG_IN_ENC_A_GPIO)| (1ULL << CONFIG_IN_ENC_B_GPIO); io_conf.mode = GPIO_MODE_INPUT; io_conf.pull_up_en = GPIO_PULLUP_ENABLE; - io_conf.intr_type = GPIO_INTR_ANYEDGE; // Interrupt auf steigende Flanke + io_conf.intr_type = GPIO_INTR_ANYEDGE; // Interrupt auf allen Flanken gpio_config(&io_conf); gpio_install_isr_service(0); - gpio_isr_handler_add(CONFIG_EXT_ENC_INDX_GPIO, index_isr_handler, NULL); - gpio_isr_handler_add(CONFIG_HALL_A_GPIO, enc_ab_isr_handler, NULL); - gpio_isr_handler_add(CONFIG_IN_ENC_A_GPIO, enc_in_a_isr_handler, NULL); - gpio_isr_handler_add(CONFIG_IN_ENC_B_GPIO, enc_in_b_isr_handler, NULL); + ESP_ERROR_CHECK(gpio_isr_handler_add(CONFIG_EXT_ENC_INDX_GPIO, index_isr_handler, NULL)); + ESP_ERROR_CHECK(gpio_isr_handler_add(CONFIG_HALL_A_GPIO, enc_ab_isr_handler, NULL)); + ESP_ERROR_CHECK(gpio_isr_handler_add(CONFIG_IN_ENC_A_GPIO, enc_in_a_isr_handler, NULL)); + ESP_ERROR_CHECK(gpio_isr_handler_add(CONFIG_IN_ENC_B_GPIO, enc_in_b_isr_handler, NULL)); } /*############################################*/ /*################ ADC-Setup #################*/ @@ -273,7 +251,6 @@ void pwmStart(int PWM_CH, int Duty){ ledc_set_duty(LEDC_HIGH_SPEED_MODE,PWM_CH, Duty); ledc_update_duty(LEDC_HIGH_SPEED_MODE,PWM_CH); } - void pwmStop(int PWM_CH){ ledc_stop(LEDC_HIGH_SPEED_MODE, PWM_CH, 0); } @@ -285,8 +262,6 @@ void pwmStopAll(){ gpio_set_level(CONFIG_LIN_V_GPIO, 0); gpio_set_level(CONFIG_LIN_W_GPIO, 0); } - - void U_V_start(int duty) { //HIN_V und LIN_U abschalten @@ -332,7 +307,6 @@ void V_W_start(int duty) pwmStart(HIN_V_CH, duty); gpio_set_level(CONFIG_LIN_W_GPIO, 1); } - void W_V_start(int duty) { //HIN_U und LIN_W abschalten @@ -351,36 +325,20 @@ void conf_mcpwm_timers(){ mcpwm_timer_handle_t timer_U = NULL; mcpwm_timer_handle_t timer_V = NULL; mcpwm_timer_handle_t timer_W = NULL; + uint16_t periode_ticks = 40000000/CONFIG_FREQ_PWM; + //creating timer configs and linking them with the timers - mcpwm_timer_config_t timer_U_config = + mcpwm_timer_config_t timer_config = { .group_id = 0, .clk_src = MCPWM_TIMER_CLK_SRC_DEFAULT, - .resolution_hz = 40000000, // 1MHz Auflösung - .period_ticks = 2000, + .resolution_hz = 40000000, //40MHz + .period_ticks = periode_ticks, //40MHz/2KHz = 20KHz .count_mode = MCPWM_TIMER_COUNT_MODE_UP, }; - ESP_ERROR_CHECK(mcpwm_new_timer(&timer_U_config, &timer_U)); - - mcpwm_timer_config_t timer_V_config = - { - .group_id = 0, - .clk_src = MCPWM_TIMER_CLK_SRC_DEFAULT, - .resolution_hz = 40000000, // 1MHz Auflösung - .period_ticks = 2000, - .count_mode = MCPWM_TIMER_COUNT_MODE_UP, - }; - ESP_ERROR_CHECK(mcpwm_new_timer(&timer_V_config, &timer_V)); - - mcpwm_timer_config_t timer_W_config = - { - .group_id = 0, - .clk_src = MCPWM_TIMER_CLK_SRC_DEFAULT, - .resolution_hz = 40000000, // 1MHz Auflösung - .period_ticks = 2000, - .count_mode = MCPWM_TIMER_COUNT_MODE_UP, - }; - ESP_ERROR_CHECK(mcpwm_new_timer(&timer_W_config, &timer_W)); + ESP_ERROR_CHECK(mcpwm_new_timer(&timer_config, &timer_U)); + ESP_ERROR_CHECK(mcpwm_new_timer(&timer_config, &timer_V)); + ESP_ERROR_CHECK(mcpwm_new_timer(&timer_config, &timer_W)); ESP_ERROR_CHECK(mcpwm_timer_enable(timer_U)); ESP_ERROR_CHECK(mcpwm_timer_start_stop(timer_U,MCPWM_TIMER_START_NO_STOP)); @@ -403,14 +361,14 @@ void conf_mcpwm_timers(){ mcpwm_timer_sync_phase_config_t sync_phase_V_config = { .sync_src = sync_signal, - .count_value = 667, //120 degree delayed + .count_value = periode_ticks/3, //120 degree delayed }; ESP_ERROR_CHECK(mcpwm_timer_set_phase_on_sync(timer_V,&sync_phase_V_config)); //set Timer_W as an Slave of Timer_U with another phase mcpwm_timer_sync_phase_config_t sync_phase_W_config = { .sync_src = sync_signal, - .count_value = 1333, //240 degree delayed + .count_value = periode_ticks*2/3, //240 degree delayed }; ESP_ERROR_CHECK(mcpwm_timer_set_phase_on_sync(timer_W,&sync_phase_W_config)); @@ -418,24 +376,15 @@ void conf_mcpwm_timers(){ mcpwm_oper_handle_t operator_U = NULL; mcpwm_oper_handle_t operator_V = NULL; mcpwm_oper_handle_t operator_W = NULL; + //Operator for Timer_U - mcpwm_operator_config_t operator_U_config = + mcpwm_operator_config_t operator_config = { .group_id=0, }; - ESP_ERROR_CHECK(mcpwm_new_operator(&operator_U_config,&operator_U)); - //Operator for Timer_V - mcpwm_operator_config_t operator_V_config = - { - .group_id=0, - }; - ESP_ERROR_CHECK(mcpwm_new_operator(&operator_V_config,&operator_V)); - //Operator for Timer_W - mcpwm_operator_config_t operator_W_config = - { - .group_id=0, - }; - ESP_ERROR_CHECK(mcpwm_new_operator(&operator_W_config,&operator_W)); + ESP_ERROR_CHECK(mcpwm_new_operator(&operator_config,&operator_U)); + ESP_ERROR_CHECK(mcpwm_new_operator(&operator_config,&operator_V)); + ESP_ERROR_CHECK(mcpwm_new_operator(&operator_config,&operator_W)); //connect PWM-Signals with Timers ESP_ERROR_CHECK(mcpwm_operator_connect_timer(operator_U, timer_U)); @@ -447,23 +396,18 @@ void conf_mcpwm_timers(){ mcpwm_cmpr_handle_t comperator_V = NULL; mcpwm_cmpr_handle_t comperator_W = NULL; - mcpwm_comparator_config_t comparator_U_config = { + mcpwm_comparator_config_t comparator_config = { .flags.update_cmp_on_tez = true, }; - ESP_ERROR_CHECK(mcpwm_new_comparator(operator_U, &comparator_U_config,&comperator_U)); - ESP_ERROR_CHECK(mcpwm_comparator_set_compare_value(comperator_U, 1000));//=50% Duty cycle + ESP_ERROR_CHECK(mcpwm_new_comparator(operator_U, &comparator_config,&comperator_U)); + ESP_ERROR_CHECK(mcpwm_comparator_set_compare_value(comperator_U, periode_ticks*CONFIG_DUTY_PWM/100));//Duty_cycle from Config - mcpwm_comparator_config_t comparator_V_config = { - .flags.update_cmp_on_tez = true, - }; - ESP_ERROR_CHECK(mcpwm_new_comparator(operator_V, &comparator_V_config,&comperator_V)); - ESP_ERROR_CHECK(mcpwm_comparator_set_compare_value(comperator_V, 1000));//=50% Duty cycle + ESP_ERROR_CHECK(mcpwm_new_comparator(operator_V, &comparator_config,&comperator_V)); + ESP_ERROR_CHECK(mcpwm_comparator_set_compare_value(comperator_V, periode_ticks*CONFIG_DUTY_PWM/100)); + + ESP_ERROR_CHECK(mcpwm_new_comparator(operator_W, &comparator_config,&comperator_W)); + ESP_ERROR_CHECK(mcpwm_comparator_set_compare_value(comperator_W,periode_ticks*CONFIG_DUTY_PWM/100)); - mcpwm_comparator_config_t comparator_W_config = { - .flags.update_cmp_on_tez = true, - }; - ESP_ERROR_CHECK(mcpwm_new_comparator(operator_W, &comparator_W_config,&comperator_W)); - ESP_ERROR_CHECK(mcpwm_comparator_set_compare_value(comperator_W, 1000));//=50% Duty cycle //create generators for every pin mcpwm_gen_handle_t generator_U_HIN = NULL; mcpwm_gen_handle_t generator_V_HIN = NULL; @@ -471,7 +415,8 @@ void conf_mcpwm_timers(){ mcpwm_gen_handle_t generator_U_LIN = NULL; mcpwm_gen_handle_t generator_V_LIN = NULL; mcpwm_gen_handle_t generator_W_LIN = NULL; - //HIN Pins + +//HIN Pins //HIN_U mcpwm_generator_config_t generator_U_HIN_config ={ .gen_gpio_num = CONFIG_HIN_U_GPIO, @@ -517,12 +462,7 @@ void conf_mcpwm_timers(){ }; ESP_ERROR_CHECK(mcpwm_new_generator(operator_W, &generator_W_LIN_config, &generator_W_LIN)); - - - - - /*ESP_ERROR_CHECK(mcpwm_generator_set_dead_time(generator_V_LIN, generator_V_HIN,&deadtime_config)); - ESP_ERROR_CHECK(mcpwm_generator_set_dead_time(generator_W_LIN, generator_W_HIN,&deadtime_config));*/ + //set generator action on timer event ESP_ERROR_CHECK(mcpwm_generator_set_action_on_timer_event(generator_U_HIN, MCPWM_GEN_TIMER_EVENT_ACTION(MCPWM_TIMER_DIRECTION_UP, MCPWM_TIMER_EVENT_EMPTY, MCPWM_GEN_ACTION_HIGH))); ESP_ERROR_CHECK(mcpwm_generator_set_action_on_compare_event(generator_U_HIN, MCPWM_GEN_COMPARE_EVENT_ACTION(MCPWM_TIMER_DIRECTION_UP, comperator_U, MCPWM_GEN_ACTION_LOW))); ESP_ERROR_CHECK(mcpwm_generator_set_action_on_timer_event(generator_U_LIN, MCPWM_GEN_TIMER_EVENT_ACTION(MCPWM_TIMER_DIRECTION_UP, MCPWM_TIMER_EVENT_EMPTY, MCPWM_GEN_ACTION_HIGH))); @@ -535,7 +475,7 @@ void conf_mcpwm_timers(){ ESP_ERROR_CHECK(mcpwm_generator_set_action_on_compare_event(generator_W_HIN, MCPWM_GEN_COMPARE_EVENT_ACTION(MCPWM_TIMER_DIRECTION_UP, comperator_W, MCPWM_GEN_ACTION_LOW))); ESP_ERROR_CHECK(mcpwm_generator_set_action_on_timer_event(generator_W_LIN, MCPWM_GEN_TIMER_EVENT_ACTION(MCPWM_TIMER_DIRECTION_UP, MCPWM_TIMER_EVENT_EMPTY, MCPWM_GEN_ACTION_HIGH))); ESP_ERROR_CHECK(mcpwm_generator_set_action_on_compare_event(generator_W_LIN, MCPWM_GEN_COMPARE_EVENT_ACTION(MCPWM_TIMER_DIRECTION_UP, comperator_W, MCPWM_GEN_ACTION_LOW))); - + //set Dead times mcpwm_dead_time_config_t deadtime_config = { .posedge_delay_ticks = 20, .negedge_delay_ticks = 0, @@ -635,11 +575,45 @@ return speed_rpm; /*############################################*/ /*############ Internal Encoder ##############*/ /*############################################*/ +void IRAM_ATTR enc_in_a_isr_handler(void *arg) { + int a = gpio_get_level(CONFIG_IN_ENC_A_GPIO); + int b = gpio_get_level(CONFIG_IN_ENC_B_GPIO); + + portENTER_CRITICAL_ISR(&mux); + if (a == b) { + enc_in_counter++; // Richtung vorwärts + }else{ + enc_in_a_flag = true; + } + portEXIT_CRITICAL_ISR(&mux); +} + +void IRAM_ATTR enc_in_b_isr_handler(void *arg) { + int a = gpio_get_level(CONFIG_IN_ENC_A_GPIO); + int b = gpio_get_level(CONFIG_IN_ENC_B_GPIO); + + portENTER_CRITICAL_ISR(&mux); + if (a == b) { + enc_in_counter--; // Richtung rückwärts + }else{ + enc_in_b_flag = true; + } + portEXIT_CRITICAL_ISR(&mux); +} +void IRAM_ATTR enc_in_button_isr_handler(void *arg) { + if (enc_button_flag){ + enc_button_state = + enc_button_flag = false; + }else{ + enc_button_flag = true; + } +} int16_t get_enc_in_counter(){ ESP_LOGI("Encoder_Int","Counter:%i",enc_in_counter); return enc_in_counter; } +bool get_enc_but() /*############################################*/ /*################## MISC ####################*/ diff --git a/main/include/functions.h b/main/include/functions.h index 9bf486f..1611a2e 100644 --- a/main/include/functions.h +++ b/main/include/functions.h @@ -56,8 +56,8 @@ float get_speed_AB(); void conf_mcpwm_timers(); void IRAM_ATTR index_isr_handler(void *arg); void IRAM_ATTR enc_ab_isr_handler(void *arg); -//void IRAM_ATTR enc_in_a_isr_handler(void *arg); -//void IRAM_ATTR enc_in_b_isr_handler(void *arg); +void IRAM_ATTR enc_in_a_isr_handler(void *arg); +void IRAM_ATTR enc_in_b_isr_handler(void *arg); int16_t get_enc_in_counter(); void parse_3pins(const char *TAG, const char *pin_string, int *pins); SSD1306_t *configure_OLED(const char *TAG); diff --git a/sdkconfig b/sdkconfig index 82eef9f..e19d7d2 100644 --- a/sdkconfig +++ b/sdkconfig @@ -1,6 +1,6 @@ # # Automatically generated file. DO NOT EDIT. -# Espressif IoT Development Framework (ESP-IDF) 5.3.1 Project Configuration +# Espressif IoT Development Framework (ESP-IDF) 5.3.0 Project Configuration # CONFIG_SOC_BROWNOUT_RESET_SUPPORTED="Not determined" CONFIG_SOC_TWAI_BRP_DIV_SUPPORTED="Not determined" @@ -167,7 +167,7 @@ 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_TOUCH_SAMPLER_NUM=1 CONFIG_SOC_TWAI_CONTROLLER_NUM=1 CONFIG_SOC_TWAI_BRP_MIN=2 CONFIG_SOC_TWAI_CLK_SUPPORT_APB=y @@ -230,7 +230,7 @@ CONFIG_IDF_TOOLCHAIN="gcc" CONFIG_IDF_TARGET_ARCH_XTENSA=y CONFIG_IDF_TARGET_ARCH="xtensa" CONFIG_IDF_TARGET="esp32" -CONFIG_IDF_INIT_VERSION="5.3.1" +CONFIG_IDF_INIT_VERSION="5.3.0" CONFIG_IDF_TARGET_ESP32=y CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000 @@ -381,7 +381,7 @@ CONFIG_ENV_GPIO_OUT_RANGE_MAX=33 # # ADC 1 configurations # -CONFIG_U_SENSE_ADC=9 +CONFIG_U_SENSE_ADC=5 CONFIG_I_SENSE_ADC=7 CONFIG_I_SENSE_U_V_W_ADC="6, 3, 0" CONFIG_TORQUE_ADC=4 @@ -391,18 +391,22 @@ CONFIG_TORQUE_ADC=4 # Highside pin configurations (HIN) # CONFIG_HIN_U_V_W_GPIO="26, 14, 13" -CONFIG_ENABLE_PWM_HIN=y -CONFIG_FREQ_PWM_HIN=20000 -CONFIG_DUTY_PWM_HIN=50 # end of Highside pin configurations (HIN) # # Lowside pin configurations (LIN) # CONFIG_LIN_U_V_W_GPIO="25, 27, 12" -# CONFIG_ENABLE_PWM_LIN is not set # end of Lowside pin configurations (LIN) +# +# PWM configuration +# +CONFIG_ENABLE_PWM=y +CONFIG_FREQ_PWM=20000 +CONFIG_DUTY_PWM=50 +# end of PWM configuration + # # Hall Sensor pin configurations # @@ -673,23 +677,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 diff --git a/sdkconfig.old b/sdkconfig.old index a66dd98..4efd79b 100644 --- a/sdkconfig.old +++ b/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