Merge branch 'main' of github.com:joeycastillo/Sensor-Watch into mars-clock

14 files changed, 1170 insertions, 12 deletions

diff --git a/movement/watch_faces/clock/mars_time_face.c b/movement/watch_faces/clock/mars_time_face.c
index 264f714f..609d461b 100644
--- a/movement/watch_faces/clock/mars_time_face.c
+++ b/movement/watch_faces/clock/mars_time_face.c
@@ -108,6 +108,7 @@ static void _update(movement_settings_t *settings, mars_time_state_t *state) {
 
 void mars_time_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) {
     (void) settings;
+    (void) watch_face_index;
     if (*context_ptr == NULL) {
         *context_ptr = malloc(sizeof(mars_time_state_t));
         memset(*context_ptr, 0, sizeof(mars_time_state_t));
diff --git a/movement/watch_faces/complication/astronomy_face.c b/movement/watch_faces/complication/astronomy_face.c
new file mode 100644
index 00000000..50e5221b
--- /dev/null
+++ b/movement/watch_faces/complication/astronomy_face.c
@@ -0,0 +1,280 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 Joey Castillo
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <math.h>
+#include "astronomy_face.h"
+#include "watch_utility.h"
+
+#if __EMSCRIPTEN__
+#include <emscripten.h>
+#endif
+
+#define NUM_AVAILABLE_BODIES 9
+
+static const char astronomy_available_celestial_bodies[NUM_AVAILABLE_BODIES] = {
+    ASTRO_BODY_SUN,
+    ASTRO_BODY_MERCURY,
+    ASTRO_BODY_VENUS,
+    ASTRO_BODY_MOON,
+    ASTRO_BODY_MARS,
+    ASTRO_BODY_JUPITER,
+    ASTRO_BODY_SATURN,
+    ASTRO_BODY_URANUS,
+    ASTRO_BODY_NEPTUNE
+};
+
+static const char astronomy_celestial_body_names[NUM_AVAILABLE_BODIES][3] = {
+    "SO",   // Sol
+    "ME",   // Mercury
+    "VE",   // Venus
+    "LU",   // Moon (Luna)
+    "MA",   // Mars
+    "JU",   // Jupiter
+    "SA",   // Saturn
+    "UR",   // Uranus
+    "NE"    // Neptune
+};
+
+static void _astronomy_face_recalculate(movement_settings_t *settings, astronomy_state_t *state) {
+#if __EMSCRIPTEN__
+    int16_t browser_lat = EM_ASM_INT({
+        return lat;
+    });
+    int16_t browser_lon = EM_ASM_INT({
+        return lon;
+    });
+    if ((watch_get_backup_data(1) == 0) && (browser_lat || browser_lon)) {
+        movement_location_t browser_loc;
+        browser_loc.bit.latitude = browser_lat;
+        browser_loc.bit.longitude = browser_lon;
+        watch_store_backup_data(browser_loc.reg, 1);
+        double lat = (double)browser_lat / 100.0;
+        double lon = (double)browser_lon / 100.0;
+        state->latitude_radians = astro_degrees_to_radians(lat);
+        state->longitude_radians = astro_degrees_to_radians(lon);
+    }
+#endif
+
+    watch_date_time date_time = watch_rtc_get_date_time();
+    uint32_t timestamp = watch_utility_date_time_to_unix_time(date_time, movement_timezone_offsets[settings->bit.time_zone] * 60);
+    date_time = watch_utility_date_time_from_unix_time(timestamp, 0);
+    double jd = astro_convert_date_to_julian_date(date_time.unit.year + WATCH_RTC_REFERENCE_YEAR, date_time.unit.month, date_time.unit.day, date_time.unit.hour, date_time.unit.minute, date_time.unit.second);
+
+    astro_equatorial_coordinates_t radec_precession = astro_get_ra_dec(jd, astronomy_available_celestial_bodies[state->active_body_index], state->latitude_radians, state->longitude_radians, true);
+    printf("\nParams to convert: %f %f %f %f %f\n",
+            jd,
+            astro_radians_to_degrees(state->latitude_radians),
+            astro_radians_to_degrees(state->longitude_radians),
+            astro_radians_to_degrees(radec_precession.right_ascension),
+            astro_radians_to_degrees(radec_precession.declination));
+
+    astro_horizontal_coordinates_t horiz = astro_ra_dec_to_alt_az(jd, state->latitude_radians, state->longitude_radians, radec_precession.right_ascension, radec_precession.declination);
+    astro_equatorial_coordinates_t radec = astro_get_ra_dec(jd, astronomy_available_celestial_bodies[state->active_body_index], state->latitude_radians, state->longitude_radians, false);
+    state->altitude = astro_radians_to_degrees(horiz.altitude);
+    state->azimuth = astro_radians_to_degrees(horiz.azimuth);
+    state->right_ascension = astro_radians_to_hms(radec.right_ascension);
+    state->declination = astro_radians_to_dms(radec.declination);
+    state->distance = radec.distance;
+
+    printf("Calculated coordinates for %s on %f: \n\tRA  = %f / %2dh %2dm %2ds\n\tDec = %f / %3d° %3d' %3d\"\n\tAzi = %f\n\tAlt = %f\n\tDst = %f AU\n",
+            astronomy_celestial_body_names[state->active_body_index],
+            jd,
+            astro_radians_to_degrees(radec.right_ascension),
+            state->right_ascension.hours,
+            state->right_ascension.minutes,
+            state->right_ascension.seconds,
+            astro_radians_to_degrees(radec.declination),
+            state->declination.degrees,
+            state->declination.minutes,
+            state->declination.seconds,
+            state->altitude,
+            state->azimuth,
+            state->distance);
+}
+
+static void _astronomy_face_update(movement_event_t event, movement_settings_t *settings, astronomy_state_t *state) {
+    char buf[16];
+    switch (state->mode) {
+        case ASTRONOMY_MODE_SELECTING_BODY:
+            watch_clear_colon();
+            watch_display_string(" Astro", 4);
+            if (event.subsecond % 2) {
+                watch_display_string((char *)astronomy_celestial_body_names[state->active_body_index], 0);
+            } else {
+                watch_display_string("  ", 0);
+            }
+            if (event.subsecond == 0) {
+                watch_display_string("  ", 2);
+                switch (state->animation_state) {
+                    case 0:
+                        watch_set_pixel(0, 7);
+                        watch_set_pixel(2, 6);
+                        break;
+                    case 1:
+                        watch_set_pixel(1, 7);
+                        watch_set_pixel(2, 9);
+                        break;
+                    case 2:
+                        watch_set_pixel(2, 7);
+                        watch_set_pixel(0, 9);
+                        break;
+                }
+                state->animation_state = (state->animation_state + 1) % 3;
+            }
+            break;
+        case ASTRONOMY_MODE_CALCULATING:
+            watch_clear_display();
+             // this takes a moment and locks the UI, flash C for "Calculating"
+            watch_start_character_blink('C', 100);
+            _astronomy_face_recalculate(settings, state);
+            watch_stop_blink();
+            state->mode = ASTRONOMY_MODE_DISPLAYING_ALT;
+            // fall through
+        case ASTRONOMY_MODE_DISPLAYING_ALT:
+            sprintf(buf, "%saL%6d", astronomy_celestial_body_names[state->active_body_index], (int16_t)round(state->altitude * 100));
+            watch_display_string(buf, 0);
+            break;
+        case ASTRONOMY_MODE_DISPLAYING_AZI:
+            sprintf(buf, "%saZ%6d", astronomy_celestial_body_names[state->active_body_index], (int16_t)round(state->azimuth * 100));
+            watch_display_string(buf, 0);
+            break;
+        case ASTRONOMY_MODE_DISPLAYING_RA:
+            watch_set_colon();
+            sprintf(buf, "ra H%02d%02d%02d", state->right_ascension.hours, state->right_ascension.minutes, state->right_ascension.seconds);
+            watch_display_string(buf, 0);
+            break;
+        case ASTRONOMY_MODE_DISPLAYING_DEC:
+            watch_clear_colon();
+            sprintf(buf, "de %3d%2d%2d", state->declination.degrees, state->declination.minutes, state->declination.seconds);
+            watch_display_string(buf, 0);
+            break;
+        case ASTRONOMY_MODE_DISPLAYING_DIST:
+            if (state->distance >= 0.00668456) {
+                // if >= 1,000,000 kilometers (all planets), we display distance in AU.
+                sprintf(buf, "diAU%6d", (uint16_t)round(state->distance * 100));
+            } else {
+                // otherwise distance in kilometers fits in 6 digits. This mode will only happen for Luna.
+                sprintf(buf, "di K%6ld", (uint32_t)round(state->distance * 149597871.0));
+            }
+            watch_display_string(buf, 0);
+            break;
+        case ASTRONOMY_MODE_NUM_MODES:
+            // this case does not happen, but we need it to silence a warning.
+            break;
+    }
+}
+
+void astronomy_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) {
+    (void) settings;
+    (void) watch_face_index;
+    if (*context_ptr == NULL) {
+        *context_ptr = malloc(sizeof(astronomy_state_t));
+        memset(*context_ptr, 0, sizeof(astronomy_state_t));
+    }
+}
+
+void astronomy_face_activate(movement_settings_t *settings, void *context) {
+    (void) settings;
+    astronomy_state_t *state = (astronomy_state_t *)context;
+    movement_location_t movement_location = (movement_location_t) watch_get_backup_data(1);
+    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;
+    state->latitude_radians = astro_degrees_to_radians(lat);
+    state->longitude_radians = astro_degrees_to_radians(lon);
+
+    movement_request_tick_frequency(4);
+}
+
+bool astronomy_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
+    astronomy_state_t *state = (astronomy_state_t *)context;
+
+    switch (event.event_type) {
+        case EVENT_ACTIVATE:
+        case EVENT_TICK:
+            _astronomy_face_update(event, settings, state);
+            break;
+        case EVENT_MODE_BUTTON_UP:
+            // You shouldn't need to change this case; Mode almost always moves to the next watch face.
+            movement_move_to_next_face();
+            break;
+        case EVENT_LIGHT_BUTTON_UP:
+            // If you have other uses for the Light button, you can opt not to illuminate the LED for this event.
+            movement_illuminate_led();
+            break;
+        case EVENT_ALARM_BUTTON_UP:
+            switch (state->mode) {
+                case ASTRONOMY_MODE_SELECTING_BODY:
+                    // advance to next celestial body (move to calculations with a long press)
+                    state->active_body_index = (state->active_body_index + 1) % NUM_AVAILABLE_BODIES;
+                    break;
+                case ASTRONOMY_MODE_CALCULATING:
+                    // ignore button press during calculations
+                    break;
+                case ASTRONOMY_MODE_DISPLAYING_DIST:
+                    // at last mode, wrap around
+                    state->mode = ASTRONOMY_MODE_DISPLAYING_ALT;
+                    break;
+                default:
+                    // otherwise, advance to next mode
+                    state->mode++;
+                    break;
+            }
+            _astronomy_face_update(event, settings, state);
+            break;
+        case EVENT_ALARM_LONG_PRESS:
+            if (state->mode == ASTRONOMY_MODE_SELECTING_BODY) {
+                // celestial body selected! this triggers a calculation in the update method.
+                state->mode = ASTRONOMY_MODE_CALCULATING;
+                movement_request_tick_frequency(1);
+                _astronomy_face_update(event, settings, state);
+            } else if (state->mode != ASTRONOMY_MODE_CALCULATING) {
+                // in all modes except "doing a calculation", return to the selection screen.
+                state->mode = ASTRONOMY_MODE_SELECTING_BODY;
+                movement_request_tick_frequency(4);
+            _astronomy_face_update(event, settings, state);
+            }
+            break;
+        case EVENT_TIMEOUT:
+            movement_move_to_face(0);
+            break;
+        case EVENT_LOW_ENERGY_UPDATE:
+            // TODO?
+            break;
+        default:
+            break;
+    }
+
+    return true;
+}
+
+void astronomy_face_resign(movement_settings_t *settings, void *context) {
+    (void) settings;
+    astronomy_state_t *state = (astronomy_state_t *)context;
+    state->mode = ASTRONOMY_MODE_SELECTING_BODY;
+}
diff --git a/movement/watch_faces/complication/astronomy_face.h b/movement/watch_faces/complication/astronomy_face.h
new file mode 100644
index 00000000..f956955b
--- /dev/null
+++ b/movement/watch_faces/complication/astronomy_face.h
@@ -0,0 +1,68 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 Joey Castillo
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef ASTRONOMY_FACE_H_
+#define ASTRONOMY_FACE_H_
+
+#include "movement.h"
+#include "astrolib.h"
+
+typedef enum {
+    ASTRONOMY_MODE_SELECTING_BODY = 0,
+    ASTRONOMY_MODE_CALCULATING,
+    ASTRONOMY_MODE_DISPLAYING_ALT,
+    ASTRONOMY_MODE_DISPLAYING_AZI,
+    ASTRONOMY_MODE_DISPLAYING_RA,
+    ASTRONOMY_MODE_DISPLAYING_DEC,
+    ASTRONOMY_MODE_DISPLAYING_DIST,
+    ASTRONOMY_MODE_NUM_MODES
+} astronomy_mode_t;
+
+typedef struct {
+    astronomy_mode_t mode;
+    uint8_t active_body_index;
+    uint8_t animation_state;
+    double latitude_radians;    // this is the user location
+    double longitude_radians;   // but in radians
+    astro_angle_hms_t right_ascension;
+    astro_angle_dms_t declination;
+    double altitude;    // in decimal degrees
+    double azimuth;     // in decimal degrees
+    double distance;    // in AU
+} astronomy_state_t;
+
+void astronomy_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr);
+void astronomy_face_activate(movement_settings_t *settings, void *context);
+bool astronomy_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
+void astronomy_face_resign(movement_settings_t *settings, void *context);
+
+#define astronomy_face ((const watch_face_t){ \
+    astronomy_face_setup, \
+    astronomy_face_activate, \
+    astronomy_face_loop, \
+    astronomy_face_resign, \
+    NULL, \
+})
+
+#endif // ASTRONOMY_FACE_H_
diff --git a/movement/watch_faces/complication/countdown_face.c b/movement/watch_faces/complication/countdown_face.c
index a910e96c..81836f37 100644
--- a/movement/watch_faces/complication/countdown_face.c
+++ b/movement/watch_faces/complication/countdown_face.c
@@ -35,14 +35,6 @@
 #define DEFAULT_MINUTES 3
 
 
-static uint32_t offset_date_time(uint32_t now, int8_t hours, int8_t minutes, int8_t seconds) {
-    uint32_t new = now;
-    new += hours * 60 * 60;
-    new += minutes * 60;
-    new += seconds;
-    return new;
-}
-
 static inline int32_t get_tz_offset(movement_settings_t *settings) {
     return movement_timezone_offsets[settings->bit.time_zone] * 60;
 }
@@ -52,7 +44,7 @@ static void start(countdown_state_t *state, movement_settings_t *settings) {
 
     state->mode = cd_running;
     state->now_ts = watch_utility_date_time_to_unix_time(now, get_tz_offset(settings));
-    state->target_ts = offset_date_time(state->now_ts, 0, state->minutes, state->seconds);
+    state->target_ts = watch_utility_offset_timestamp(state->now_ts, 0, state->minutes, state->seconds);
     watch_date_time target_dt = watch_utility_date_time_from_unix_time(state->target_ts, get_tz_offset(settings));
     movement_schedule_background_task(target_dt);
     watch_set_indicator(WATCH_INDICATOR_BELL);
diff --git a/movement/watch_faces/complication/counter_face.c b/movement/watch_faces/complication/counter_face.c
new file mode 100644
index 00000000..ac0388ab
--- /dev/null
+++ b/movement/watch_faces/complication/counter_face.c
@@ -0,0 +1,90 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 Shogo Okamoto
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "counter_face.h"
+#include "watch.h"
+
+void counter_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) {
+    (void) settings;
+    (void) watch_face_index;
+    if (*context_ptr == NULL) {
+        *context_ptr = malloc(sizeof(counter_state_t));
+        memset(*context_ptr, 0, sizeof(counter_state_t));
+    }
+}
+
+void counter_face_activate(movement_settings_t *settings, void *context) {
+    (void) settings;
+    (void) context;
+}
+
+bool counter_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
+    (void) settings;
+
+    counter_state_t *state = (counter_state_t *)context;
+
+    switch (event.event_type) {
+        case EVENT_MODE_BUTTON_UP:
+            movement_move_to_next_face();
+            break;
+        case EVENT_LIGHT_BUTTON_DOWN:
+            movement_illuminate_led();
+            break;
+        case EVENT_ALARM_BUTTON_UP:
+            state->counter_idx++; // increment counter index
+            if (state->counter_idx>99) { //0-99
+                state->counter_idx=0;//reset counter index
+            }
+            print_counter(state);
+            break;
+        case EVENT_ALARM_LONG_PRESS:
+            state->counter_idx=0; // reset counter index
+            print_counter(state);
+            break;
+        case EVENT_ACTIVATE:
+            print_counter(state);
+            break;
+        case EVENT_TIMEOUT:
+            // ignore timeout
+            break;
+        default:
+            break;
+    }
+
+    return true;
+}
+
+// print counter index at the center of display.
+void print_counter(counter_state_t *state) {
+    char buf[14];
+    sprintf(buf, "CO    %02d", state->counter_idx); // center of LCD display
+    watch_display_string(buf, 0);
+}
+
+void counter_face_resign(movement_settings_t *settings, void *context) {
+    (void) settings;
+    (void) context;
+}
diff --git a/movement/watch_faces/complication/counter_face.h b/movement/watch_faces/complication/counter_face.h
new file mode 100644
index 00000000..2d389a15
--- /dev/null
+++ b/movement/watch_faces/complication/counter_face.h
@@ -0,0 +1,51 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 Shogo Okamoto
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef COUNTER_FACE_H_
+#define COUNTER_FACE_H_
+
+#include "movement.h"
+
+// Counter face is designed to count the number of running laps during excercises.
+typedef struct {
+    uint8_t counter_idx;
+} counter_state_t;
+
+
+void counter_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr);
+void counter_face_activate(movement_settings_t *settings, void *context);
+bool counter_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
+void counter_face_resign(movement_settings_t *settings, void *context);
+
+void print_counter(counter_state_t *state);
+
+#define counter_face ((const watch_face_t){ \
+    counter_face_setup, \
+    counter_face_activate, \
+    counter_face_loop, \
+    counter_face_resign, \
+    NULL, \
+})
+
+#endif // COUNTER_FACE_H_
diff --git a/movement/watch_faces/complication/orrery_face.c b/movement/watch_faces/complication/orrery_face.c
new file mode 100644
index 00000000..3afced98
--- /dev/null
+++ b/movement/watch_faces/complication/orrery_face.c
@@ -0,0 +1,232 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 Joey Castillo
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include "orrery_face.h"
+#include "watch.h"
+#include "watch_utility.h"
+#include "vsop87a_micro.h" // smaller size, less accurate
+#include "vsop87a_milli.h"
+#include "astrolib.h"
+
+#define NUM_AVAILABLE_BODIES 9
+
+static const char orrery_celestial_body_names[NUM_AVAILABLE_BODIES][3] = {
+    "ME",   // Mercury
+    "VE",   // Venus
+    "EA",   // Earth
+    "LU",   // Moon (Luna)
+    "MA",   // Mars
+    "JU",   // Jupiter
+    "SA",   // Saturn
+    "UR",   // Uranus
+    "NE"    // Neptune
+};
+
+static void _orrery_face_recalculate(movement_settings_t *settings, orrery_state_t *state) {
+    watch_date_time date_time = watch_rtc_get_date_time();
+    uint32_t timestamp = watch_utility_date_time_to_unix_time(date_time, movement_timezone_offsets[settings->bit.time_zone] * 60);
+    date_time = watch_utility_date_time_from_unix_time(timestamp, 0);
+    double jd = astro_convert_date_to_julian_date(date_time.unit.year + WATCH_RTC_REFERENCE_YEAR, date_time.unit.month, date_time.unit.day, date_time.unit.hour, date_time.unit.minute, date_time.unit.second);
+    double et = astro_convert_jd_to_julian_millenia_since_j2000(jd);
+    double r[3] = {0};
+
+    switch(state->active_body_index) {
+        case 0:
+            vsop87a_milli_getMercury(et, r);
+            break;
+        case 1:
+            vsop87a_milli_getVenus(et, r);
+            break;
+        case 2:
+            vsop87a_milli_getEarth(et, r);
+            break;
+        case 3:
+            {
+                 double earth[3];
+                 double emb[3];
+                 vsop87a_milli_getEarth(et, earth);
+                 vsop87a_milli_getEmb(et, emb);
+                 vsop87a_milli_getMoon(earth, emb, r);
+             }
+            break;
+        case 4:
+            vsop87a_milli_getMars(et, r);
+            break;
+        case 5:
+            vsop87a_milli_getJupiter(et, r);
+            break;
+        case 6:
+            vsop87a_milli_getSaturn(et, r);
+            break;
+        case 7:
+            vsop87a_milli_getUranus(et, r);
+            break;
+        case 8:
+            vsop87a_milli_getNeptune(et, r);
+            break;
+    }
+    state->coords[0] = r[0];
+    state->coords[1] = r[1];
+    state->coords[2] = r[2];
+}
+
+static void _orrery_face_update(movement_event_t event, movement_settings_t *settings, orrery_state_t *state) {
+    char buf[11];
+    switch (state->mode) {
+        case ORRERY_MODE_SELECTING_BODY:
+            watch_display_string("Orrery", 4);
+            if (event.subsecond % 2) {
+                watch_display_string((char *)orrery_celestial_body_names[state->active_body_index], 0);
+            } else {
+                watch_display_string("  ", 0);
+            }
+            if (event.subsecond == 0) {
+                watch_display_string("  ", 2);
+                switch (state->animation_state) {
+                    case 0:
+                        watch_set_pixel(0, 7);
+                        watch_set_pixel(2, 6);
+                        break;
+                    case 1:
+                        watch_set_pixel(1, 7);
+                        watch_set_pixel(2, 9);
+                        break;
+                    case 2:
+                        watch_set_pixel(2, 7);
+                        watch_set_pixel(0, 9);
+                        break;
+                }
+                state->animation_state = (state->animation_state + 1) % 3;
+            }
+            break;
+        case ORRERY_MODE_CALCULATING:
+            watch_clear_display();
+             // this takes a moment and locks the UI, flash C for "Calculating"
+            watch_start_character_blink('C', 100);
+            _orrery_face_recalculate(settings, state);
+            watch_stop_blink();
+            state->mode = ORRERY_MODE_DISPLAYING_X;
+            // fall through
+        case ORRERY_MODE_DISPLAYING_X:
+            sprintf(buf, "%s X%6d", orrery_celestial_body_names[state->active_body_index], (int16_t)round(state->coords[0] * 100));
+            watch_display_string(buf, 0);
+            break;
+        case ORRERY_MODE_DISPLAYING_Y:
+            sprintf(buf, "%s Y%6d", orrery_celestial_body_names[state->active_body_index], (int16_t)round(state->coords[1] * 100));
+            watch_display_string(buf, 0);
+            break;
+        case ORRERY_MODE_DISPLAYING_Z:
+            sprintf(buf, "%s Z%6d", orrery_celestial_body_names[state->active_body_index], (int16_t)round(state->coords[2] * 100));
+            watch_display_string(buf, 0);
+            break;
+        case ORRERY_MODE_NUM_MODES:
+            // this case does not happen, but we need it to silence a warning.
+            break;
+    }
+}
+
+void orrery_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) {
+    (void) settings;
+    (void) watch_face_index;
+    if (*context_ptr == NULL) {
+        *context_ptr = malloc(sizeof(orrery_state_t));
+        memset(*context_ptr, 0, sizeof(orrery_state_t));
+    }
+}
+
+void orrery_face_activate(movement_settings_t *settings, void *context) {
+    (void) settings;
+    (void) context;
+    movement_request_tick_frequency(4);
+}
+
+bool orrery_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
+    (void) settings;
+    orrery_state_t *state = (orrery_state_t *)context;
+
+    switch (event.event_type) {
+        case EVENT_ACTIVATE:
+        case EVENT_TICK:
+            _orrery_face_update(event, settings, state);
+            break;
+        case EVENT_MODE_BUTTON_UP:
+            movement_move_to_next_face();
+            break;
+        case EVENT_LIGHT_BUTTON_DOWN:
+            movement_illuminate_led();
+            break;
+        case EVENT_LIGHT_BUTTON_UP:
+            break;
+        case EVENT_ALARM_BUTTON_UP:
+            switch (state->mode) {
+                case ORRERY_MODE_SELECTING_BODY:
+                    // advance to next celestial body (move to calculations with a long press)
+                    state->active_body_index = (state->active_body_index + 1) % NUM_AVAILABLE_BODIES;
+                    break;
+                case ORRERY_MODE_CALCULATING:
+                    // ignore button press during calculations
+                    break;
+                case ORRERY_MODE_DISPLAYING_Z:
+                    // at last mode, wrap around
+                    state->mode = ORRERY_MODE_DISPLAYING_X;
+                    break;
+                default:
+                    // otherwise, advance to next mode
+                    state->mode++;
+                    break;
+            }
+            _orrery_face_update(event, settings, state);
+            break;
+        case EVENT_ALARM_LONG_PRESS:
+            if (state->mode == ORRERY_MODE_SELECTING_BODY) {
+                // celestial body selected! this triggers a calculation in the update method.
+                state->mode = ORRERY_MODE_CALCULATING;
+                movement_request_tick_frequency(1);
+                _orrery_face_update(event, settings, state);
+            } else if (state->mode != ORRERY_MODE_CALCULATING) {
+                // in all modes except "doing a calculation", return to the selection screen.
+                state->mode = ORRERY_MODE_SELECTING_BODY;
+                movement_request_tick_frequency(4);
+                _orrery_face_update(event, settings, state);
+            }
+            break;
+        case EVENT_TIMEOUT:
+            movement_move_to_face(0);
+            break;
+        default:
+            break;
+    }
+
+    return true;
+}
+
+void orrery_face_resign(movement_settings_t *settings, void *context) {
+    (void) settings;
+    orrery_state_t *state = (orrery_state_t *)context;
+    state->mode = ORRERY_MODE_SELECTING_BODY;
+}
diff --git a/movement/watch_faces/complication/orrery_face.h b/movement/watch_faces/complication/orrery_face.h
new file mode 100644
index 00000000..98060d97
--- /dev/null
+++ b/movement/watch_faces/complication/orrery_face.h
@@ -0,0 +1,59 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 Joey Castillo
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef ORRERY_FACE_H_
+#define ORRERY_FACE_H_
+
+#include "movement.h"
+
+typedef enum {
+    ORRERY_MODE_SELECTING_BODY = 0,
+    ORRERY_MODE_CALCULATING,
+    ORRERY_MODE_DISPLAYING_X,
+    ORRERY_MODE_DISPLAYING_Y,
+    ORRERY_MODE_DISPLAYING_Z,
+    ORRERY_MODE_NUM_MODES
+} orrery_mode_t;
+
+typedef struct {
+    orrery_mode_t mode;
+    uint8_t active_body_index;
+    double coords[3];
+    uint8_t animation_state;
+} orrery_state_t;
+
+void orrery_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr);
+void orrery_face_activate(movement_settings_t *settings, void *context);
+bool orrery_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
+void orrery_face_resign(movement_settings_t *settings, void *context);
+
+#define orrery_face ((const watch_face_t){ \
+    orrery_face_setup, \
+    orrery_face_activate, \
+    orrery_face_loop, \
+    orrery_face_resign, \
+    NULL, \
+})
+
+#endif // ORRERY_FACE_H_
diff --git a/movement/watch_faces/complication/tomato_face.c b/movement/watch_faces/complication/tomato_face.c
new file mode 100644
index 00000000..37798daf
--- /dev/null
+++ b/movement/watch_faces/complication/tomato_face.c
@@ -0,0 +1,191 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 Wesley Ellis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFtomato_ringEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "tomato_face.h"
+#include "watch_utility.h"
+
+static uint8_t focus_min = 25;
+static uint8_t break_min = 5;
+
+static inline int32_t get_tz_offset(movement_settings_t *settings) {
+    return movement_timezone_offsets[settings->bit.time_zone] * 60;
+}
+
+static uint8_t get_length(tomato_state_t *state) {
+    uint8_t length;
+    if (state->kind == tomato_focus) {
+        length = focus_min;
+    } else {
+        length = break_min;
+    }
+
+    return length;
+}
+
+static void tomato_start(tomato_state_t *state, movement_settings_t *settings) {
+    watch_date_time now = watch_rtc_get_date_time();
+    int8_t length = (int8_t) get_length(state);
+
+    state->mode = tomato_run;
+    state->now_ts = watch_utility_date_time_to_unix_time(now, get_tz_offset(settings));
+    state->target_ts = watch_utility_offset_timestamp(state->now_ts, 0, length, 0);
+    watch_date_time target_dt = watch_utility_date_time_from_unix_time(state->target_ts, get_tz_offset(settings));
+    movement_schedule_background_task(target_dt);
+    watch_set_indicator(WATCH_INDICATOR_BELL);
+}
+
+static void tomato_draw(tomato_state_t *state) {
+    char buf[16];
+
+    uint32_t delta;
+    div_t result;
+    uint8_t min = 0;
+    uint8_t sec = 0;
+    char kind;
+
+    if (state->kind == tomato_break) {
+        kind = 'b';
+    } else {
+        kind = 'f';
+    }
+
+    switch (state->mode) {
+        case tomato_run:
+            delta = state->target_ts - state->now_ts;
+            result = div(delta, 60);
+            min = result.quot;
+            sec = result.rem;
+            break;
+        case tomato_ready:
+            min = get_length(state);
+            sec = 0;
+            break;
+    }
+    sprintf(buf, "TO %c%2d%02d%2d", kind, min, sec, state->done_count);
+    watch_display_string(buf, 0);
+}
+
+static void tomato_reset(tomato_state_t *state) {
+    state->mode = tomato_ready;
+    movement_cancel_background_task();
+    watch_clear_indicator(WATCH_INDICATOR_BELL);
+}
+
+static void tomato_ring(tomato_state_t *state) {
+    movement_play_signal();
+    tomato_reset(state);
+    if (state->kind == tomato_focus) {
+        state->kind = tomato_break;
+        state->done_count++;
+    } else {
+        state->kind = tomato_focus;
+    }
+}
+
+void tomato_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) {
+    (void) settings;
+    (void) watch_face_index;
+
+    if (*context_ptr == NULL) {
+        *context_ptr = malloc(sizeof(tomato_state_t));
+        tomato_state_t *state = (tomato_state_t*)*context_ptr;
+        memset(*context_ptr, 0, sizeof(tomato_state_t));
+        state->mode=tomato_ready;
+        state->kind= tomato_focus;
+        state->done_count = 0;
+    }
+}
+
+void tomato_face_activate(movement_settings_t *settings, void *context) {
+    tomato_state_t *state = (tomato_state_t *)context;
+    if (state->mode == tomato_run) {
+        watch_date_time now = watch_rtc_get_date_time();
+        state->now_ts = watch_utility_date_time_to_unix_time(now, get_tz_offset(settings));
+    }
+    watch_set_colon();
+}
+
+bool tomato_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
+    tomato_state_t *state = (tomato_state_t *)context;
+
+    switch (event.event_type) {
+        case EVENT_ACTIVATE:
+            tomato_draw(state);
+            break;
+        case EVENT_TICK:
+            if (state->mode == tomato_run) {
+                state->now_ts++;
+            }
+            tomato_draw(state);
+            break;
+        case EVENT_MODE_BUTTON_UP:
+            movement_move_to_next_face();
+            break;
+        case EVENT_LIGHT_BUTTON_UP:
+            movement_illuminate_led();
+            if (state->mode == tomato_ready) {
+                if (state->kind == tomato_break) {
+                    state->kind = tomato_focus;
+                } else {
+                    state->kind = tomato_break;
+                }
+            }
+            tomato_draw(state);
+            break;
+        case EVENT_ALARM_BUTTON_UP:
+            switch(state->mode) {
+                case tomato_run:
+                    tomato_reset(state);
+                    break;
+                case tomato_ready:
+                    tomato_start(state, settings);
+                    break;
+            }
+            tomato_draw(state);
+
+            break;
+        case EVENT_ALARM_LONG_PRESS:
+            state->done_count = 0;
+            break;
+        case EVENT_BACKGROUND_TASK:
+            tomato_ring(state);
+            tomato_draw(state);
+            break;
+        case EVENT_TIMEOUT:
+            movement_move_to_face(0);
+            break;
+        default:
+            break;
+    }
+
+    return true;
+}
+
+void tomato_face_resign(movement_settings_t *settings, void *context) {
+    (void) settings;
+    (void) context;
+}
+
diff --git a/movement/watch_faces/complication/tomato_face.h b/movement/watch_faces/complication/tomato_face.h
new file mode 100644
index 00000000..5404ad11
--- /dev/null
+++ b/movement/watch_faces/complication/tomato_face.h
@@ -0,0 +1,63 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 Wesley Ellis
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef TOMATO_FACE_H_
+#define TOMATO_FACE_H_
+
+#include "movement.h"
+
+typedef enum {
+    tomato_ready,
+    tomato_run,
+    // to_pause, // TODO implement pausing
+} tomato_mode;
+
+typedef enum {
+    tomato_break,
+    tomato_focus,
+} tomato_kind;
+
+typedef struct {
+    uint32_t target_ts;
+    uint32_t now_ts;
+    tomato_mode mode;
+    tomato_kind kind;
+    uint8_t done_count;
+} tomato_state_t;
+
+void tomato_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr);
+void tomato_face_activate(movement_settings_t *settings, void *context);
+bool tomato_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
+void tomato_face_resign(movement_settings_t *settings, void *context);
+
+#define tomato_face ((const watch_face_t){ \
+    tomato_face_setup, \
+    tomato_face_activate, \
+    tomato_face_loop, \
+    tomato_face_resign, \
+    NULL, \
+})
+
+#endif // TOMATO_FACE_H_
+
diff --git a/movement/watch_faces/sensor/thermistor_readout_face.c b/movement/watch_faces/sensor/thermistor_readout_face.c
index b97c8432..28106022 100644
--- a/movement/watch_faces/sensor/thermistor_readout_face.c
+++ b/movement/watch_faces/sensor/thermistor_readout_face.c
@@ -63,7 +63,7 @@ bool thermistor_readout_face_loop(movement_event_t event, movement_settings_t *s
         case EVENT_LIGHT_BUTTON_DOWN:
             movement_illuminate_led();
             break;
-        case EVENT_ALARM_BUTTON_UP:
+        case EVENT_ALARM_BUTTON_DOWN:
             settings->bit.use_imperial_units = !settings->bit.use_imperial_units;
             _thermistor_readout_face_update_display(settings->bit.use_imperial_units);
             break;
diff --git a/movement/watch_faces/sensor/thermistor_testing_face.c b/movement/watch_faces/sensor/thermistor_testing_face.c
new file mode 100644
index 00000000..f50e0567
--- /dev/null
+++ b/movement/watch_faces/sensor/thermistor_testing_face.c
@@ -0,0 +1,88 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 Joey Castillo
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include "thermistor_testing_face.h"
+#include "thermistor_driver.h"
+#include "watch.h"
+
+// This watch face is designed for testing temperature sensor boards.
+// It displays temperature readings at a relatively fast rate of 8 Hz,
+// and disables low energy mode so my testing device doesn't sleep.
+// You more than likely want to use thermistor_readout_face instead.
+
+static void _thermistor_testing_face_update_display(bool in_fahrenheit) {
+    thermistor_driver_enable();
+    float temperature_c = thermistor_driver_get_temperature();
+    char buf[14];
+    if (in_fahrenheit) {
+        sprintf(buf, "%4.1f#F", temperature_c * 1.8 + 32.0);
+    } else {
+        sprintf(buf, "%4.1f#C", temperature_c);
+    }
+    watch_display_string(buf, 4);
+    thermistor_driver_disable();
+}
+
+void thermistor_testing_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) {
+    (void) watch_face_index;
+    (void) context_ptr;
+    // force one setting: never enter low energy mode.
+    // I'm using this watch face to test the temperature sensor boards; there's no need for it.
+    settings->bit.le_interval = 0;
+}
+
+void thermistor_testing_face_activate(movement_settings_t *settings, void *context) {
+    (void) settings;
+    (void) context;
+    watch_display_string("TE", 0);
+    movement_request_tick_frequency(8);
+}
+
+bool thermistor_testing_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
+    (void) context;
+    switch (event.event_type) {
+        case EVENT_MODE_BUTTON_UP:
+            movement_move_to_next_face();
+            break;
+        case EVENT_ALARM_BUTTON_DOWN:
+            settings->bit.use_imperial_units = !settings->bit.use_imperial_units;
+            _thermistor_testing_face_update_display(settings->bit.use_imperial_units);
+            break;
+        case EVENT_ACTIVATE:
+        case EVENT_TICK:
+            _thermistor_testing_face_update_display(settings->bit.use_imperial_units);
+            break;
+        default:
+            break;
+    }
+
+    return true;
+}
+
+void thermistor_testing_face_resign(movement_settings_t *settings, void *context) {
+    (void) settings;
+    (void) context;
+}
diff --git a/movement/watch_faces/sensor/thermistor_testing_face.h b/movement/watch_faces/sensor/thermistor_testing_face.h
new file mode 100644
index 00000000..656f58d5
--- /dev/null
+++ b/movement/watch_faces/sensor/thermistor_testing_face.h
@@ -0,0 +1,43 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022 Joey Castillo
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef THERMISTOR_TESTING_FACE_H_
+#define THERMISTOR_TESTING_FACE_H_
+
+#include "movement.h"
+
+void thermistor_testing_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr);
+void thermistor_testing_face_activate(movement_settings_t *settings, void *context);
+bool thermistor_testing_face_loop(movement_event_t event, movement_settings_t *settings, void *context);
+void thermistor_testing_face_resign(movement_settings_t *settings, void *context);
+
+#define thermistor_testing_face ((const watch_face_t){ \
+    thermistor_testing_face_setup, \
+    thermistor_testing_face_activate, \
+    thermistor_testing_face_loop, \
+    thermistor_testing_face_resign, \
+    NULL, \
+})
+
+#endif // THERMISTOR_TESTING_FACE_H_
diff --git a/movement/watch_faces/settings/set_time_face.c b/movement/watch_faces/settings/set_time_face.c
index f0e7dc6c..af5421f1 100644
--- a/movement/watch_faces/settings/set_time_face.c
+++ b/movement/watch_faces/settings/set_time_face.c
@@ -102,8 +102,8 @@ bool set_time_face_loop(movement_event_t event, movement_settings_t *settings, v
             sprintf(buf, "%s  %2d%02d%02d", set_time_face_titles[current_page], date_time.unit.hour, date_time.unit.minute, date_time.unit.second);
         } else {
             sprintf(buf, "%s  %2d%02d%02d", set_time_face_titles[current_page], (date_time.unit.hour % 12) ? (date_time.unit.hour % 12) : 12, date_time.unit.minute, date_time.unit.second);
-            if (date_time.unit.hour > 12) watch_set_indicator(WATCH_INDICATOR_PM);
-            else watch_clear_indicator(WATCH_INDICATOR_PM);
+            if (date_time.unit.hour < 12) watch_clear_indicator(WATCH_INDICATOR_PM);
+            else watch_set_indicator(WATCH_INDICATOR_PM);
         }
     } else if (current_page < 6) {
         watch_clear_colon();