From 79a04c7fe66abd2b35cd7348f68d2e127453e58f Mon Sep 17 00:00:00 2001 From: Alexey Zholtikov Date: Wed, 15 Oct 2025 12:51:12 +0300 Subject: [PATCH] wip: --- CMakeLists.txt | 2 +- README.md | 25 ++- include/zh_ac_dimmer.h | 10 +- zh_ac_dimmer.c | 355 +++++++++++++---------------------------- 4 files changed, 144 insertions(+), 248 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca1303b..93d7f5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1 +1 @@ -idf_component_register(SRCS "zh_ac_dimmer.c" INCLUDE_DIRS "include" REQUIRES driver) \ No newline at end of file +idf_component_register(SRCS "zh_ac_dimmer.c" INCLUDE_DIRS "include" REQUIRES driver esp_timer) \ No newline at end of file diff --git a/README.md b/README.md index 3df3e4d..4492659 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,26 @@ # esp_component_template -esp_component_template \ No newline at end of file +#include "zh_ac_dimmer.h" + +void app_main(void) +{ + // 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(); + ac_dimmer_init_config.zero_cross_gpio = GPIO_NUM_1; + ac_dimmer_init_config.triac_gpio = GPIO_NUM_2; + zh_ac_dimmer_init(&ac_dimmer_init_config); + zh_ac_dimmer_start(); + for (;;) + { + for (uint8_t i = 0; i <= 100; ++i) + { + zh_ac_dimmer_set(i); + vTaskDelay(100 / portTICK_PERIOD_MS); + } + for (uint8_t i = 100; i >= 0; --i) + { + zh_ac_dimmer_set(i); + vTaskDelay(100 / portTICK_PERIOD_MS); + } + } +} \ No newline at end of file diff --git a/include/zh_ac_dimmer.h b/include/zh_ac_dimmer.h index 96abb27..0323357 100644 --- a/include/zh_ac_dimmer.h +++ b/include/zh_ac_dimmer.h @@ -1,11 +1,9 @@ #pragma once -// #include "stdio.h" -// #include "avr_err.h" -// #include "avr_port.h" -// #include "stdbool.h" -// #include "avr/interrupt.h" -// #include "util/delay.h" +#include "freertos/FreeRTOS.h" +#include "freertos/task.h" +#include "driver/gptimer.h" +#include "esp_timer.h" #include "esp_log.h" #include "driver/gpio.h" diff --git a/zh_ac_dimmer.c b/zh_ac_dimmer.c index 54c3896..8c64399 100644 --- a/zh_ac_dimmer.c +++ b/zh_ac_dimmer.c @@ -21,29 +21,21 @@ static const char *TAG = "zh_ac_dimmer"; goto tag; \ } +gptimer_handle_t _dimmer_timer = NULL; + 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 uint8_t _dimmer_value = 0; -volatile static uint8_t _dimmer_count = 0; static bool _is_initialized = false; -volatile 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_gpio_init(const zh_ac_dimmer_init_config_t *config); static esp_err_t _zh_ac_dimmer_interrupt_init(const zh_ac_dimmer_init_config_t *config); -static esp_err_t _zh_ac_dimmer_resources_init(const zh_ac_dimmer_init_config_t *config); -static esp_err_t _zh_ac_dimmer_task_create(const zh_ac_dimmer_init_config_t *config); - +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_processing_task(void *pvParameter); - -// static esp_err_t _zh_avr_ac_dimmer_timer_init(void); - -// static esp_err_t _zh_pcf8574_validate_config(const zh_pcf8574_init_config_t *config); -// static esp_err_t _zh_pcf8574_configure_i2c_device(const zh_pcf8574_init_config_t *config, zh_pcf8574_handle_t *handle); -// static esp_err_t _zh_pcf8574_configure_interrupts(const zh_pcf8574_init_config_t *config, zh_pcf8574_handle_t handle); -// static void _zh_pcf8574_isr_handler(void *arg); -// static void _zh_pcf8574_isr_processing_task(void *pvParameter); +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) { @@ -55,10 +47,8 @@ esp_err_t zh_ac_dimmer_init(const zh_ac_dimmer_init_config_t *config) ZH_ERROR_CHECK(err == ESP_OK, err, "AC dimmer initialization failed. GPIO initialization failed."); err = _zh_ac_dimmer_interrupt_init(config); ZH_ERROR_CHECK(err == ESP_OK, err, "AC dimmer initialization failed. Interrupt initialization failed."); - err = _zh_ac_dimmer_resources_init(config); - ZH_ERROR_CHECK(err == ESP_OK, err, "AC dimmer initialization failed. Resources initialization failed."); - err = _zh_ac_dimmer_task_create(config); - ZH_ERROR_CHECK(err == ESP_OK, err, "AC dimmer initialization failed. Task initialization failed."); + err = _zh_ac_dimmer_timer_init(); + ZH_ERROR_CHECK(err == ESP_OK, err, "AC dimmer initialization failed. Timer initialization failed."); _init_config = *config; _is_initialized = true; ZH_LOGI("AC dimmer initialization completed successfully."); @@ -67,8 +57,8 @@ esp_err_t zh_ac_dimmer_init(const zh_ac_dimmer_init_config_t *config) esp_err_t zh_ac_dimmer_start(void) { + ZH_LOGI("AC dimmer start begin."); ZH_ERROR_CHECK(_is_initialized == true, ESP_ERR_INVALID_STATE, "AC dimmer start failed. AC dimmer is not initialized."); - // TODO. Check AC frequency. _is_dimmer_work = true; ZH_LOGI("AC dimmer start completed successfully."); return ESP_OK; @@ -76,6 +66,7 @@ esp_err_t zh_ac_dimmer_start(void) esp_err_t zh_ac_dimmer_stop(void) { + ZH_LOGI("AC dimmer stop begin."); ZH_ERROR_CHECK(_is_initialized == true, ESP_ERR_INVALID_STATE, "AC dimmer stop failed. AC dimmer is not initialized."); _is_dimmer_work = false; ZH_LOGI("AC dimmer stop completed successfully."); @@ -84,233 +75,117 @@ esp_err_t zh_ac_dimmer_stop(void) esp_err_t zh_ac_dimmer_set(uint8_t value) { - ZH_ERROR_CHECK(value <= 100, ESP_ERR_INVALID_ARG, "AC dimmer setup failed. AC dimmer is not initialized."); + ZH_LOGI("AC dimmer setup begin."); + ZH_ERROR_CHECK(_is_initialized == true, ESP_ERR_INVALID_STATE, "AC dimmer stop failed. AC dimmer is not initialized."); + ZH_ERROR_CHECK(value <= 100, ESP_ERR_INVALID_ARG, "AC dimmer setup failed. Dimming value invalid."); _dimmer_value = value; ZH_LOGI("AC dimmer setup completed successfully."); return ESP_OK; } -// void zh_avr_ac_dimmer_isr_handler(void) -// { -// bool flag = false; -// switch (_init_config.zero_cross_port) -// { -// case AVR_PORTB: -// if ((PINB & (1 << _init_config.zero_cross_gpio)) == (1 << _init_config.zero_cross_gpio)) -// { -// ZH_ZERO_CROSSING_ON; -// } -// if ((PINB & (1 << _init_config.zero_cross_gpio)) == 0) -// { -// ZH_ZERO_CROSSING_OFF; -// } -// break; -// case AVR_PORTC: -// if ((PINC & (1 << _init_config.zero_cross_gpio)) == (1 << _init_config.zero_cross_gpio)) -// { -// ZH_ZERO_CROSSING_ON; -// } -// if ((PINC & (1 << _init_config.zero_cross_gpio)) == 0) -// { -// ZH_ZERO_CROSSING_OFF; -// } -// break; -// case AVR_PORTD: -// if ((PIND & (1 << _init_config.zero_cross_gpio)) == (1 << _init_config.zero_cross_gpio)) -// { -// ZH_ZERO_CROSSING_ON; -// } -// if ((PIND & (1 << _init_config.zero_cross_gpio)) == 0) -// { -// ZH_ZERO_CROSSING_OFF; -// } -// break; -// default: -// break; -// } -// if (_is_dimmer_work == true && flag == true) -// { -// if (_dimmer_value != 0) -// { -// if (_dimmer_value == 100) -// { -// TIMSK0 &= ~(1 << OCIE0A); -// switch (_init_config.triac_port) -// { -// case AVR_PORTB: -// PORTB |= (1 << _init_config.triac_gpio); -// break; -// case AVR_PORTC: -// PORTC |= (1 << _init_config.triac_gpio); -// break; -// case AVR_PORTD: -// PORTD |= (1 << _init_config.triac_gpio); -// break; -// default: -// break; -// } -// } -// else -// { -// TCNT0 = 0; -// TIFR0 = (1 << OCF0A); -// TIMSK0 |= (1 << OCIE0A); -// } -// } -// } -// } +esp_err_t _zh_ac_dimmer_validate_config(const zh_ac_dimmer_init_config_t *config) +{ + ZH_ERROR_CHECK(config != NULL, ESP_ERR_INVALID_ARG, "Initial config is NULL."); + ZH_ERROR_CHECK((config->zero_cross_gpio >= GPIO_NUM_0 && config->zero_cross_gpio <= GPIO_NUM_MAX), ESP_ERR_INVALID_ARG, "Zero cross GPIO invalid."); + ZH_ERROR_CHECK((config->triac_gpio >= GPIO_NUM_0 && config->triac_gpio <= GPIO_NUM_MAX), ESP_ERR_INVALID_ARG, "Triac GPIO invalid."); + ZH_ERROR_CHECK((config->zero_cross_gpio != config->triac_gpio), ESP_ERR_INVALID_ARG, "Both GPIO is same."); + return ESP_OK; +} -// static esp_err_t _zh_avr_ac_dimmer_validate_config(const zh_avr_ac_dimmer_init_config_t *config) -// { -// ZH_ERROR_CHECK(config != NULL, AVR_ERR_INVALID_ARG); -// ZH_ERROR_CHECK((config->zero_cross_gpio >= 0 && config->zero_cross_gpio <= 7), AVR_ERR_INVALID_ARG); -// ZH_ERROR_CHECK((config->triac_gpio >= 0 && config->triac_gpio <= 7), AVR_ERR_INVALID_ARG); -// ZH_ERROR_CHECK(config->zero_cross_port >= AVR_PORTB && config->zero_cross_port <= AVR_PORTD, AVR_ERR_INVALID_ARG); -// ZH_ERROR_CHECK(config->triac_port >= AVR_PORTB && config->triac_port <= AVR_PORTD, AVR_ERR_INVALID_ARG); -// ZH_ERROR_CHECK(config->ac_dimmer_frequency >= ZH_50HZ && config->ac_dimmer_frequency <= ZH_400HZ, AVR_ERR_INVALID_ARG); -// return ESP_OK; -// } +esp_err_t _zh_ac_dimmer_gpio_init(const zh_ac_dimmer_init_config_t *config) +{ + gpio_config_t triac_gpio_config = { + .intr_type = GPIO_INTR_DISABLE, + .mode = GPIO_MODE_OUTPUT, + .pin_bit_mask = (1ULL << config->triac_gpio), + .pull_down_en = GPIO_PULLDOWN_ENABLE, + .pull_up_en = GPIO_PULLUP_DISABLE, + }; + 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_ANYEDGE, + .mode = GPIO_MODE_INPUT, + .pin_bit_mask = (1ULL << config->zero_cross_gpio), + .pull_down_en = GPIO_PULLDOWN_ENABLE, + .pull_up_en = GPIO_PULLUP_DISABLE, + }; + err = gpio_config(&zero_cross_gpio_config); + ZH_ERROR_CHECK(err == ESP_OK, err, "Zero cross GPIO configuration failed."); + gpio_set_level(_init_config.triac_gpio, 0); + return ESP_OK; +} -// static void _zh_avr_ac_dimmer_gpio_init(void) -// { -// switch (_init_config.zero_cross_port) -// { -// case AVR_PORTB: -// DDRB &= ~(1 << _init_config.zero_cross_gpio); -// PORTB |= (1 << _init_config.zero_cross_gpio); -// PCICR |= (1 << PCIE0); -// PCMSK0 |= (1 << _init_config.zero_cross_gpio); -// break; -// case AVR_PORTC: -// DDRC &= ~(1 << _init_config.zero_cross_gpio); -// PORTC |= (1 << _init_config.zero_cross_gpio); -// PCICR |= (1 << PCIE1); -// PCMSK1 |= (1 << _init_config.zero_cross_gpio); -// break; -// case AVR_PORTD: -// DDRD &= ~(1 << _init_config.zero_cross_gpio); -// PORTD |= (1 << _init_config.zero_cross_gpio); -// PCICR |= (1 << PCIE2); -// PCMSK2 |= (1 << _init_config.zero_cross_gpio); -// break; -// default: -// break; -// } -// switch (_init_config.triac_port) -// { -// case AVR_PORTB: -// DDRB |= (1 << _init_config.triac_gpio); -// PORTB &= ~(1 << _init_config.triac_gpio); -// break; -// case AVR_PORTC: -// DDRC |= (1 << _init_config.triac_gpio); -// PORTC &= ~(1 << _init_config.triac_gpio); -// break; -// case AVR_PORTD: -// DDRD |= (1 << _init_config.triac_gpio); -// PORTD &= ~(1 << _init_config.triac_gpio); -// break; -// default: -// break; -// } -// } +esp_err_t _zh_ac_dimmer_interrupt_init(const zh_ac_dimmer_init_config_t *config) +{ + esp_err_t err = gpio_install_isr_service(ESP_INTR_FLAG_LOWMED); + ZH_ERROR_CHECK(err == ESP_OK, err, "Failed install isr service.") + err = gpio_isr_handler_add(config->zero_cross_gpio, _zh_ac_dimmer_isr_handler, NULL); + ZH_ERROR_CHECK(err == ESP_OK, err, "Failed add isr handler."); + return ESP_OK; +} -// static esp_err_t _zh_avr_ac_dimmer_timer_init(void) -// { -// // Frequency calculator http://rcl-radio.ru/?p=111487. -// TCCR0A |= (1 << WGM01); -// switch (F_CPU) -// { -// case 8000000: // When operating from an internal RC generator, frequency deviation of up to 5% is possible. -// switch (_init_config.ac_dimmer_frequency) -// { -// case ZH_50HZ: -// OCR0A = 94; // Timer tick every 0,00009524 sec. -// TCCR0B |= (1 << CS01); -// break; -// case ZH_60HZ: // Timer tick every 0,00007937 sec. -// OCR0A = 78; -// TCCR0B |= (1 << CS01); -// break; -// case ZH_400HZ: // Timer tick every 0,0000119 sec. -// OCR0A = 94; -// TCCR0B |= (1 << CS00); -// break; -// default: -// break; -// } -// break; -// case 16000000: -// switch (_init_config.ac_dimmer_frequency) -// { -// case ZH_50HZ: // Timer tick every 0,0001 sec. -// OCR0A = 24; -// TCCR0B |= (1 << CS01) | (1 << CS00); -// break; -// case ZH_60HZ: // Timer tick every 0,00008333 sec. -// OCR0A = 165; -// TCCR0B |= (1 << CS01); -// break; -// case ZH_400HZ: // Timer tick every 0,0000125 sec. -// OCR0A = 24; -// TCCR0B |= (1 << CS01); -// break; -// default: -// break; -// } -// break; -// case 20000000: -// switch (_init_config.ac_dimmer_frequency) -// { -// case ZH_50HZ: // Timer tick every 0,0001 sec. -// OCR0A = 249; -// TCCR0B |= (1 << CS01); -// break; -// case ZH_60HZ: // Timer tick every 0,00008333 sec. -// OCR0A = 207; -// TCCR0B |= (1 << CS01); -// break; -// case ZH_400HZ: // Timer tick every 0,0000125 sec. -// OCR0A = 249; -// TCCR0B |= (1 << CS00); -// break; -// default: -// break; -// } -// break; -// default: -// return AVR_ERR_INVALID_ARG; -// break; -// } -// return ESP_OK; -// } +esp_err_t _zh_ac_dimmer_timer_init(void) +{ + gptimer_config_t timer_config = { + .clk_src = GPTIMER_CLK_SRC_DEFAULT, + .direction = GPTIMER_COUNT_UP, + .resolution_hz = 1 * 1000 * 1000, + }; + 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."); + return ESP_OK; +} -// ISR(TIMER0_COMPA_vect) -// { -// ++_dimmer_count; -// if (_dimmer_count == (100 - _dimmer_value)) -// { -// _dimmer_count = 0; -// TIMSK0 &= ~(1 << OCIE0A); -// switch (_init_config.triac_port) -// { -// case AVR_PORTB: -// PORTB |= (1 << _init_config.triac_gpio); -// _delay_us(ZH_TRIAC_TIME); -// PORTB &= ~(1 << _init_config.triac_gpio); -// break; -// case AVR_PORTC: -// PORTC |= (1 << _init_config.triac_gpio); -// _delay_us(ZH_TRIAC_TIME); -// PORTC &= ~(1 << _init_config.triac_gpio); -// case AVR_PORTD: -// PORTD |= (1 << _init_config.triac_gpio); -// _delay_us(ZH_TRIAC_TIME); -// PORTD &= ~(1 << _init_config.triac_gpio); -// break; -// default: -// break; -// } -// } -// TIFR0 = (1 << OCF0A); -// } \ No newline at end of file +void IRAM_ATTR _zh_ac_dimmer_isr_handler(void *arg) +{ + if (_is_dimmer_work == false) + { + return; + } + if (gpio_get_level(_init_config.zero_cross_gpio) == 1) + { + gpio_set_level(_init_config.triac_gpio, 0); + if (_current_micros == 0) + { + return; + } + _current_frequency = esp_timer_get_time() - _current_micros; + } + else + { + _current_micros = esp_timer_get_time(); + if (_current_frequency == 0) + { + return; + } + if (_dimmer_value != 0) + { + if (_dimmer_value == 100) + { + gpio_set_level(_init_config.triac_gpio, 1); + return; + } + 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); + } + } +} + +bool IRAM_ATTR _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); + return false; +} \ No newline at end of file