This commit is contained in:
2025-10-18 12:06:40 +03:00
parent a80f9d64e6
commit b6cc1a0ec8
3 changed files with 34 additions and 42 deletions

View File

@@ -21,14 +21,16 @@ static const char *TAG = "zh_ac_dimmer";
goto tag; \
}
gptimer_handle_t _dimmer_timer = NULL;
static gptimer_handle_t _dimmer_timer = NULL;
static gptimer_alarm_config_t _alarm_config = {0};
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_dimmer_work = false;
static uint64_t _prev_micros = 0;
static uint16_t _current_frequency = 0;
static uint16_t _prev_frequency = 0;
static uint16_t _zero_cross_time = 0;
static uint8_t _dimmer_value = 0;
static bool _is_initialized = false;
static esp_err_t _zh_ac_dimmer_validate_config(const zh_ac_dimmer_init_config_t *config);
@@ -105,7 +107,7 @@ esp_err_t _zh_ac_dimmer_gpio_init(const zh_ac_dimmer_init_config_t *config)
esp_err_t err = gpio_config(&triac_gpio_config);
ZH_ERROR_CHECK(err == ESP_OK, err, "Triac GPIO configuration failed.");
gpio_config_t zero_cross_gpio_config = {
.intr_type = GPIO_INTR_NEGEDGE ,
.intr_type = GPIO_INTR_POSEDGE,
.mode = GPIO_MODE_INPUT,
.pin_bit_mask = (1ULL << config->zero_cross_gpio),
.pull_down_en = GPIO_PULLDOWN_DISABLE,
@@ -152,37 +154,30 @@ void IRAM_ATTR _zh_ac_dimmer_isr_handler(void *arg)
return;
}
gpio_set_level(_init_config.triac_gpio, 0);
// if (gpio_get_level(_init_config.zero_cross_gpio) == 1)
// {
// gpio_set_level(_init_config.triac_gpio, 0);
// }
// else
// {
uint64_t time = esp_timer_get_time();
_current_frequency = time - _current_micros;
if (_current_frequency < 1000)
uint64_t _current_micros = esp_timer_get_time();
_current_frequency = _current_micros - _prev_micros;
_prev_micros = _current_micros;
if (_current_frequency < 1000)
{
if (_current_frequency > 50)
{
_current_frequency = _old_frequency;
_zero_cross_time = _current_frequency;
}
// ESP_DRAM_LOGI(TAG, "%d", _current_frequency);
_current_micros = time;
_old_frequency = _current_frequency;
if (_dimmer_value != 0)
_current_frequency = _prev_frequency;
}
_prev_frequency = _current_frequency;
if (_dimmer_value != 0)
{
if (_dimmer_value == 100)
{
if (_dimmer_value == 100)
{
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),
.flags.auto_reload_on_alarm = false,
};
gptimer_set_alarm_action(_dimmer_timer, &alarm_config);
gptimer_start(_dimmer_timer);
gpio_set_level(_init_config.triac_gpio, 1);
return;
}
// }
_alarm_config.alarm_count = ((_current_frequency / 105) * (100 - _dimmer_value)) + _zero_cross_time;
_alarm_config.flags.auto_reload_on_alarm = false;
gptimer_set_alarm_action(_dimmer_timer, &_alarm_config);
gptimer_start(_dimmer_timer);
}
}
bool _zh_ac_dimmer_timer_on_alarm_cb(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_ctx)
@@ -190,6 +185,5 @@ bool _zh_ac_dimmer_timer_on_alarm_cb(gptimer_handle_t timer, const gptimer_alarm
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 true;
}