key: code refactoring

Author: redchenjs

main/inc/core/os.h

@@ -14,7 +14,6 @@
 typedef enum os_event_group_bits {
     WIFI_READY_BIT  = BIT0,
     WIFI_CONFIG_BIT = BIT1,
-    INPUT_READY_BIT = BIT2,
 } os_event_group_bits_t;
 
 typedef enum user_event_group_bits {

main/src/user/http_app_ota.c

@@ -117,7 +117,6 @@ void http_app_ota_prepare_data(char *buf, int len)
 void http_app_check_for_updates(void)
 {
 #ifdef CONFIG_ENABLE_OTA
-    xEventGroupClearBits(os_event_group, INPUT_READY_BIT);
     ESP_LOGI(TAG, "checking for firmware update...");
     EventBits_t uxBits = xEventGroupSync(
         user_event_group,
@@ -129,6 +128,5 @@ void http_app_check_for_updates(void)
         xEventGroupClearBits(user_event_group, HTTP_APP_OTA_RUN_BIT);
     }
     first_time = 1;
-    xEventGroupSetBits(os_event_group, INPUT_READY_BIT);
 #endif
 }

main/src/user/http_app_token.c

@@ -88,7 +88,6 @@ void http_app_token_prepare_data(char *buf, int len)
 
 void http_app_verify_token(char *token)
 {
-    xEventGroupClearBits(os_event_group, INPUT_READY_BIT);
     data_ptr = token;
     EventBits_t uxBits = xEventGroupSync(
         user_event_group,
@@ -99,5 +98,4 @@ void http_app_verify_token(char *token)
     if ((uxBits & HTTP_APP_TOKEN_READY_BIT) == 0) {
         xEventGroupClearBits(user_event_group, HTTP_APP_TOKEN_RUN_BIT);
     }
-    xEventGroupSetBits(os_event_group, INPUT_READY_BIT);
 }

main/src/user/key.c

@@ -16,22 +16,37 @@
 
 #define TAG "key"
 
-static void key_task(void *pvParameter)
-{
 #ifdef CONFIG_ENABLE_SMARTCONFIG
-    uint16_t count[] = {0};
-    uint8_t gpio_pin[] = {CONFIG_SC_KEY_PIN};
-    uint8_t gpio_val[] = {
+static uint8_t gpio_pin[] = {
+#ifdef CONFIG_ENABLE_SMARTCONFIG
+    CONFIG_SC_KEY_PIN,
+#endif
+};
+
+static uint8_t gpio_val[] = {
 #ifdef CONFIG_SC_KEY_ACTIVE_LOW
-        0
+    0,
 #else
-        1
+    1,
+#endif
+};
+
+static uint16_t gpio_hold[] = {
+#ifdef CONFIG_ENABLE_SMARTCONFIG
+    CONFIG_SC_KEY_HOLD_TIME,
+#endif
+};
+
+static void (*key_handle[])(void) = {
+#ifdef CONFIG_ENABLE_SMARTCONFIG
+    key_smartconfig_handle,
 #endif
-    };
-    uint16_t gpio_hold[] = {CONFIG_SC_KEY_HOLD_TIME};
-    void (*key_handle[])(void) = {key_smartconfig_handle};
+};
 
+static void key_task(void *pvParameter)
+{
     portTickType xLastWakeTime;
+    uint16_t count[sizeof(gpio_pin)] = {0};
 
     for (int i=0; i<sizeof(gpio_pin); i++) {
         gpio_set_direction(gpio_pin[i], GPIO_MODE_INPUT);
@@ -72,13 +87,12 @@ static void key_task(void *pvParameter)
 
         vTaskDelayUntil(&xLastWakeTime, 10 / portTICK_RATE_MS);
     }
-#endif // CONFIG_ENABLE_SMARTCONFIG
 }
 
 void key_init(void)
 {
-    xEventGroupSetBits(os_event_group, INPUT_READY_BIT);
     xEventGroupSetBits(user_event_group, KEY_SCAN_RUN_BIT);
 
     xTaskCreatePinnedToCore(key_task, "KeyT", 2048, NULL, 5, NULL, 1);
 }
+#endif

main/src/user/key_handle.c

@@ -24,14 +24,9 @@
 #ifdef CONFIG_ENABLE_SMARTCONFIG
 void key_smartconfig_handle(void)
 {
-    EventBits_t uxBits = xEventGroupGetBits(os_event_group);
-    if (uxBits & INPUT_READY_BIT) {
-        ESP_LOGI(SC_KEY_TAG, "enter smartconfig mode");
-        xEventGroupClearBits(user_event_group, KEY_SCAN_RUN_BIT);
-    } else {
-        return;
-    }
+    xEventGroupClearBits(user_event_group, KEY_SCAN_RUN_BIT);
 
+    ESP_LOGI(SC_KEY_TAG, "start smartconfig");
     xEventGroupSetBits(os_event_group, WIFI_CONFIG_BIT);
 
     nfc_app_set_mode(0);

main/src/user/ntp.c

@@ -93,7 +93,6 @@ static void ntp_task(void *pvParameter)
 
 void ntp_sync_time(void)
 {
-    xEventGroupClearBits(os_event_group, INPUT_READY_BIT);
     EventBits_t uxBits = xEventGroupGetBits(user_event_group);
     if ((uxBits & NTP_READY_BIT) == 0) {
         xEventGroupSync(
@@ -103,7 +102,6 @@ void ntp_sync_time(void)
             portMAX_DELAY
         );
     }
-    xEventGroupSetBits(os_event_group, INPUT_READY_BIT);
 }
 
 void ntp_init(void)