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-10-18 12:06:40 +03:00
parent a80f9d64e6
commit b6cc1a0ec8
3 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@@ -4,10 +4,10 @@
void app_main(void) void app_main(void)
{ {
// esp_log_level_set("zh_ac_dimmer", ESP_LOG_NONE); esp_log_level_set("zh_ac_dimmer", ESP_LOG_NONE);
zh_ac_dimmer_init_config_t ac_dimmer_init_config = ZH_AC_DIMMER_INIT_CONFIG_DEFAULT(); zh_ac_dimmer_init_config_t ac_dimmer_init_config = ZH_AC_DIMMER_INIT_CONFIG_DEFAULT();
ac_dimmer_init_config.zero_cross_gpio = GPIO_NUM_1; ac_dimmer_init_config.zero_cross_gpio = GPIO_NUM_16;
ac_dimmer_init_config.triac_gpio = GPIO_NUM_2; ac_dimmer_init_config.triac_gpio = GPIO_NUM_17;
zh_ac_dimmer_init(&ac_dimmer_init_config); zh_ac_dimmer_init(&ac_dimmer_init_config);
zh_ac_dimmer_start(); zh_ac_dimmer_start();
for (;;) for (;;)
@@ -17,7 +17,7 @@ void app_main(void)
zh_ac_dimmer_set(i); zh_ac_dimmer_set(i);
vTaskDelay(100 / portTICK_PERIOD_MS); vTaskDelay(100 / portTICK_PERIOD_MS);
} }
for (uint8_t i = 100; i >= 0; --i) for (uint8_t i = 100; i > 0; --i)
{ {
zh_ac_dimmer_set(i); zh_ac_dimmer_set(i);
vTaskDelay(100 / portTICK_PERIOD_MS); vTaskDelay(100 / portTICK_PERIOD_MS);

4
include/zh_ac_dimmer.h
View File

@@ -10,8 +10,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}
.triac_time = 1}
#ifdef __cplusplus #ifdef __cplusplus
@@ -23,7 +22,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 triac_time; // Triac turn-on time (in microseconds). Depends on the type of triac. Tested on BTA16-600.
} zh_ac_dimmer_init_config_t; } zh_ac_dimmer_init_config_t;
/** /**

48
zh_ac_dimmer.c
View File

@@ -21,14 +21,16 @@ static const char *TAG = "zh_ac_dimmer";
goto tag; \ 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}; static zh_ac_dimmer_init_config_t _init_config = {0};
volatile static bool _is_dimmer_work = false; static bool _is_dimmer_work = false;
volatile static uint64_t _current_micros = 0; static uint64_t _prev_micros = 0;
volatile static uint16_t _current_frequency = 0; static uint16_t _current_frequency = 0;
volatile static uint16_t _old_frequency = 0; static uint16_t _prev_frequency = 0;
volatile static uint8_t _dimmer_value = 0; static uint16_t _zero_cross_time = 0;
static uint8_t _dimmer_value = 0;
static bool _is_initialized = false; static bool _is_initialized = 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);
@@ -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); esp_err_t err = gpio_config(&triac_gpio_config);
ZH_ERROR_CHECK(err == ESP_OK, err, "Triac GPIO configuration failed."); ZH_ERROR_CHECK(err == ESP_OK, err, "Triac GPIO configuration failed.");
gpio_config_t zero_cross_gpio_config = { gpio_config_t zero_cross_gpio_config = {
.intr_type = GPIO_INTR_NEGEDGE , .intr_type = GPIO_INTR_POSEDGE,
.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_DISABLE, .pull_down_en = GPIO_PULLDOWN_DISABLE,
@@ -152,21 +154,18 @@ void IRAM_ATTR _zh_ac_dimmer_isr_handler(void *arg)
return; return;
} }
gpio_set_level(_init_config.triac_gpio, 0); gpio_set_level(_init_config.triac_gpio, 0);
// if (gpio_get_level(_init_config.zero_cross_gpio) == 1) uint64_t _current_micros = esp_timer_get_time();
// { _current_frequency = _current_micros - _prev_micros;
// gpio_set_level(_init_config.triac_gpio, 0); _prev_micros = _current_micros;
// }
// else
// {
uint64_t time = esp_timer_get_time();
_current_frequency = time - _current_micros;
if (_current_frequency < 1000) if (_current_frequency < 1000)
{ {
_current_frequency = _old_frequency; if (_current_frequency > 50)
{
_zero_cross_time = _current_frequency;
} }
// ESP_DRAM_LOGI(TAG, "%d", _current_frequency); _current_frequency = _prev_frequency;
_current_micros = time; }
_old_frequency = _current_frequency; _prev_frequency = _current_frequency;
if (_dimmer_value != 0) if (_dimmer_value != 0)
{ {
if (_dimmer_value == 100) if (_dimmer_value == 100)
@@ -174,15 +173,11 @@ 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); _alarm_config.alarm_count = ((_current_frequency / 105) * (100 - _dimmer_value)) + _zero_cross_time;
gptimer_alarm_config_t alarm_config = { _alarm_config.flags.auto_reload_on_alarm = false;
.alarm_count = (_current_frequency / 100) * (100 - _dimmer_value), gptimer_set_alarm_action(_dimmer_timer, &_alarm_config);
.flags.auto_reload_on_alarm = false,
};
gptimer_set_alarm_action(_dimmer_timer, &alarm_config);
gptimer_start(_dimmer_timer); 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) 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); 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);
// gpio_set_level(_init_config.triac_gpio, 0);
return true; return true;
} }