movement: simple UI for entering wearer location

diff --git a/movement/watch_faces/complications/sunrise_sunset_face.c b/movement/watch_faces/complications/sunrise_sunset_face.c
index 7b52eac0b68494d3a4dbb9379da37e4d6a5a896f..5c47d5d0c53fc438225f3922467dd2f90268d6c8 100644 (file)
--- a/movement/watch_faces/complications/sunrise_sunset_face.c
+++ b/movement/watch_faces/complications/sunrise_sunset_face.c
@@ -37,14 +37,19 @@ static void _sunrise_sunset_face_update(movement_settings_t *settings) {
     char buf[14];
     double rise, set, minutes;
     // TODO: allow user to set location, using New York for now.
-    double lat = 40.730610;
-    double lon = -73.935242;
+    movement_location_t movement_location = (movement_location_t) watch_get_backup_data(1);
 
     // TODO: account for time zone, currently only operates in GMT.
     watch_date_time date_time = watch_rtc_get_date_time(); // the current date / time
+    watch_date_time utc_now = watch_utility_date_time_convert_zone(date_time, movement_timezone_offsets[settings->bit.time_zone] * 60, 0); // the current date / time in UTC
     watch_date_time scratch_time; // scratchpad, contains different values at different times
     scratch_time.reg = date_time.reg;
-        
+    int16_t lat_centi = (int16_t)movement_location.bit.latitude;
+    int16_t lon_centi = (int16_t)movement_location.bit.longitude;
+
+    double lat = (double)lat_centi / 100.0;
+    double lon = (double)lon_centi / 100.0;
+
     for(int i = 0; i < 2; i++) {
         uint8_t result = sun_rise_set(scratch_time.unit.year + WATCH_RTC_REFERENCE_YEAR, scratch_time.unit.month, scratch_time.unit.day, lon, lat, &rise, &set);
 
@@ -66,7 +71,7 @@ static void _sunrise_sunset_face_update(movement_settings_t *settings) {
         scratch_time.unit.minute = floor(minutes);
         scratch_time.unit.second = 60.0 * fmod(minutes, 1);
 
-        if (date_time.reg < scratch_time.reg) {
+        if (utc_now.reg < scratch_time.reg) {
             // display today's sunrise, it hasn't happened yet
             scratch_time = watch_utility_date_time_convert_zone(scratch_time, 0, movement_timezone_offsets[settings->bit.time_zone] * 60);
             sprintf(buf, "rI%2d%2d%02d%02d", scratch_time.unit.day, scratch_time.unit.hour, scratch_time.unit.minute, scratch_time.unit.second);
@@ -79,7 +84,7 @@ static void _sunrise_sunset_face_update(movement_settings_t *settings) {
         scratch_time.unit.minute = floor(minutes);
         scratch_time.unit.second = 60.0 * fmod(minutes, 1);
 
-        if (date_time.reg < scratch_time.reg) {
+        if (utc_now.reg < scratch_time.reg) {
             // display today's sunset, it hasn't happened yet
             scratch_time = watch_utility_date_time_convert_zone(scratch_time, 0, movement_timezone_offsets[settings->bit.time_zone] * 60);
             sprintf(buf, "SE%2d%02d%02d%02d", scratch_time.unit.day, scratch_time.unit.hour, scratch_time.unit.minute, scratch_time.unit.second);
@@ -87,6 +92,7 @@ static void _sunrise_sunset_face_update(movement_settings_t *settings) {
             return;
         }
 
+
         // it's after sunset. we need to display sunrise for tomorrow.
         uint32_t timestamp = watch_utility_date_time_to_unix_time(date_time, 0);
         timestamp += 86400;
@@ -94,6 +100,136 @@ static void _sunrise_sunset_face_update(movement_settings_t *settings) {
     }
 }
 
+static int16_t _sunrise_sunset_face_latlon_from_struct(sunrise_sunset_lat_lon_settings_t val) {
+    int16_t retval = (val.sign ? -1 : 1) *
+                        (
+                            val.hundreds * 10000 +
+                            val.tens * 1000 +
+                            val.ones * 100 +
+                            val.tenths * 10 +
+                            val.hundredths
+                        );
+    return retval;
+}
+
+static sunrise_sunset_lat_lon_settings_t _sunrise_sunset_face_struct_from_latlon(int16_t val) {
+    sunrise_sunset_lat_lon_settings_t retval;
+
+    if (val < 0) retval.sign = 1;
+    val = abs(val);
+    retval.hundredths = val % 10;
+    val /= 10;
+    retval.tenths = val % 10;
+    val /= 10;
+    retval.ones = val % 10;
+    val /= 10;
+    retval.tens = val % 10;
+    val /= 10;
+    retval.hundreds = val % 10;
+
+    return retval;
+}
+
+static void _sunrise_sunset_face_update_location_register(sunrise_sunset_state_t *state) {
+    if (state->location_changed) {
+        movement_location_t movement_location;
+        int16_t lat = _sunrise_sunset_face_latlon_from_struct(state->working_latitude);
+        int16_t lon = _sunrise_sunset_face_latlon_from_struct(state->working_longitude);
+        movement_location.bit.latitude = lat;
+        movement_location.bit.longitude = lon;
+        watch_store_backup_data(movement_location.reg, 1);
+        state->location_changed = false;
+    }
+}
+
+static void _sunrise_sunset_face_update_settings_display(movement_event_t event, sunrise_sunset_state_t *state) {
+    char buf[12];
+
+    switch (state->page) {
+        case 1:
+            sprintf(buf, "LA  %c %04d", state->working_latitude.sign ? '-' : 'F', abs(_sunrise_sunset_face_latlon_from_struct(state->working_latitude))); // F looks sorta like a plus sign in position 1
+            break;
+        case 2:
+            sprintf(buf, "LO  %c%05d", state->working_longitude.sign ? '-' : 'F', abs(_sunrise_sunset_face_latlon_from_struct(state->working_longitude)));
+            break;
+    }
+    if (event.subsecond % 2) {
+        buf[state->active_digit + 4] = ' ';
+    }
+    watch_display_string(buf, 0);
+}
+
+static void _sunrise_sunset_face_advance_digit(sunrise_sunset_state_t *state) {
+    state->location_changed = true;
+    switch (state->page) {
+        case 1: // latitude
+            switch (state->active_digit) {
+                case 0:
+                    state->working_latitude.sign++;
+                    break;
+                case 1:
+                    // we skip this digit
+                    break;
+                case 2:
+                    state->working_latitude.tens = (state->working_latitude.tens + 1) % 10;
+                    if (abs(_sunrise_sunset_face_latlon_from_struct(state->working_latitude)) > 9000) {
+                        // prevent latitude from going over ±90.
+                        // TODO: perform these checks when advancing the digit?
+                        state->working_latitude.ones = 0;
+                        state->working_latitude.tenths = 0;
+                        state->working_latitude.hundredths = 0;
+                    }
+                    break;
+                case 3:
+                    state->working_latitude.ones = (state->working_latitude.ones + 1) % 10;
+                    if (abs(_sunrise_sunset_face_latlon_from_struct(state->working_latitude)) > 9000) state->working_latitude.ones = 0;
+                    break;
+                case 4:
+                    state->working_latitude.tenths = (state->working_latitude.tenths + 1) % 10;
+                    if (abs(_sunrise_sunset_face_latlon_from_struct(state->working_latitude)) > 9000) state->working_latitude.tenths = 0;
+                    break;
+                case 5:
+                    state->working_latitude.hundredths = (state->working_latitude.hundredths + 1) % 10;
+                    if (abs(_sunrise_sunset_face_latlon_from_struct(state->working_latitude)) > 9000) state->working_latitude.hundredths = 0;
+                    break;
+            }
+            break;
+        case 2: // longitude
+            switch (state->active_digit) {
+                case 0:
+                    state->working_longitude.sign++;
+                    break;
+                case 1:
+                    state->working_longitude.hundreds = (state->working_longitude.hundreds + 1) % 10;
+                    if (abs(_sunrise_sunset_face_latlon_from_struct(state->working_longitude)) > 18000) {
+                        // prevent longitude from going over ±180
+                        state->working_longitude.tens = 8;
+                        state->working_longitude.ones = 0;
+                        state->working_longitude.tenths = 0;
+                        state->working_longitude.hundredths = 0;
+                    }
+                    break;
+                case 2:
+                    state->working_longitude.tens = (state->working_longitude.tens + 1) % 10;
+                    if (abs(_sunrise_sunset_face_latlon_from_struct(state->working_longitude)) > 18000) state->working_longitude.tens = 0;
+                    break;
+                case 3:
+                    state->working_longitude.ones = (state->working_longitude.ones + 1) % 10;
+                    if (abs(_sunrise_sunset_face_latlon_from_struct(state->working_longitude)) > 18000) state->working_longitude.ones = 0;
+                    break;
+                case 4:
+                    state->working_longitude.tenths = (state->working_longitude.tenths + 1) % 10;
+                    if (abs(_sunrise_sunset_face_latlon_from_struct(state->working_longitude)) > 18000) state->working_longitude.tenths = 0;
+                    break;
+                case 5:
+                    state->working_longitude.hundredths = (state->working_longitude.hundredths + 1) % 10;
+                    if (abs(_sunrise_sunset_face_latlon_from_struct(state->working_longitude)) > 18000) state->working_longitude.hundredths = 0;
+                    break;
+            }
+            break;
+    }
+}
+
 void sunrise_sunset_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) {
     (void) settings;
     (void) watch_face_index;
@@ -107,13 +243,12 @@ void sunrise_sunset_face_activate(movement_settings_t *settings, void *context)
     (void) settings;
     sunrise_sunset_state_t *state = (sunrise_sunset_state_t *)context;
     movement_location_t movement_location = (movement_location_t) watch_get_backup_data(1);
-    state->latitude = movement_location.bit.latitude;
-    state->longitude = movement_location.bit.longitude;
+    state->working_latitude = _sunrise_sunset_face_struct_from_latlon(movement_location.bit.latitude);
+    state->working_longitude = _sunrise_sunset_face_struct_from_latlon(movement_location.bit.longitude);
 }
 
 bool sunrise_sunset_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
-    (void) settings;
-    (void) context;
+    sunrise_sunset_state_t *state = (sunrise_sunset_state_t *)context;
 
     switch (event.event_type) {
         case EVENT_ACTIVATE:
@@ -121,22 +256,49 @@ bool sunrise_sunset_face_loop(movement_event_t event, movement_settings_t *setti
             break;
         case EVENT_LOW_ENERGY_UPDATE:
         case EVENT_TICK:
+            if (state->page) _sunrise_sunset_face_update_settings_display(event, state);
             break;
         case EVENT_MODE_BUTTON_UP:
             movement_move_to_next_face();
             break;
         case EVENT_LIGHT_BUTTON_DOWN:
-            movement_illuminate_led();
+            if (state->page) {
+                state->active_digit++;
+                if (state->page == 1 && state->active_digit == 1) state->active_digit++; // max latitude is +- 90, no hundreds place
+                if (state->active_digit > 5) {
+                    state->active_digit = 0;
+                    state->page = (state->page + 1) % 3;
+                    _sunrise_sunset_face_update_location_register(state);
+                }
+                _sunrise_sunset_face_update_settings_display(event, context);
+            } else {
+                movement_illuminate_led();
+            }
+            if (state->page == 0) {
+                movement_request_tick_frequency(1);
+                _sunrise_sunset_face_update(settings);
+            }
             break;
         case EVENT_LIGHT_BUTTON_UP:
             break;
         case EVENT_ALARM_BUTTON_UP:
+            if (state->page) {
+                _sunrise_sunset_face_advance_digit(state);
+                _sunrise_sunset_face_update_settings_display(event, context);
+            }
             break;
         case EVENT_ALARM_LONG_PRESS:
-            // TODO: settings mode, to set the user's location.
+            if (state->page == 0) {
+                state->page++;
+                watch_clear_display();
+                movement_request_tick_frequency(4);
+                _sunrise_sunset_face_update_settings_display(event, context);
+            }
             break;
         case EVENT_TIMEOUT:
-            // TODO: return home if we're on a settings page.
+            if (state->page != 0) {
+                movement_move_to_face(0);
+            }
         default:
             break;
     }
@@ -146,5 +308,8 @@ bool sunrise_sunset_face_loop(movement_event_t event, movement_settings_t *setti
 
 void sunrise_sunset_face_resign(movement_settings_t *settings, void *context) {
     (void) settings;
-    (void) context;
+    sunrise_sunset_state_t *state = (sunrise_sunset_state_t *)context;
+    state->page = 0;
+    state->active_digit = 0;
+    _sunrise_sunset_face_update_location_register(state);
 }

diff --git a/movement/watch_faces/complications/sunrise_sunset_face.h b/movement/watch_faces/complications/sunrise_sunset_face.h
index b73c18fb559cc7bb7a1c691a7fc967a7f7578420..196b9db03d83ec79adbbc1c788a118505fe04a77 100644 (file)
--- a/movement/watch_faces/complications/sunrise_sunset_face.h
+++ b/movement/watch_faces/complications/sunrise_sunset_face.h
@@ -31,8 +31,20 @@
 // TODO: It also functions as an interface for setting the location register, which other watch faces can use for various purposes.
 
 typedef struct {
-    uint16_t latitude;
-    uint16_t longitude;
+    uint8_t sign: 1;    // 0-1
+    uint8_t hundreds: 1;    // 0-1, ignored for latitude
+    uint8_t tens: 4;        // 0-9 (must wrap at 10)
+    uint8_t ones: 4;        // 0-9 (must wrap at 10)
+    uint8_t tenths: 4;      // 0-9 (must wrap at 10)
+    uint8_t hundredths: 4;  // 0-9 (must wrap at 10)
+} sunrise_sunset_lat_lon_settings_t;
+
+typedef struct {
+    uint8_t page;
+    uint8_t active_digit;
+    bool location_changed;
+    sunrise_sunset_lat_lon_settings_t working_latitude;
+    sunrise_sunset_lat_lon_settings_t working_longitude;
 } sunrise_sunset_state_t;
 
 void sunrise_sunset_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr);