esp_components/zh_ac_dimmer
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wip:

Browse Source
This commit is contained in:
Alexey Zholtikov
2025-12-08 12:59:18 +03:00
parent e7cb9f76d6
commit 9c3aaa2863
2 changed files with 4 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/zh_ac_dimmer.h
View File

@@ -17,9 +17,7 @@
#define ZH_AC_DIMMER_INIT_CONFIG_DEFAULT() \ #define ZH_AC_DIMMER_INIT_CONFIG_DEFAULT() \
{ \ { \
.zero_cross_gpio = GPIO_NUM_MAX, \ .zero_cross_gpio = GPIO_NUM_MAX, \
.triac_gpio = GPIO_NUM_MAX, \ .triac_gpio = GPIO_NUM_MAX}
.glitch_filter = 2, \
.ac_frequency = 50}
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C"
@@ -33,8 +31,6 @@ extern "C"
{ {
uint8_t zero_cross_gpio; /*!< Zero cross GPIO. */ uint8_t zero_cross_gpio; /*!< Zero cross GPIO. */
uint8_t triac_gpio; /*!< Triac GPIO. */ uint8_t triac_gpio; /*!< Triac GPIO. */
uint8_t glitch_filter; /*!< Zero cross interrupt glitch filter (in us). */
uint16_t ac_frequency; /*!< AC frequency (50 - 400 Hz). */
} zh_ac_dimmer_init_config_t; } zh_ac_dimmer_init_config_t;
/** /**

56
zh_ac_dimmer.c
View File

@@ -18,14 +18,10 @@ static gptimer_alarm_config_t _alarm_config = {0};
static zh_ac_dimmer_init_config_t _init_config = {0}; static zh_ac_dimmer_init_config_t _init_config = {0};
static volatile uint64_t _prev_us = 0; static volatile uint64_t _prev_us = 0;
static volatile uint32_t _current_period_us = 0;
static volatile uint32_t _prev_period_us = 0;
// static volatile uint16_t _zero_cross_us = 0;
static volatile uint8_t _dimmer_value = 0; static volatile uint8_t _dimmer_value = 0;
static volatile bool _is_dimmer_work = false; static volatile bool _is_dimmer_work = false;
static bool _is_initialized = false; static bool _is_initialized = false;
static bool _is_prev_gpio_isr_handler = false; static bool _is_prev_gpio_isr_handler = false;
static bool _is_zero_crossing = false;
static esp_err_t _zh_ac_dimmer_validate_config(const zh_ac_dimmer_init_config_t *config); static esp_err_t _zh_ac_dimmer_validate_config(const zh_ac_dimmer_init_config_t *config);
static esp_err_t _zh_ac_dimmer_gpio_init(const zh_ac_dimmer_init_config_t *config); static esp_err_t _zh_ac_dimmer_gpio_init(const zh_ac_dimmer_init_config_t *config);
@@ -33,13 +29,12 @@ static esp_err_t _zh_ac_dimmer_timer_init(void);
static void _zh_ac_dimmer_isr_handler(void *arg); static void _zh_ac_dimmer_isr_handler(void *arg);
static bool _zh_ac_dimmer_timer_on_alarm_cb(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_ctx); static bool _zh_ac_dimmer_timer_on_alarm_cb(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_ctx);
esp_err_t zh_ac_dimmer_init(const zh_ac_dimmer_init_config_t *config) //-V2008 esp_err_t zh_ac_dimmer_init(const zh_ac_dimmer_init_config_t *config)
{ {
ZH_LOGI("AC dimmer initialization started."); ZH_LOGI("AC dimmer initialization started.");
ZH_ERROR_CHECK(_is_initialized == false, ESP_ERR_INVALID_STATE, NULL, "AC dimmer initialization failed. AC dimmer is already initialized."); ZH_ERROR_CHECK(_is_initialized == false, ESP_ERR_INVALID_STATE, NULL, "AC dimmer initialization failed. AC dimmer is already initialized.");
esp_err_t err = _zh_ac_dimmer_validate_config(config); esp_err_t err = _zh_ac_dimmer_validate_config(config);
ZH_ERROR_CHECK(err == ESP_OK, err, NULL, "AC dimmer initialization failed. Initial configuration check failed."); ZH_ERROR_CHECK(err == ESP_OK, err, NULL, "AC dimmer initialization failed. Initial configuration check failed.");
// _prev_us = esp_timer_get_time();
err = _zh_ac_dimmer_gpio_init(config); err = _zh_ac_dimmer_gpio_init(config);
ZH_ERROR_CHECK(err == ESP_OK, err, NULL, "AC dimmer initialization failed. GPIO initialization failed."); ZH_ERROR_CHECK(err == ESP_OK, err, NULL, "AC dimmer initialization failed. GPIO initialization failed.");
err = _zh_ac_dimmer_timer_init(); err = _zh_ac_dimmer_timer_init();
@@ -75,9 +70,6 @@ esp_err_t zh_ac_dimmer_deinit(void)
_is_initialized = false; _is_initialized = false;
_dimmer_timer = NULL; _dimmer_timer = NULL;
_dimmer_value = 0; _dimmer_value = 0;
_current_period_us = 0;
// _prev_period_us = 0;
// _zero_cross_us = 0;
_prev_us = 0; _prev_us = 0;
ZH_LOGI("AC dimmer deinitialization completed successfully."); ZH_LOGI("AC dimmer deinitialization completed successfully.");
return ESP_OK; return ESP_OK;
@@ -127,8 +119,6 @@ static esp_err_t _zh_ac_dimmer_validate_config(const zh_ac_dimmer_init_config_t
ZH_ERROR_CHECK((config->zero_cross_gpio >= GPIO_NUM_0 && config->zero_cross_gpio < GPIO_NUM_MAX), ESP_ERR_INVALID_ARG, NULL, "Zero cross GPIO invalid."); ZH_ERROR_CHECK((config->zero_cross_gpio >= GPIO_NUM_0 && config->zero_cross_gpio < GPIO_NUM_MAX), ESP_ERR_INVALID_ARG, NULL, "Zero cross GPIO invalid.");
ZH_ERROR_CHECK((config->triac_gpio >= GPIO_NUM_0 && config->triac_gpio < GPIO_NUM_MAX), ESP_ERR_INVALID_ARG, NULL, "Triac GPIO invalid."); ZH_ERROR_CHECK((config->triac_gpio >= GPIO_NUM_0 && config->triac_gpio < GPIO_NUM_MAX), ESP_ERR_INVALID_ARG, NULL, "Triac GPIO invalid.");
ZH_ERROR_CHECK((config->zero_cross_gpio != config->triac_gpio), ESP_ERR_INVALID_ARG, NULL, "Both GPIO is same."); ZH_ERROR_CHECK((config->zero_cross_gpio != config->triac_gpio), ESP_ERR_INVALID_ARG, NULL, "Both GPIO is same.");
ZH_ERROR_CHECK((config->ac_frequency >= 50 && config->ac_frequency <= 400), ESP_ERR_INVALID_ARG, NULL, "AC frequency invalid.");
ZH_ERROR_CHECK((config->glitch_filter != 0), ESP_ERR_INVALID_ARG, NULL, "Glitch filter invalid.");
return ESP_OK; return ESP_OK;
} }
@@ -197,17 +187,11 @@ static void IRAM_ATTR _zh_ac_dimmer_isr_handler(void *arg)
return; return;
} }
uint64_t _current_us = esp_timer_get_time(); uint64_t _current_us = esp_timer_get_time();
if (_current_us - _prev_us <= (1000000 / (_init_config.ac_frequency * 2)) * 0.9) if (_current_us - _prev_us <= (1250 * 0.9)) // 90% of zero crossing period (1250 µs) at 400 Hz.
// if (_current_us - _prev_us <= 1000)
{ {
// _prev_us = _current_us;
return; return;
} }
// if (_is_zero_crossing == false)
// {
// _is_zero_crossing = true;
gpio_set_level(_init_config.triac_gpio, 0); gpio_set_level(_init_config.triac_gpio, 0);
// _current_period_us = _current_us - _prev_us;
_prev_us = _current_us; _prev_us = _current_us;
if (_dimmer_value != 0) if (_dimmer_value != 0)
{ {
@@ -216,44 +200,11 @@ static 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;
} }
// _alarm_config.alarm_count = (uint64_t)((((1250 - 360) / 100) * (100 - _dimmer_value))); _alarm_config.alarm_count = (uint64_t)((((1250 - 330) / 100) * (100 - _dimmer_value)) + 330); // 330 is 50% of zero crossing time (by logic analyser).
_alarm_config.alarm_count = (uint64_t)(((1000000 / (_init_config.ac_frequency * 200)) * (100 - _dimmer_value)));
// _alarm_config.alarm_count = (uint64_t)((_current_period_us / 100) * (100 - _dimmer_value));
_alarm_config.flags.auto_reload_on_alarm = false; _alarm_config.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);
} }
// }
// gpio_set_level(_init_config.triac_gpio, 0);
// _current_period_us = _current_us - _prev_us;
// _prev_us = _current_us;
// gpio_set_level(_init_config.triac_gpio, 0);
// uint64_t _current_us = esp_timer_get_time();
// _current_period_us = (uint32_t)(_current_us - _prev_us);
// _prev_us = _current_us;
// if (_current_period_us < 1000)
// {
// if (_current_period_us > 50)
// {
// _zero_cross_us = (uint16_t)_current_period_us;
// }
// _current_period_us = _prev_period_us;
// }
// _prev_period_us = _current_period_us;
// if (_dimmer_value != 0)
// {
// if (_dimmer_value == 100)
// {
// gpio_set_level(_init_config.triac_gpio, 1);
// return;
// }
// // _alarm_config.alarm_count = (uint64_t)(((_current_period_us / 110) * (100 - _dimmer_value)) + _zero_cross_us);
// _alarm_config.alarm_count = (uint64_t)((1 / (_init_config.ac_frequency * 200)) * (100 - _dimmer_value));
// // _alarm_config.alarm_count = (uint64_t)((_current_period_us / 100) * (100 - _dimmer_value));
// _alarm_config.flags.auto_reload_on_alarm = false;
// gptimer_set_alarm_action(_dimmer_timer, &_alarm_config);
// gptimer_start(_dimmer_timer);
// }
} }
static bool IRAM_ATTR _zh_ac_dimmer_timer_on_alarm_cb(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_ctx) static bool IRAM_ATTR _zh_ac_dimmer_timer_on_alarm_cb(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_ctx)
@@ -261,6 +212,5 @@ static bool IRAM_ATTR _zh_ac_dimmer_timer_on_alarm_cb(gptimer_handle_t timer, co
gpio_set_level(_init_config.triac_gpio, 1); gpio_set_level(_init_config.triac_gpio, 1);
gptimer_stop(_dimmer_timer); gptimer_stop(_dimmer_timer);
gptimer_set_raw_count(_dimmer_timer, 0); gptimer_set_raw_count(_dimmer_timer, 0);
// _is_zero_crossing = false;
return true; return true;
} }