Merge branch 'feature/use_zcd_selectively' into 'master'

feat: add pause comand to zero_detect component

See merge request ae_group/esp-iot-solution!1191

Author: leeebo

components/zero_detection/CHANGELOG.md

@@ -1,5 +1,11 @@
 # ChangeLog
 
+## v0.0.7 - 2025-1-2
+
+### Enhancements:
+
+- add pause command to zero_detect component
+
 ## v0.0.6 - 2024-9-19
 
 ### Bug Fix:

components/zero_detection/idf_component.yml

@@ -1,4 +1,4 @@
-version: "0.0.6"
+version: "0.0.7"
 description: Zero Cross Detection Driver
 url: https://github.com/espressif/esp-iot-solution/tree/master/components/zero_detection
 repository: https://github.com/espressif/esp-iot-solution.git

components/zero_detection/include/zero_detection.h

@@ -166,6 +166,20 @@ zero_detect_handle_t zero_detect_create(zero_detect_config_t *config);
  */
 void zero_show_data(zero_detect_handle_t zcd_handle);
 
+/**
+ * @brief Pause zero detect
+ *
+ * @param zcd_handle A zero detect handle
+ */
+void zero_detect_pause(zero_detect_handle_t zcd_handle);
+
+/**
+ * @brief Resume zero detect
+ *
+ * @param zcd_handle A zero detect handle
+ */
+void zero_detect_resume(zero_detect_handle_t zcd_handle);
+
 /**
  * @brief Delete a zero detect device
  *

components/zero_detection/zero_detection.c

@@ -28,6 +28,7 @@ typedef struct zero_cross {
 
     bool zero_source_power_invalid;  //Power loss flag when signal source is lost
     bool zero_singal_invaild;        //Signal is in an invalid range
+    bool is_paused;                  //Pause flag for zero cross detection
 
     zero_signal_type_t zero_signal_type;  //Zero crossing signal type
     zero_driver_type_t zero_driver_type;  //Zero crossing driver type
@@ -56,6 +57,9 @@ typedef struct zero_cross {
 static void IRAM_ATTR zero_cross_handle_interrupt(void *user_data, const mcpwm_capture_event_data_t *edata)
 {
     zero_cross_dev_t *zero_cross_dev = user_data;
+    if (zero_cross_dev->is_paused) {
+        return;
+    }
     int gpio_status = 0;
     if (zero_cross_dev->zero_driver_type == GPIO_TYPE) {
         //Retrieve the current GPIO level and determine the rising or falling edge
@@ -188,6 +192,44 @@ static void IRAM_ATTR zero_detect_gpio_cb(void *arg)
     zero_cross_handle_interrupt(arg, &edata);
 }
 
+void zero_detect_pause(zero_detect_handle_t zcd_handle)
+{
+    if (zcd_handle == NULL) {
+        ESP_LOGE(TAG, "ERROR: zcd_handle is NULL");
+        return;
+    }
+    zero_cross_dev_t *zcd = (zero_cross_dev_t *)zcd_handle;
+    zcd->is_paused = true;
+
+#if defined(SOC_MCPWM_SUPPORTED)
+    if (zcd->zero_driver_type == MCPWM_TYPE) {
+        mcpwm_capture_channel_disable(zcd->cap_chan);
+    }
+#endif
+    if (zcd->zero_driver_type == GPIO_TYPE) {
+        gpio_isr_handler_remove(zcd->capture_pin);
+    }
+}
+
+void zero_detect_resume(zero_detect_handle_t zcd_handle)
+{
+    if (zcd_handle == NULL) {
+        ESP_LOGE(TAG, "ERROR: zcd_handle is NULL");
+        return;
+    }
+    zero_cross_dev_t *zcd = (zero_cross_dev_t *)zcd_handle;
+    zcd->is_paused = false;
+
+#if defined(SOC_MCPWM_SUPPORTED)
+    if (zcd->zero_driver_type == MCPWM_TYPE) {
+        mcpwm_capture_channel_enable(zcd->cap_chan);
+    }
+#endif
+    if (zcd->zero_driver_type == GPIO_TYPE) {
+        gpio_isr_handler_add(zcd->capture_pin, zero_detect_gpio_cb, zcd);
+    }
+}
+
 #if defined(CONFIG_USE_GPTIMER)
 static IRAM_ATTR bool zero_source_power_invalid_cb(gptimer_handle_t timer, const gptimer_alarm_event_data_t *edata, void *user_ctx)
 {

examples/zero_cross_detection/main/zero_detect_example_main.c

@@ -162,6 +162,19 @@ void app_main(void)
         vTaskDelay(500 / portTICK_PERIOD_MS);
         zero_show_data(g_zcds);           //Show zero cross data
         printf("EVENT: OUT OF RANGE COUNT:%d OFF COUNT:%d OPEN COUNT:%d\n", freq_out_of_range_count, relay_off_count, relay_open_count);
+
+        // Test pause and resume function
+        if (freq_out_of_range_count > 5) {
+            ESP_LOGI(TAG, "Pausing zero detection......");
+            zero_detect_pause(g_zcds);
+        }
+
+        if (relay_open_count > 5) {
+            ESP_LOGI(TAG, "Resuming zero detection......");
+            zero_detect_resume(g_zcds);
+            relay_open_count = 0;
+        }
+
         if (zcd.relay_suspend) {
             ESP_LOGW(TAG, "Process suspened, please wait till relay open");
         }