modmachine, modesp32: Fixed deep/light sleep.

OSi (Ondrej Sienczak) · OSi (Ondrej Sienczak) · commit 4c7c2b090d8e · 2022-10-12T22:43:17.000+02:00
With ESP32-C3 there is different approach for setting wake-up pins.

Signed-off-by: Ondrej Sienczak &lt;ondrej.sienczak@gmail.com&gt;
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
@@ -65,6 +65,12 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp32_wake_on_touch_obj, esp32_wake_on_touch);
 
 STATIC mp_obj_t esp32_wake_on_ext0(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
 
+    #if CONFIG_IDF_TARGET_ESP32C3
+
+    mp_raise_ValueError(MP_ERROR_TEXT("not supported"));
+
+    #else
+
     if (machine_rtc_config.wake_on_touch) {
         mp_raise_ValueError(MP_ERROR_TEXT("no resources"));
     }
@@ -91,6 +97,8 @@ STATIC mp_obj_t esp32_wake_on_ext0(size_t n_args, const mp_obj_t *pos_args, mp_m
     machine_rtc_config.ext0_level = args[ARG_level].u_bool;
     machine_rtc_config.ext0_wake_types = MACHINE_WAKE_SLEEP | MACHINE_WAKE_DEEPSLEEP;
 
+    #endif
+
     return mp_const_none;
 }
 STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp32_wake_on_ext0_obj, 0, esp32_wake_on_ext0);
diff --git a/ports/esp32/modesp32.h b/ports/esp32/modesp32.h
@@ -1,7 +1,7 @@
 #ifndef MICROPY_INCLUDED_ESP32_MODESP32_H
 #define MICROPY_INCLUDED_ESP32_MODESP32_H
 
-#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3
 
     #define RTC_VALID_EXT_PINS \
     ( \
@@ -30,19 +30,6 @@
     )
     #define RTC_LAST_EXT_PIN 21
 
-#elif CONFIG_IDF_TARGET_ESP32C3
-
-    #define RTC_VALID_EXT_PINS \
-    ( \
-    (1ll << 0) | \
-    (1ll << 1) | \
-    (1ll << 2) | \
-    (1ll << 3) | \
-    (1ll << 4) | \
-    (1ll << 5)   \
-    )
-    #define RTC_LAST_EXT_PIN 5
-
 #else
 
     #define RTC_VALID_EXT_PINS \
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
@@ -137,16 +137,28 @@ STATIC mp_obj_t machine_sleep_helper(wake_type_t wake_type, size_t n_args, const
     #if CONFIG_IDF_TARGET_ESP32C3
 
     if (machine_rtc_config.ext1_pins != 0) {
+        gpio_int_type_t intr_type = machine_rtc_config.ext1_level ? GPIO_INTR_HIGH_LEVEL : GPIO_INTR_LOW_LEVEL;
+
         for (int i = 0; i < GPIO_NUM_MAX; ++i) {
+            gpio_num_t gpio = (gpio_num_t)i;
             uint64_t bm = 1ULL << i;
+
             if (machine_rtc_config.ext1_pins & bm) {
-                gpio_sleep_set_direction((gpio_num_t)i, GPIO_MODE_INPUT);
+                gpio_sleep_set_direction(gpio, GPIO_MODE_INPUT);
+
+                if (MACHINE_WAKE_SLEEP == wake_type) {
+                    gpio_wakeup_enable(gpio, intr_type);
+                }
             }
         }
-        esp_deep_sleep_enable_gpio_wakeup(
-            machine_rtc_config.ext1_pins,
-            machine_rtc_config.ext1_level ? ESP_GPIO_WAKEUP_GPIO_HIGH : ESP_GPIO_WAKEUP_GPIO_LOW);
-        esp_sleep_enable_gpio_wakeup();
+
+        if (MACHINE_WAKE_DEEPSLEEP == wake_type) {
+            esp_deep_sleep_enable_gpio_wakeup(
+                machine_rtc_config.ext1_pins,
+                machine_rtc_config.ext1_level ? ESP_GPIO_WAKEUP_GPIO_HIGH : ESP_GPIO_WAKEUP_GPIO_LOW);
+        } else {
+            esp_sleep_enable_gpio_wakeup();
+        }
     }
 
     #else
