From a11a851faaeda2ba1eea8a608d45541b3deeacd5 Mon Sep 17 00:00:00 2001 From: Alexey Zholtikov Date: Wed, 15 Oct 2025 21:20:34 +0300 Subject: [PATCH] wip: --- zh_ac_dimmer.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/zh_ac_dimmer.c b/zh_ac_dimmer.c index 8c64399..de05406 100644 --- a/zh_ac_dimmer.c +++ b/zh_ac_dimmer.c @@ -27,6 +27,7 @@ static zh_ac_dimmer_init_config_t _init_config = {0}; volatile static bool _is_dimmer_work = false; volatile static uint64_t _current_micros = 0; volatile static uint16_t _current_frequency = 0; +volatile static uint16_t _old_frequency = 0; volatile static uint8_t _dimmer_value = 0; static bool _is_initialized = false; @@ -98,7 +99,7 @@ esp_err_t _zh_ac_dimmer_gpio_init(const zh_ac_dimmer_init_config_t *config) .intr_type = GPIO_INTR_DISABLE, .mode = GPIO_MODE_OUTPUT, .pin_bit_mask = (1ULL << config->triac_gpio), - .pull_down_en = GPIO_PULLDOWN_ENABLE, + .pull_down_en = GPIO_PULLDOWN_DISABLE, .pull_up_en = GPIO_PULLUP_DISABLE, }; esp_err_t err = gpio_config(&triac_gpio_config); @@ -107,7 +108,7 @@ esp_err_t _zh_ac_dimmer_gpio_init(const zh_ac_dimmer_init_config_t *config) .intr_type = GPIO_INTR_ANYEDGE, .mode = GPIO_MODE_INPUT, .pin_bit_mask = (1ULL << config->zero_cross_gpio), - .pull_down_en = GPIO_PULLDOWN_ENABLE, + .pull_down_en = GPIO_PULLDOWN_DISABLE, .pull_up_en = GPIO_PULLUP_DISABLE, }; err = gpio_config(&zero_cross_gpio_config); @@ -134,17 +135,17 @@ esp_err_t _zh_ac_dimmer_timer_init(void) }; esp_err_t err = gptimer_new_timer(&timer_config, &_dimmer_timer); ZH_ERROR_CHECK(err == ESP_OK, err, "Failed create dimmer timer."); - err = gptimer_enable(_dimmer_timer); - ZH_ERROR_CHECK(err == ESP_OK, err, "Failed enable dimmer timer."); gptimer_event_callbacks_t cbs = { .on_alarm = _zh_ac_dimmer_timer_on_alarm_cb, }; err = gptimer_register_event_callbacks(_dimmer_timer, &cbs, NULL); ZH_ERROR_CHECK(err == ESP_OK, err, "Failed register dimmer timer event callbacks."); + err = gptimer_enable(_dimmer_timer); + ZH_ERROR_CHECK(err == ESP_OK, err, "Failed enable dimmer timer."); return ESP_OK; } -void IRAM_ATTR _zh_ac_dimmer_isr_handler(void *arg) +void _zh_ac_dimmer_isr_handler(void *arg) { if (_is_dimmer_work == false) { @@ -173,19 +174,23 @@ void IRAM_ATTR _zh_ac_dimmer_isr_handler(void *arg) gpio_set_level(_init_config.triac_gpio, 1); return; } + // ESP_DRAM_LOGI(TAG, "%d", _current_frequency); gptimer_alarm_config_t alarm_config = { - .alarm_count = (_current_frequency / 100) * (100 - _dimmer_value), + .alarm_count = (9000/ 100) * (100 - _dimmer_value), .flags.auto_reload_on_alarm = false, }; gptimer_set_alarm_action(_dimmer_timer, &alarm_config); gptimer_start(_dimmer_timer); } } + // ESP_DRAM_LOGI(TAG, "%d", _current_frequency); } -bool IRAM_ATTR _zh_ac_dimmer_timer_on_alarm_cb(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_ctx) +bool _zh_ac_dimmer_timer_on_alarm_cb(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_ctx) { - gptimer_stop(_dimmer_timer); gpio_set_level(_init_config.triac_gpio, 1); + gptimer_stop(_dimmer_timer); + gptimer_set_raw_count(_dimmer_timer, 0); + // gpio_set_level(_init_config.triac_gpio, 0); return false; } \ No newline at end of file