wip:

README.md

@@ -47,16 +47,22 @@ void app_main(void)
     zh_ac_dimmer_init_config_t config = ZH_AC_DIMMER_INIT_CONFIG_DEFAULT();
     config.zero_cross_gpio = GPIO_NUM_16;
     config.triac_gpio = GPIO_NUM_17;
+    config.ac_frequency = 50;
     zh_ac_dimmer_init(&config);
     zh_ac_dimmer_start();
+    uint8_t value = 0;
     for (uint8_t i = 0; i <= 100; ++i)
     {
         zh_ac_dimmer_set(i);
+        zh_ac_dimmer_get(&value);
+        printf("Dimmer value: %d.\n", value);
         vTaskDelay(100 / portTICK_PERIOD_MS);
     }
     for (uint8_t i = 100; i > 0; --i)
     {
         zh_ac_dimmer_set(i);
+        zh_ac_dimmer_get(&value);
+        printf("Dimmer value: %d.\n", value);
         vTaskDelay(100 / portTICK_PERIOD_MS);
     }
     zh_ac_dimmer_stop();

include/zh_ac_dimmer.h

@@ -76,6 +76,15 @@ extern "C"
      */
     esp_err_t zh_ac_dimmer_set(uint8_t value);
 
+    /**
+     * @brief Get AC dimmer dimming value.
+     *
+     * @param[out] value Pointer to dimming value.
+     *
+     * @return ESP_OK if success or an error code otherwise.
+     */
+    esp_err_t zh_ac_dimmer_get(uint8_t *value);
+
 #ifdef __cplusplus
 }
 #endif

version.txt

@@ -1 +1 @@
-1.1.0
+1.3.0

zh_ac_dimmer.c

@@ -18,12 +18,10 @@ static gptimer_alarm_config_t _alarm_config = {0};
 
 static zh_ac_dimmer_init_config_t _init_config = {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 bool _is_dimmer_work = false;
 static bool _is_initialized = false;
+static bool _is_prev_gpio_isr_handler = 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);
@@ -40,8 +38,14 @@ esp_err_t zh_ac_dimmer_init(const zh_ac_dimmer_init_config_t *config)
     err = _zh_ac_dimmer_gpio_init(config);
     ZH_ERROR_CHECK(err == ESP_OK, err, NULL, "AC dimmer initialization failed. GPIO initialization failed.");
     err = _zh_ac_dimmer_timer_init();
-    ZH_ERROR_CHECK(err == ESP_OK, err, gpio_isr_handler_remove(config->zero_cross_gpio); gpio_uninstall_isr_service();
-                   gpio_reset_pin(config->triac_gpio); gpio_reset_pin(config->zero_cross_gpio), "AC dimmer initialization failed. Timer initialization failed.");
+    if (_is_prev_gpio_isr_handler == true)
+    {
+        ZH_ERROR_CHECK(err == ESP_OK, err, gpio_isr_handler_remove(config->zero_cross_gpio); gpio_reset_pin(config->triac_gpio); gpio_reset_pin(config->zero_cross_gpio), "AC dimmer initialization failed. Timer initialization failed.");
+    }
+    else
+    {
+        ZH_ERROR_CHECK(err == ESP_OK, err, gpio_isr_handler_remove(config->zero_cross_gpio); gpio_uninstall_isr_service(); gpio_reset_pin(config->triac_gpio); gpio_reset_pin(config->zero_cross_gpio), "AC dimmer initialization failed. Timer initialization failed.");
+    }
     _init_config = *config;
     _is_initialized = true;
     ZH_LOGI("AC dimmer initialization completed successfully.");
@@ -56,16 +60,16 @@ esp_err_t zh_ac_dimmer_deinit(void)
     gptimer_disable(_dimmer_timer);
     gptimer_del_timer(_dimmer_timer);
     gpio_isr_handler_remove(_init_config.zero_cross_gpio);
+    if (_is_prev_gpio_isr_handler == false)
+    {
         gpio_uninstall_isr_service();
+    }
     gpio_reset_pin(_init_config.triac_gpio);
     gpio_reset_pin(_init_config.zero_cross_gpio);
     _is_dimmer_work = false;
     _is_initialized = false;
     _dimmer_timer = NULL;
     _dimmer_value = 0;
-    _current_period_us = 0;
-    _prev_period_us = 0;
-    _zero_cross_us = 0;
     _prev_us = 0;
     ZH_LOGI("AC dimmer deinitialization completed successfully.");
     return ESP_OK;
