Fix reconnect issues when changing device type

Author: romasku

src/device_config/config_nv.c

@@ -34,8 +34,6 @@ void device_config_write_to_nv() {
   }
 }
 
-void device_config_remove_from_nv() { hal_nvm_delete(NV_ITEM_DEVICE_CONFIG); }
-
 void device_config_read_from_nv() {
   hal_nvm_status_t st = 0;
 

src/device_config/config_parser.c

@@ -13,6 +13,7 @@
 #include "base_components/led.h"
 #include "base_components/network_indicator.h"
 #include "config_nv.h"
+#include "device_config/reset.h"
 #include "hal/system.h"
 #include "hal/zigbee.h"
 #include "hal/zigbee_ota.h"
@@ -52,12 +53,11 @@ uint8_t relay_clusters_cnt = 0;
 hal_zigbee_cluster clusters[32];
 hal_zigbee_endpoint endpoints[10];
 
-void reset_to_default_config();
 uint32_t parse_int(const char *s);
 char *seek_until(char *cursor, char needle);
 char *extract_next_entry(char **cursor);
 
-void onResetClicked(void *_) { hal_zigbee_leave_network(); }
+void on_reset_clicked(void *_) { reset_all(); }
 
 void parse_config() {
   device_config_read_from_nv();
@@ -68,7 +68,7 @@ void parse_config() {
   basic_cluster.manuName[0] = strlen(zb_manufacturer);
   if (basic_cluster.manuName[0] > 31) {
     printf("Manufacturer too big\r\n");
-    reset_to_default_config();
+    reset_all();
   }
   memcpy(basic_cluster.manuName + 1, zb_manufacturer,
          basic_cluster.manuName[0]);
@@ -77,7 +77,7 @@ void parse_config() {
   basic_cluster.modelId[0] = strlen(zb_model);
   if (basic_cluster.modelId[0] > 31) {
     printf("Model too big\r\n");
-    reset_to_default_config();
+    reset_all();
   }
   memcpy(basic_cluster.modelId + 1, zb_model, basic_cluster.modelId[0]);
 
@@ -93,7 +93,7 @@ void parse_config() {
       buttons[buttons_cnt].pin = pin;
       buttons[buttons_cnt].long_press_duration_ms = 2000;
       buttons[buttons_cnt].multi_press_duration_ms = 800;
-      buttons[buttons_cnt].on_long_press = onResetClicked;
+      buttons[buttons_cnt].on_long_press = on_reset_clicked;
       buttons_cnt++;
     } else if (entry[0] == 'L') {
       hal_gpio_pin_t pin = hal_gpio_parse_pin(entry + 1);
@@ -277,12 +277,6 @@ void init_reporting() {
 
 // Helper functions
 
-__attribute__((noreturn)) void reset_to_default_config() {
-  printf("RESET reset_to_default_config\r\n");
-  device_config_remove_from_nv();
-  hal_system_reset();
-}
-
 char *seek_until(char *cursor, char needle) {
   while (*cursor != needle && *cursor != '\0') {
     cursor++;

src/device_config/reset.c

@@ -0,0 +1,11 @@
+
+#include "reset.h"
+#include "hal/nvm.h"
+#include "hal/printf_selector.h"
+#include "hal/system.h"
+
+__attribute__((noreturn)) void reset_all() {
+  printf("RESET ALL!\r\n");
+  hal_nvm_clear_all();
+  hal_system_reset();
+}

src/device_config/reset.h

@@ -0,0 +1,7 @@
+#ifndef RESET_H
+#define RESET_H
+
+__attribute__((noreturn)) void reset_all();
+void leave_network();
+
+#endif // RESET_H

src/silabs/zigbee.slcp

@@ -36,6 +36,8 @@ source:
 - {path: ../device_config/config_parser.c}
 - {path: ../device_config/config_parser.h}
 - {path: ../device_config/nvm_items.h}
+- {path: ../device_config/reset.c}
+- {path: ../device_config/reset.h}
 - {path: ../zigbee/basic_cluster.c}
 - {path: ../zigbee/general_commands.c}
 - {path: ../zigbee/group_cluster.c}

src/silabs/zigbee_end_device.slcp

@@ -36,6 +36,8 @@ source:
 - {path: ../device_config/config_parser.c}
 - {path: ../device_config/config_parser.h}
 - {path: ../device_config/nvm_items.h}
+- {path: ../device_config/reset.c}
+- {path: ../device_config/reset.h}
 - {path: ../zigbee/basic_cluster.c}
 - {path: ../zigbee/general_commands.c}
 - {path: ../zigbee/group_cluster.c}

src/stub/Makefile

@@ -49,6 +49,7 @@ SOURCES := \
 	$(SRC_DIR)/base_components/network_indicator.c \
 	$(SRC_DIR)/device_config/config_parser.c \
 	$(SRC_DIR)/device_config/config_nv.c \
+	$(SRC_DIR)/device_config/reset.c \
 	$(SRC_DIR)/zigbee/basic_cluster.c \
 	$(SRC_DIR)/zigbee/relay_cluster.c \
 	$(SRC_DIR)/zigbee/switch_cluster.c \

src/telink/Makefile

@@ -145,6 +145,7 @@ COMMON_SOURCES := \
 	$(SRC_DIR)/base_components/network_indicator.c \
 	$(SRC_DIR)/base_components/relay.c \
 	$(SRC_DIR)/device_config/config_nv.c \
+	$(SRC_DIR)/device_config/reset.c \
 	$(SRC_DIR)/device_config/config_parser.c \
 	$(SRC_DIR)/zigbee/basic_cluster.c \
 	$(SRC_DIR)/zigbee/general_commands.c \

src/telink/main.c

@@ -64,10 +64,8 @@ int real_main(startup_state_e state) {
       if (timerEvt) {
         sleepDuration = timerEvt->timeout;
       }
-      printf("Enter low power (%d ms)\r\n", sleepDuration);
       drv_pm_sleep(PM_SLEEP_MODE_SUSPEND,
                    PM_WAKEUP_SRC_PAD | PM_WAKEUP_SRC_TIMER, sleepDuration);
-      printf("Exit low power\r\n");
     }
 #endif
   }

src/zigbee/switch_cluster.c

@@ -5,7 +5,10 @@
 #include "consts.h"
 #include "device_config/nvm_items.h"
 #include "hal/nvm.h"
+
 #include "hal/printf_selector.h"
+#include "hal/system.h"
+#include "hal/tasks.h"
 #include "relay_cluster.h"
 #include "zigbee_commands.h"
 
@@ -371,10 +374,19 @@ void switch_cluster_on_button_long_press(zigbee_switch_cluster *cluster) {
                                       ZCL_ATTR_MULTISTATE_INPUT_PRESENT_VALUE);
 }
 
+hal_task_t restart_task;
+
+void reset_tasks_handler(void *arg) { hal_system_reset(); }
+
 void switch_cluster_on_button_multi_press(zigbee_switch_cluster *cluster,
                                           uint8_t press_count) {
   if (press_count > MULTI_PRESS_CNT_TO_RESET) {
     hal_zigbee_leave_network();
+    // Give it time to leave network before restart
+    restart_task.handler = reset_tasks_handler;
+    restart_task.arg = NULL;
+    hal_tasks_init(&restart_task);
+    hal_tasks_schedule(&restart_task, 2000);
   }
 }