This commit is contained in:
2025-10-15 21:20:34 +03:00
parent 79a04c7fe6
commit a11a851faa

View File

@@ -27,6 +27,7 @@ static zh_ac_dimmer_init_config_t _init_config = {0};
volatile static bool _is_dimmer_work = false; volatile static bool _is_dimmer_work = false;
volatile static uint64_t _current_micros = 0; volatile static uint64_t _current_micros = 0;
volatile static uint16_t _current_frequency = 0; volatile static uint16_t _current_frequency = 0;
volatile static uint16_t _old_frequency = 0;
volatile static uint8_t _dimmer_value = 0; volatile static uint8_t _dimmer_value = 0;
static bool _is_initialized = false; 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, .intr_type = GPIO_INTR_DISABLE,
.mode = GPIO_MODE_OUTPUT, .mode = GPIO_MODE_OUTPUT,
.pin_bit_mask = (1ULL << config->triac_gpio), .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, .pull_up_en = GPIO_PULLUP_DISABLE,
}; };
esp_err_t err = gpio_config(&triac_gpio_config); 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, .intr_type = GPIO_INTR_ANYEDGE,
.mode = GPIO_MODE_INPUT, .mode = GPIO_MODE_INPUT,
.pin_bit_mask = (1ULL << config->zero_cross_gpio), .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, .pull_up_en = GPIO_PULLUP_DISABLE,
}; };
err = gpio_config(&zero_cross_gpio_config); 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); esp_err_t err = gptimer_new_timer(&timer_config, &_dimmer_timer);
ZH_ERROR_CHECK(err == ESP_OK, err, "Failed create 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 = { gptimer_event_callbacks_t cbs = {
.on_alarm = _zh_ac_dimmer_timer_on_alarm_cb, .on_alarm = _zh_ac_dimmer_timer_on_alarm_cb,
}; };
err = gptimer_register_event_callbacks(_dimmer_timer, &cbs, NULL); err = gptimer_register_event_callbacks(_dimmer_timer, &cbs, NULL);
ZH_ERROR_CHECK(err == ESP_OK, err, "Failed register dimmer timer event callbacks."); 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; 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) 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); gpio_set_level(_init_config.triac_gpio, 1);
return; return;
} }
// ESP_DRAM_LOGI(TAG, "%d", _current_frequency);
gptimer_alarm_config_t alarm_config = { 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, .flags.auto_reload_on_alarm = false,
}; };
gptimer_set_alarm_action(_dimmer_timer, &alarm_config); gptimer_set_alarm_action(_dimmer_timer, &alarm_config);
gptimer_start(_dimmer_timer); 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); 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; return false;
} }