@@ -99,7 +103,17 @@ esp_err_t zh_ac_dimmer_set(uint8_t value)
     return ESP_OK;
 }
 
-static esp_err_t _zh_ac_dimmer_validate_config(const zh_ac_dimmer_init_config_t *config)
+esp_err_t zh_ac_dimmer_get(uint8_t *value)
+{
+    ZH_LOGI("AC dimmer getting status begin.");
+    ZH_ERROR_CHECK(value != NULL, ESP_ERR_INVALID_ARG, NULL, "AC dimmer getting status failed. Value is NULL.");
+    ZH_ERROR_CHECK(_is_initialized == true, ESP_ERR_INVALID_STATE, NULL, "AC dimmer getting status failed. AC dimmer is not initialized.");
+    *value = _dimmer_value;
+    ZH_LOGI("AC dimmer getting status completed successfully.");
+    return ESP_OK;
+}
+
+static esp_err_t _zh_ac_dimmer_validate_config(const zh_ac_dimmer_init_config_t *config) //-V2008
 {
     ZH_ERROR_CHECK(config != NULL, ESP_ERR_INVALID_ARG, NULL, "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, NULL, "Zero cross GPIO invalid.");
@@ -124,15 +138,26 @@ static esp_err_t _zh_ac_dimmer_gpio_init(const zh_ac_dimmer_init_config_t *confi
         .intr_type = GPIO_INTR_POSEDGE,
         .mode = GPIO_MODE_INPUT,
         .pin_bit_mask = (1ULL << config->zero_cross_gpio),
-        .pull_down_en = GPIO_PULLDOWN_DISABLE,
+        .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, gpio_reset_pin(config->triac_gpio), "Zero cross GPIO configuration failed.");
     err = gpio_install_isr_service(ESP_INTR_FLAG_LOWMED);
-    ZH_ERROR_CHECK(err == ESP_OK, err, gpio_reset_pin(config->triac_gpio); gpio_reset_pin(config->zero_cross_gpio), "Failed install isr service.")
+    ZH_ERROR_CHECK(err == ESP_OK || err == ESP_ERR_INVALID_STATE, err, gpio_reset_pin(config->triac_gpio); gpio_reset_pin(config->zero_cross_gpio), "Failed install isr service.")
+    if (err == ESP_ERR_INVALID_STATE)
+    {
+        _is_prev_gpio_isr_handler = true;
+    }
     err = gpio_isr_handler_add(config->zero_cross_gpio, _zh_ac_dimmer_isr_handler, NULL);
+    if (_is_prev_gpio_isr_handler == true)
+    {
+        ZH_ERROR_CHECK(err == ESP_OK, err, gpio_reset_pin(config->triac_gpio); gpio_reset_pin(config->zero_cross_gpio), "Failed add isr handler.");
+    }
+    else
+    {
         ZH_ERROR_CHECK(err == ESP_OK, err, gpio_uninstall_isr_service(); gpio_reset_pin(config->triac_gpio); gpio_reset_pin(config->zero_cross_gpio), "Failed add isr handler.");
+    }
     return ESP_OK;
 }
 
@@ -157,23 +182,17 @@ static esp_err_t _zh_ac_dimmer_timer_init(void)
 
 static void IRAM_ATTR _zh_ac_dimmer_isr_handler(void *arg)
 {
-    if (_is_dimmer_work == false)
+    uint64_t _current_us = esp_timer_get_time();
+    if (_current_us - _prev_us <= (1250 * 0.9)) // 90% of zero crossing period (1250 µs) at 400 Hz.
     {
         return;
     }
     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 (_is_dimmer_work == false)
     {
-        if (_current_period_us > 50)
-        {
-            _zero_cross_us = (uint16_t)_current_period_us;
+        return;
     }
-        _current_period_us = _prev_period_us;
-    }
-    _prev_period_us = _current_period_us;
     if (_dimmer_value != 0)
     {
         if (_dimmer_value == 100)
@@ -181,10 +200,10 @@ static void IRAM_ATTR _zh_ac_dimmer_isr_handler(void *arg)
             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)((((1250 - 330) / 100) * (100 - _dimmer_value)) + 330); // 330 is 50% of zero crossing time (by logic analyser).
         _alarm_config.flags.auto_reload_on_alarm = false;
-        gptimer_set_alarm_action(_dimmer_timer, &_alarm_config); // This function is allowed to run within ISR context.
-        gptimer_start(_dimmer_timer);                            // This function is allowed to run within ISR context.
+        gptimer_set_alarm_action(_dimmer_timer, &_alarm_config);
+        gptimer_start(_dimmer_timer);
     }
 }