Revert PR #387 - fixes LE state restoration

This commit caused state restored from backup registers
to be overwritten. It is thereby reverted until a better
solution is found or movement is refactored.

This reverts commit 524098b9258232964d7756d4d44f16b006d340bf.

Reviewed-by: Matheus Afonso Martins Moreira <matheus@matheusmoreira.com>
References: https://github.com/joeycastillo/Sensor-Watch/pull/474

diff --git a/movement/movement.c b/movement/movement.c
index ba21a4e61adb3b0a0c7a7650bac2a16b6c906267..617f79a96042a5068a45cf791c25b8b618be32d4 100644 (file)
--- a/movement/movement.c
+++ b/movement/movement.c
@@ -106,31 +106,6 @@ of debounce time.
 #define MOVEMENT_DEFAULT_LED_DURATION 1
 #endif
 
-// Default to no set location latitude
-#ifndef MOVEMENT_DEFAULT_LATITUDE
-#define MOVEMENT_DEFAULT_LATITUDE 0
-#endif
-
-// Default to no set location longitude
-#ifndef MOVEMENT_DEFAULT_LONGITUDE
-#define MOVEMENT_DEFAULT_LONGITUDE 0
-#endif
-
-// Default to no set birthdate year
-#ifndef MOVEMENT_DEFAULT_BIRTHDATE_YEAR
-#define MOVEMENT_DEFAULT_BIRTHDATE_YEAR 0
-#endif
-
-// Default to no set birthdate month
-#ifndef MOVEMENT_DEFAULT_BIRTHDATE_MONTH
-#define MOVEMENT_DEFAULT_BIRTHDATE_MONTH 0
-#endif
-
-// Default to no set birthdate day
-#ifndef MOVEMENT_DEFAULT_BIRTHDATE_DAY
-#define MOVEMENT_DEFAULT_BIRTHDATE_DAY 0
-#endif
-
 // Default to having DST get set
 #ifndef MOVEMENT_DEFAULT_DST_ACTIVE
 #define MOVEMENT_DEFAULT_DST_ACTIVE true
@@ -541,11 +516,6 @@ void app_init(void) {
     movement_state.settings.bit.to_interval = MOVEMENT_DEFAULT_TIMEOUT_INTERVAL;
     movement_state.settings.bit.le_interval = MOVEMENT_DEFAULT_LOW_ENERGY_INTERVAL;
     movement_state.settings.bit.led_duration = MOVEMENT_DEFAULT_LED_DURATION;
-    movement_state.location.bit.latitude = MOVEMENT_DEFAULT_LATITUDE;
-    movement_state.location.bit.longitude = MOVEMENT_DEFAULT_LONGITUDE;
-    movement_state.birthdate.bit.year = MOVEMENT_DEFAULT_BIRTHDATE_YEAR;
-    movement_state.birthdate.bit.month = MOVEMENT_DEFAULT_BIRTHDATE_MONTH;
-    movement_state.birthdate.bit.day = MOVEMENT_DEFAULT_BIRTHDATE_DAY;
     movement_state.settings.bit.dst_active = MOVEMENT_DEFAULT_DST_ACTIVE;
 
 #ifdef MAKEFILE_TIMEZONE
@@ -584,14 +554,10 @@ void app_init(void) {
 
 void app_wake_from_backup(void) {
     movement_state.settings.reg = watch_get_backup_data(0);
-    movement_state.location.reg = watch_get_backup_data(1);
-    movement_state.birthdate.reg = watch_get_backup_data(2);
 }
 
 void app_setup(void) {
     watch_store_backup_data(movement_state.settings.reg, 0);
-    watch_store_backup_data(movement_state.location.reg, 1);
-    watch_store_backup_data(movement_state.birthdate.reg, 2);
 
     static bool is_first_launch = true;
 

diff --git a/movement/movement.h b/movement/movement.h
index aeece585b83fa775d3e26720bd0777ec0ef969f2..6ca653792e0a0d0b5858f2237f7db7fbd8af113a 100644 (file)
--- a/movement/movement.h
+++ b/movement/movement.h
@@ -245,8 +245,6 @@ typedef struct {
 typedef struct {
     // properties stored in BACKUP register
     movement_settings_t settings;
-    movement_location_t location;
-    movement_birthdate_t birthdate;
 
     // transient properties
     int16_t current_face_idx;

diff --git a/movement/movement_config.h b/movement/movement_config.h
index 566ea3e7185b6896e366c45f893659773c1fe812..46e1d2e4ef00946c56ebb2fe754afe34f3f8811c 100644 (file)
--- a/movement/movement_config.h
+++ b/movement/movement_config.h
@@ -76,15 +76,15 @@ const watch_face_t watch_faces[] = {
 /* Set the timeout before switching to low energy mode
  * Valid values are:
  * 0: Never
- * 1: 10 mins
- * 2: 1 hour
- * 3: 2 hours
- * 4: 6 hours
- * 5: 12 hours
- * 6: 1 day
+ * 1: 1 hour
+ * 2: 2 hours
+ * 3: 6 hours
+ * 4: 12 hours
+ * 5: 1 day
+ * 6: 2 days
  * 7: 7 days
  */
-#define MOVEMENT_DEFAULT_LOW_ENERGY_INTERVAL 2
+#define MOVEMENT_DEFAULT_LOW_ENERGY_INTERVAL 1
 
 /* Set the led duration
  * Valid values are:
@@ -95,22 +95,6 @@ const watch_face_t watch_faces[] = {
  */
 #define MOVEMENT_DEFAULT_LED_DURATION 1
 
-/* The latitude and longitude used for the wearers location
- * Set signed values in 1/100ths of a degree
- */
-#define MOVEMENT_DEFAULT_LATITUDE 0
-#define MOVEMENT_DEFAULT_LONGITUDE 0
-
-/* The wearers birthdate
- * Valid values:
- * Year: 1 - 4095
- * Month: 1 - 12
- * Day: 1 - 31
- */
-#define MOVEMENT_DEFAULT_BIRTHDATE_YEAR 0
-#define MOVEMENT_DEFAULT_BIRTHDATE_MONTH 0
-#define MOVEMENT_DEFAULT_BIRTHDATE_DAY 0
-
 /* Set if using DST
  * Valid values are:
  * false: Don't allow the watch to use DST