fixed save state and recover from reset

maccoylton · May 21, 2020 · b7e5982 · b7e5982
1 parent 8daa716
commit b7e5982
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/components/UDPlogger b/components/UDPlogger
diff --git a/components/esp-homekit b/components/esp-homekit
diff --git a/components/esp-homekit-common-functions b/components/esp-homekit-common-functions
diff --git a/components/esp-wifi-config b/components/esp-wifi-config
diff --git a/components/esp-wolfssl b/components/esp-wolfssl
diff --git a/src/main.c b/src/main.c
@@ -60,6 +60,8 @@ homekit_characteristic_t wifi_check_interval   = HOMEKIT_CHARACTERISTIC_(CUSTOM_
 /* checks the wifi is connected and flashes status led to indicated connected */
 homekit_characteristic_t task_stats   = HOMEKIT_CHARACTERISTIC_(CUSTOM_TASK_STATS, false , .setter=task_stats_set);
 homekit_characteristic_t wifi_reset   = HOMEKIT_CHARACTERISTIC_(CUSTOM_WIFI_RESET, false, .setter=wifi_reset_set);
+homekit_characteristic_t ota_beta     = HOMEKIT_CHARACTERISTIC_(CUSTOM_OTA_BETA, false, .setter=ota_beta_set);
+homekit_characteristic_t lcm_beta    = HOMEKIT_CHARACTERISTIC_(CUSTOM_LCM_BETA, false, .setter=lcm_beta_set);
 
 homekit_characteristic_t ota_trigger  = API_OTA_TRIGGER;
 homekit_characteristic_t name         = HOMEKIT_CHARACTERISTIC_(NAME, DEVICE_NAME);
@@ -97,6 +99,7 @@ void button_single_press_callback(uint8_t gpio, void* args, uint8_t param) {
     switch_on.value.bool_value = !switch_on.value.bool_value;
     relay_write(switch_on.value.bool_value, RELAY_GPIO);
     homekit_characteristic_notify(&switch_on, switch_on.value);
+    sdk_os_timer_arm (&save_timer, SAVE_DELAY, 0 );
 }
 
 
@@ -160,6 +163,8 @@ homekit_accessory_t *accessories[] = {
             &switch_on,
             &ota_trigger,
             &wifi_reset,
+            &ota_beta,
+            &lcm_beta,
             &task_stats,
             &wifi_check_interval,
             NULL
@@ -199,7 +204,10 @@ void accessory_init_not_paired (void) {
 
 void accessory_init (void ){
     /* initalise anything you don't want started until wifi and pairing is confirmed */
+    load_characteristic_from_flash(&switch_on);
+    load_characteristic_from_flash(&wifi_check_interval);
     homekit_characteristic_notify(&switch_on, switch_on.value);
+    homekit_characteristic_notify(&wifi_check_interval, wifi_check_interval.value);
 }
 
 void user_init(void) {
+43 −52		CMakeLists.txt
+1 −1		Kconfig
+8 −0		README.md
+1 −1		component.mk
+4 −0		src/constants.h
+33 −22		src/crypto.c
+8 −10		src/crypto.h
+4 −1		src/json.c
+47 −46		src/mdnsresponder.c
+0 −22		src/pairing.c
+3 −5		src/pairing.h
+183 −244		src/server.c
+91 −105		src/storage.c
+10 −8		src/storage.h
+1 −1		tools/gen_qrcode
+1 −0		tools/requirements.txt
+12 −11		colour_conversion/colour_conversion.c
+1 −1		colour_conversion/colour_conversion.h
+60 −0		custom_characteristics/custom_characteristics.c
+130 −0		custom_characteristics/custom_characteristics.h
+47 −12		rgbw_lights/rgbw_lights.c
+5 −0		rgbw_lights/rgbw_lights.h
+106 −14		shared_functions/shared_functions.c
+16 −1		shared_functions/shared_functions.h
+1 −0		wolfssl-4.1.0/wolfssl/wolfcrypt/settings.h
+2 −0		wolfssl-4.1.0/wolfssl/wolfcrypt/types.h