key: split wakeup & sleep key

Author: redchenjs

main/Kconfig.projbuild

@@ -125,35 +125,57 @@ config ENABLE_WAKEUP_KEY
     help
         Select this to enable WakeUp Key.
 
-config USE_WAKEUP_KEY_FOR_SLEEP
-    bool "Use WakeUp Key for Sleep"
-    default n
-    depends on ENABLE_WAKEUP_KEY
-    help
-        Select whether to use WakeUp Key for Sleep.
-
 config WAKEUP_KEY_HOLD_TIME
     int "WakeUp Key Hold Time (ms)"
-    default 2000
+    default 1000
     depends on ENABLE_WAKEUP_KEY
 
-choice WAKEUP_KEY_MODE
-    prompt "WakeUp Key Mode"
-    default WAKEUP_KEY_MODE_LOW
+choice WAKEUP_KEY_ACTIVE_LEVEL
+    prompt "WakeUp Key Active Level"
+    default WAKEUP_KEY_ACTIVE_LOW
     depends on ENABLE_WAKEUP_KEY
     help
-        Select WakeUp Key Mode.
+        Select WakeUp Key Active Level.
 
-config WAKEUP_KEY_MODE_HIGH
-    bool "High level is pressed"
-config WAKEUP_KEY_MODE_LOW
-    bool "Low level is pressed"
+config WAKEUP_KEY_ACTIVE_HIGH
+    bool "Active High"
+config WAKEUP_KEY_ACTIVE_LOW
+    bool "Active Low"
 endchoice
 
 config WAKEUP_KEY_PIN
     int "WakeUp Key Pin"
     default 0
     depends on ENABLE_WAKEUP_KEY
+
+config ENABLE_SLEEP_KEY
+    bool "Enable Sleep Key"
+    default n
+    help
+        Select this to enable Sleep Key.
+
+config SLEEP_KEY_HOLD_TIME
+    int "Sleep Key Hold Time (ms)"
+    default 1000
+    depends on ENABLE_SLEEP_KEY
+
+choice SLEEP_KEY_ACTIVE_LEVEL
+    prompt "Sleep Key Active Level"
+    default SLEEP_KEY_ACTIVE_LOW
+    depends on ENABLE_SLEEP_KEY
+    help
+        Select Sleep Key Active Level.
+
+config SLEEP_KEY_ACTIVE_HIGH
+    bool "Active High"
+config SLEEP_KEY_ACTIVE_LOW
+    bool "Active Low"
+endchoice
+
+config SLEEP_KEY_PIN
+    int "Sleep Key Pin"
+    default 0
+    depends on ENABLE_SLEEP_KEY
 endmenu
 
 menu "Audio Configuration"

main/src/os/core.c

@@ -23,7 +23,7 @@ void os_enter_sleep_mode(void)
 {
     ESP_LOGI(TAG, "entering sleep mode");
 
-#ifdef CONFIG_WAKEUP_KEY_MODE_LOW
+#ifdef CONFIG_WAKEUP_KEY_ACTIVE_LOW
     esp_sleep_enable_ext1_wakeup(1ULL << CONFIG_WAKEUP_KEY_PIN, ESP_EXT1_WAKEUP_ALL_LOW);
 #else
     esp_sleep_enable_ext1_wakeup(1ULL << CONFIG_WAKEUP_KEY_PIN, ESP_EXT1_WAKEUP_ANY_HIGH);
@@ -41,7 +41,7 @@ void core_init(void)
     if (esp_sleep_get_wakeup_cause() != ESP_SLEEP_WAKEUP_UNDEFINED) {
         vTaskDelayUntil(&xLastWakeTime, CONFIG_WAKEUP_KEY_HOLD_TIME / portTICK_RATE_MS);
 
-#ifdef CONFIG_WAKEUP_KEY_MODE_LOW
+#ifdef CONFIG_WAKEUP_KEY_ACTIVE_LOW
         if (gpio_get_level(CONFIG_WAKEUP_KEY_PIN) == 0) {
 #else
         if (gpio_get_level(CONFIG_WAKEUP_KEY_PIN) == 1) {

main/src/os/init.c

@@ -55,7 +55,7 @@ void user_init(void)
     led_init();
 #endif
 
-#ifdef CONFIG_USE_WAKEUP_KEY_FOR_SLEEP
+#ifdef CONFIG_ENABLE_SLEEP_KEY
     key_init();
 #endif
 

main/src/user/key.c

@@ -17,7 +17,7 @@
 
 #define TAG "key"
 
-#ifdef CONFIG_USE_WAKEUP_KEY_FOR_SLEEP
+#ifdef CONFIG_ENABLE_SLEEP_KEY
 static void key_sleep_handle(void)
 {
     xEventGroupClearBits(user_event_group, KEY_SCAN_BIT);
@@ -33,21 +33,21 @@ static void key_sleep_handle(void)
 
     os_enter_sleep_mode();
 }
-#endif // CONFIG_USE_WAKEUP_KEY_FOR_SLEEP
+#endif // CONFIG_ENABLE_SLEEP_KEY
 
 static void key_task_handle(void *pvParameter)
 {
-#ifdef CONFIG_USE_WAKEUP_KEY_FOR_SLEEP
+#ifdef CONFIG_ENABLE_SLEEP_KEY
     uint16_t count[] = {0};
-    uint8_t gpio_pin[] = {CONFIG_WAKEUP_KEY_PIN};
+    uint8_t gpio_pin[] = {CONFIG_SLEEP_KEY_PIN};
     uint8_t gpio_val[] = {
-#ifdef CONFIG_WAKEUP_KEY_MODE_LOW
+#ifdef CONFIG_SLEEP_KEY_ACTIVE_LOW
         0
 #else
         1
 #endif
     };
-    uint16_t gpio_hold[] = {CONFIG_WAKEUP_KEY_HOLD_TIME};
+    uint16_t gpio_hold[] = {CONFIG_SLEEP_KEY_HOLD_TIME};
     void (*key_handle[])(void) = {key_sleep_handle};
 
     portTickType xLastWakeTime;
@@ -89,7 +89,7 @@ static void key_task_handle(void *pvParameter)
 
         vTaskDelayUntil(&xLastWakeTime, 10 / portTICK_RATE_MS);
     }
-#endif // CONFIG_USE_WAKEUP_KEY_FOR_SLEEP
+#endif // CONFIG_ENABLE_SLEEP_KEY
 }
 
 void key_init(void)