Hemisphere uses filesystem

diff --git a/watch-faces/complication/moon_phase_face.c b/watch-faces/complication/moon_phase_face.c
index 6d6ac60ec3a55f2d5954ceff2550798d85d26281..d125ef9acbb57b4e5a1c873349478ecae3de35d5 100644 (file)
--- a/watch-faces/complication/moon_phase_face.c
+++ b/watch-faces/complication/moon_phase_face.c
@@ -33,6 +33,7 @@
 #include <math.h>
 #include "moon_phase_face.h"
 #include "watch_utility.h"
+#include "filesystem.h"
 
 #define LUNAR_DAYS 29.53058770576
 #define LUNAR_SECONDS (LUNAR_DAYS * (24 * 60 * 60))
@@ -41,6 +42,12 @@
 
 static const float phase_changes[] = {0, 1, 6.38264692644, 8.38264692644, 13.76529385288, 15.76529385288, 21.14794077932, 23.14794077932, 28.53058770576, 29.53058770576};
 
+static bool is_southern_hemisphere(void) {
+    movement_location_t location = {0};
+    filesystem_read_file("location.u32", (char *) &location.reg, sizeof(movement_location_t));
+    return location.bit.latitude < 0;
+}
+
 void moon_phase_face_setup(uint8_t watch_face_index, void ** context_ptr) {
     (void) watch_face_index;
     if (*context_ptr == NULL) {
@@ -53,11 +60,11 @@ void moon_phase_face_activate(void *context) {
     (void) context;
 }
 
-static void _update(moon_phase_state_t *state, uint32_t offset) {
-    (void)state;
+static void _update(moon_phase_state_t *state) {
     char buf[4];
+    bool southern = state->southern_hemisphere;
     watch_date_time_t date_time = watch_rtc_get_date_time();
-    uint32_t now = watch_utility_date_time_to_unix_time(date_time, movement_get_current_timezone_offset()) + offset;
+    uint32_t now = watch_utility_date_time_to_unix_time(date_time, movement_get_current_timezone_offset()) + state->offset;
     date_time = watch_utility_date_time_from_unix_time(now, movement_get_current_timezone_offset());
     double currentfrac = fmod(now - FIRST_MOON, LUNAR_SECONDS) / LUNAR_SECONDS;
     double currentday = currentfrac * LUNAR_DAYS;
@@ -67,9 +74,6 @@ static void _update(moon_phase_state_t *state, uint32_t offset) {
         if (currentday > phase_changes[phase_index] && currentday <= phase_changes[phase_index + 1]) break;
     }
 
-    movement_location_t loc = (movement_location_t) { .reg = watch_get_backup_data(1) };
-    bool southern = (loc.bit.latitude < 0);
-
     sprintf(buf, "%2d", date_time.unit.day);
     watch_display_text(WATCH_POSITION_TOP_RIGHT, buf);
     switch (phase_index) {
@@ -204,17 +208,21 @@ bool moon_phase_face_loop(movement_event_t event, void *context) {
     switch (event.event_type) {
         case EVENT_ACTIVATE:
             if (watch_sleep_animation_is_running()) watch_stop_sleep_animation();
-            _update(state, state->offset);
+                       state->southern_hemisphere = is_southern_hemisphere();
+            _update(state);
             break;
         case EVENT_TICK:
             // only update once an hour
             date_time = watch_rtc_get_date_time();
-            if ((date_time.unit.minute == 0) && (date_time.unit.second == 0)) _update(state, state->offset);
+            if ((date_time.unit.minute == 0) && (date_time.unit.second == 0)) _update(state);
             break;
         case EVENT_LOW_ENERGY_UPDATE:
             // update at the top of the hour OR if we're entering sleep mode with an offset.
             // also, in sleep mode, always show the current moon phase (offset = 0).
-            if (state->offset || (watch_rtc_get_date_time().unit.minute == 0)) _update(state, 0);
+            if (state->offset || (watch_rtc_get_date_time().unit.minute == 0)) {
+                               state->offset = 0;
+                               _update(state);
+                       }
             // and kill the offset so when the wearer wakes up, it matches what's on screen.
             state->offset = 0;
             if (watch_get_lcd_type() == WATCH_LCD_TYPE_CLASSIC) {
@@ -227,17 +235,17 @@ bool moon_phase_face_loop(movement_event_t event, void *context) {
             // Pressing the alarm adds an offset of one day to the displayed value,
             // so you can see moon phases in the future.
             state->offset += 86400;
-            _update(state, state->offset);
+            _update(state);
             break;
            case EVENT_ALARM_LONG_PRESS:
                state->offset = 0;
-            _update(state, state->offset);
+            _update(state);
                break;
         case EVENT_LIGHT_BUTTON_DOWN:
             break;
         case EVENT_LIGHT_BUTTON_UP:
             state->offset -= 86400;
-            _update(state, state->offset);
+            _update(state);
             break;
         case EVENT_LIGHT_LONG_PRESS:
             movement_illuminate_led();