From 3025984eb558442e86edf0c99f5d7fbb0d619f10 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Fri, 4 Mar 2022 14:44:42 -0600 Subject: movement: first pass at mars clock --- movement/watch_faces/clock/mars_time_face.c | 112 ++++++++++++++++++++++++++++ movement/watch_faces/clock/mars_time_face.h | 48 ++++++++++++ 2 files changed, 160 insertions(+) create mode 100644 movement/watch_faces/clock/mars_time_face.c create mode 100644 movement/watch_faces/clock/mars_time_face.h (limited to 'movement/watch_faces') diff --git a/movement/watch_faces/clock/mars_time_face.c b/movement/watch_faces/clock/mars_time_face.c new file mode 100644 index 00000000..cf3ab5bb --- /dev/null +++ b/movement/watch_faces/clock/mars_time_face.c @@ -0,0 +1,112 @@ +/* + * 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 +#include +#include +#include "watch_utility.h" +#include "mars_time_face.h" + +typedef struct { + uint8_t hour; + uint8_t minute; + uint8_t second; +} mars_clock_hms_t; + +static void _h_to_hms(mars_clock_hms_t *date_time, double h) { + unsigned int seconds = (unsigned int)(h * 3600.0); + date_time->hour = seconds / 3600; + seconds = seconds % 3600; + date_time->minute = floor(seconds / 60); + date_time->second = round(seconds % 60); +} + +static void _update(movement_settings_t *settings) { + char buf[11]; + watch_date_time date_time = watch_rtc_get_date_time(); + uint32_t now = watch_utility_date_time_to_unix_time(date_time, movement_timezone_offsets[settings->bit.time_zone] * 60); + double jdut = 2440587.5 + ((double)now / 86400.0); + double jdtt = jdut + ((37.0 + 32.184) / 86400.0); + double jd2k = jdtt - 2451545.0; + double msd = ((jd2k - 4.5) / 1.0274912517) + 44796.0 - 0.0009626; + double mtc = fmod(24 * msd, 24); + mars_clock_hms_t mars_time; + _h_to_hms(&mars_time, mtc); + sprintf(&buf[0], "MC %02d%02d%02d", mars_time.hour, mars_time.minute, mars_time.second); + watch_set_colon(); + watch_set_indicator(WATCH_INDICATOR_24H); + watch_display_string(buf, 0); +} + +void mars_time_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr) { + (void) settings; + if (*context_ptr == NULL) { + *context_ptr = malloc(sizeof(mars_time_state_t)); + memset(*context_ptr, 0, sizeof(mars_time_state_t)); + } +} + +void mars_time_face_activate(movement_settings_t *settings, void *context) { + (void) settings; + mars_time_state_t *state = (mars_time_state_t *)context; + (void) state; +} + +bool mars_time_face_loop(movement_event_t event, movement_settings_t *settings, void *context) { + mars_time_state_t *state = (mars_time_state_t *)context; + (void) state; + + switch (event.event_type) { + case EVENT_ACTIVATE: + case EVENT_TICK: + _update(settings); + break; + case EVENT_MODE_BUTTON_UP: + movement_move_to_next_face(); + break; + case EVENT_LIGHT_BUTTON_UP: + movement_illuminate_led(); + break; + case EVENT_ALARM_BUTTON_UP: + break; + case EVENT_TIMEOUT: + // TODO: make this lower power so we can avoid timeout + movement_move_to_face(0); + break; + case EVENT_LOW_ENERGY_UPDATE: + // TODO: low energy update + // watch_start_tick_animation(500); + break; + default: + break; + } + + return true; +} + +void mars_time_face_resign(movement_settings_t *settings, void *context) { + (void) settings; + (void) context; +} + diff --git a/movement/watch_faces/clock/mars_time_face.h b/movement/watch_faces/clock/mars_time_face.h new file mode 100644 index 00000000..864169a0 --- /dev/null +++ b/movement/watch_faces/clock/mars_time_face.h @@ -0,0 +1,48 @@ +/* + * 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 MARS_TIME_FACE_H_ +#define MARS_TIME_FACE_H_ + +#include "movement.h" + +typedef struct { + uint8_t unused; +} mars_time_state_t; + +void mars_time_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr); +void mars_time_face_activate(movement_settings_t *settings, void *context); +bool mars_time_face_loop(movement_event_t event, movement_settings_t *settings, void *context); +void mars_time_face_resign(movement_settings_t *settings, void *context); + +#define mars_time_face ((const watch_face_t){ \ + mars_time_face_setup, \ + mars_time_face_activate, \ + mars_time_face_loop, \ + mars_time_face_resign, \ + NULL, \ +}) + +#endif // MARS_TIME_FACE_H_ + -- cgit v1.2.3 From 08af2ed398721a413a9d6fd05f8e749deeccda56 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Fri, 4 Mar 2022 16:30:18 -0600 Subject: mars clock: adding additional sites --- movement/watch_faces/clock/mars_time_face.c | 38 +++++++++++++++++++++++++---- movement/watch_faces/clock/mars_time_face.h | 11 ++++++++- 2 files changed, 43 insertions(+), 6 deletions(-) (limited to 'movement/watch_faces') diff --git a/movement/watch_faces/clock/mars_time_face.c b/movement/watch_faces/clock/mars_time_face.c index cf3ab5bb..510cc75d 100644 --- a/movement/watch_faces/clock/mars_time_face.c +++ b/movement/watch_faces/clock/mars_time_face.c @@ -28,6 +28,23 @@ #include "watch_utility.h" #include "mars_time_face.h" +// note: lander coordinates come from Mars24's `marslandmarks.xml` file +static double site_longitudes[MARS_TIME_NUM_SITES] = { + 0, // Mars Coordinated Time, at the meridian + 360.0 - 137.441635, // Curiosity lander site + 360.0 - 135.623447, // InSight lander site + 360.0 - 77.45088572, // Perseverance lander site + 360.0 - 109.9 // Zhurong lander site +}; + +static char site_names[MARS_TIME_NUM_SITES][3] = { + "MC", + "CU", + "IN", + "PE", + "ZH" +}; + typedef struct { uint8_t hour; uint8_t minute; @@ -42,7 +59,7 @@ static void _h_to_hms(mars_clock_hms_t *date_time, double h) { date_time->second = round(seconds % 60); } -static void _update(movement_settings_t *settings) { +static void _update(movement_settings_t *settings, mars_time_state_t *state) { char buf[11]; watch_date_time date_time = watch_rtc_get_date_time(); uint32_t now = watch_utility_date_time_to_unix_time(date_time, movement_timezone_offsets[settings->bit.time_zone] * 60); @@ -51,9 +68,19 @@ static void _update(movement_settings_t *settings) { double jd2k = jdtt - 2451545.0; double msd = ((jd2k - 4.5) / 1.0274912517) + 44796.0 - 0.0009626; double mtc = fmod(24 * msd, 24); + double lmt; + + if (state->current_site == 0) { + lmt = mtc; + } else { + double longitude = site_longitudes[state->current_site]; + double lmst = mtc - ((longitude * 24.0) / 360.0); + lmt = fmod(lmst + 24, 24); + } + mars_clock_hms_t mars_time; - _h_to_hms(&mars_time, mtc); - sprintf(&buf[0], "MC %02d%02d%02d", mars_time.hour, mars_time.minute, mars_time.second); + _h_to_hms(&mars_time, lmt); + sprintf(&buf[0], "%s %02d%02d%02d", site_names[state->current_site], mars_time.hour, mars_time.minute, mars_time.second); watch_set_colon(); watch_set_indicator(WATCH_INDICATOR_24H); watch_display_string(buf, 0); @@ -75,12 +102,11 @@ void mars_time_face_activate(movement_settings_t *settings, void *context) { bool mars_time_face_loop(movement_event_t event, movement_settings_t *settings, void *context) { mars_time_state_t *state = (mars_time_state_t *)context; - (void) state; switch (event.event_type) { case EVENT_ACTIVATE: case EVENT_TICK: - _update(settings); + _update(settings, state); break; case EVENT_MODE_BUTTON_UP: movement_move_to_next_face(); @@ -89,6 +115,8 @@ bool mars_time_face_loop(movement_event_t event, movement_settings_t *settings, movement_illuminate_led(); break; case EVENT_ALARM_BUTTON_UP: + state->current_site = (state->current_site + 1) % MARS_TIME_NUM_SITES; + _update(settings, state); break; case EVENT_TIMEOUT: // TODO: make this lower power so we can avoid timeout diff --git a/movement/watch_faces/clock/mars_time_face.h b/movement/watch_faces/clock/mars_time_face.h index 864169a0..d41c0dad 100644 --- a/movement/watch_faces/clock/mars_time_face.h +++ b/movement/watch_faces/clock/mars_time_face.h @@ -27,8 +27,17 @@ #include "movement.h" +typedef enum { + MARS_TIME_MERIDIAN, + MARS_TIME_CURIOSITY_SITE, + MARS_TIME_INSIGHT_SITE, + MARS_TIME_PERSEVERANCE_SITE, + MARS_TIME_ZHURONG_SITE, + MARS_TIME_NUM_SITES, +} mars_time_site_t; + typedef struct { - uint8_t unused; + mars_time_site_t current_site; } mars_time_state_t; void mars_time_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr); -- cgit v1.2.3 From 3ad093715d731efd2cfb094fd6fdfbb81691005d Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Sat, 5 Mar 2022 09:59:32 -0500 Subject: mars clock: add support for sols --- movement/watch_faces/clock/mars_time_face.c | 46 ++++++++++++++++++++++------- movement/watch_faces/clock/mars_time_face.h | 7 +++-- 2 files changed, 39 insertions(+), 14 deletions(-) (limited to 'movement/watch_faces') diff --git a/movement/watch_faces/clock/mars_time_face.c b/movement/watch_faces/clock/mars_time_face.c index 510cc75d..264f714f 100644 --- a/movement/watch_faces/clock/mars_time_face.c +++ b/movement/watch_faces/clock/mars_time_face.c @@ -31,18 +31,26 @@ // note: lander coordinates come from Mars24's `marslandmarks.xml` file static double site_longitudes[MARS_TIME_NUM_SITES] = { 0, // Mars Coordinated Time, at the meridian - 360.0 - 137.441635, // Curiosity lander site - 360.0 - 135.623447, // InSight lander site + 360.0 - 109.9, // Zhurong lander site 360.0 - 77.45088572, // Perseverance lander site - 360.0 - 109.9 // Zhurong lander site + 360.0 - 135.623447, // InSight lander site + 360.0 - 137.441635, // Curiosity lander site }; static char site_names[MARS_TIME_NUM_SITES][3] = { "MC", - "CU", - "IN", + "ZH", "PE", - "ZH" + "IN", + "CU", +}; + +static uint16_t landing_sols[MARS_TIME_NUM_SITES] = { + 0, + 52387, + 52304, + 51511, + 49269, }; typedef struct { @@ -63,6 +71,8 @@ static void _update(movement_settings_t *settings, mars_time_state_t *state) { char buf[11]; watch_date_time date_time = watch_rtc_get_date_time(); uint32_t now = watch_utility_date_time_to_unix_time(date_time, movement_timezone_offsets[settings->bit.time_zone] * 60); + // TODO: I'm skipping over some steps here. + // https://www.giss.nasa.gov/tools/mars24/help/algorithm.html double jdut = 2440587.5 + ((double)now / 86400.0); double jdtt = jdut + ((37.0 + 32.184) / 86400.0); double jd2k = jdtt - 2451545.0; @@ -78,11 +88,21 @@ static void _update(movement_settings_t *settings, mars_time_state_t *state) { lmt = fmod(lmst + 24, 24); } - mars_clock_hms_t mars_time; - _h_to_hms(&mars_time, lmt); - sprintf(&buf[0], "%s %02d%02d%02d", site_names[state->current_site], mars_time.hour, mars_time.minute, mars_time.second); - watch_set_colon(); - watch_set_indicator(WATCH_INDICATOR_24H); + if (state->displaying_sol) { + // TODO: this is not right, mission sol should turn over at midnight local time? + uint16_t sol = floor(msd) - landing_sols[state->current_site]; + if (sol < 1000) sprintf(&buf[0], "%s Sol%3d", site_names[state->current_site], sol); + else sprintf(&buf[0], "%s s%6d", site_names[state->current_site], sol); + watch_clear_colon(); + watch_clear_indicator(WATCH_INDICATOR_24H); + } else { + mars_clock_hms_t mars_time; + _h_to_hms(&mars_time, lmt); + sprintf(&buf[0], "%s %02d%02d%02d", site_names[state->current_site], mars_time.hour, mars_time.minute, mars_time.second); + watch_set_colon(); + watch_set_indicator(WATCH_INDICATOR_24H); + } + watch_display_string(buf, 0); } @@ -112,6 +132,10 @@ bool mars_time_face_loop(movement_event_t event, movement_settings_t *settings, movement_move_to_next_face(); break; case EVENT_LIGHT_BUTTON_UP: + state->displaying_sol = !state->displaying_sol; + _update(settings, state); + break; + case EVENT_LIGHT_LONG_PRESS: movement_illuminate_led(); break; case EVENT_ALARM_BUTTON_UP: diff --git a/movement/watch_faces/clock/mars_time_face.h b/movement/watch_faces/clock/mars_time_face.h index d41c0dad..d34792e9 100644 --- a/movement/watch_faces/clock/mars_time_face.h +++ b/movement/watch_faces/clock/mars_time_face.h @@ -29,15 +29,16 @@ typedef enum { MARS_TIME_MERIDIAN, - MARS_TIME_CURIOSITY_SITE, - MARS_TIME_INSIGHT_SITE, - MARS_TIME_PERSEVERANCE_SITE, MARS_TIME_ZHURONG_SITE, + MARS_TIME_PERSEVERANCE_SITE, + MARS_TIME_INSIGHT_SITE, + MARS_TIME_CURIOSITY_SITE, MARS_TIME_NUM_SITES, } mars_time_site_t; typedef struct { mars_time_site_t current_site; + bool displaying_sol; } mars_time_state_t; void mars_time_face_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr); -- cgit v1.2.3 From cb609389ebb983cff60af99f7380431d77eaa046 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Wed, 6 Apr 2022 15:54:31 -0400 Subject: mars clock: use S without cross-stroke for clarity --- movement/watch_faces/clock/mars_time_face.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'movement/watch_faces') diff --git a/movement/watch_faces/clock/mars_time_face.c b/movement/watch_faces/clock/mars_time_face.c index 609d461b..8695ecf0 100644 --- a/movement/watch_faces/clock/mars_time_face.c +++ b/movement/watch_faces/clock/mars_time_face.c @@ -92,7 +92,7 @@ static void _update(movement_settings_t *settings, mars_time_state_t *state) { // TODO: this is not right, mission sol should turn over at midnight local time? uint16_t sol = floor(msd) - landing_sols[state->current_site]; if (sol < 1000) sprintf(&buf[0], "%s Sol%3d", site_names[state->current_site], sol); - else sprintf(&buf[0], "%s s%6d", site_names[state->current_site], sol); + else sprintf(&buf[0], "%s $%6d", site_names[state->current_site], sol); watch_clear_colon(); watch_clear_indicator(WATCH_INDICATOR_24H); } else { -- cgit v1.2.3 From c4de155083d1f5574138976d7d697e572dc12a03 Mon Sep 17 00:00:00 2001 From: Joey Castillo Date: Wed, 6 Apr 2022 15:55:06 -0400 Subject: mars clock: formatting --- movement/watch_faces/clock/mars_time_face.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'movement/watch_faces') diff --git a/movement/watch_faces/clock/mars_time_face.c b/movement/watch_faces/clock/mars_time_face.c index 8695ecf0..7753ae72 100644 --- a/movement/watch_faces/clock/mars_time_face.c +++ b/movement/watch_faces/clock/mars_time_face.c @@ -94,13 +94,13 @@ static void _update(movement_settings_t *settings, mars_time_state_t *state) { if (sol < 1000) sprintf(&buf[0], "%s Sol%3d", site_names[state->current_site], sol); else sprintf(&buf[0], "%s $%6d", site_names[state->current_site], sol); watch_clear_colon(); - watch_clear_indicator(WATCH_INDICATOR_24H); + watch_clear_indicator(WATCH_INDICATOR_24H); } else { mars_clock_hms_t mars_time; _h_to_hms(&mars_time, lmt); sprintf(&buf[0], "%s %02d%02d%02d", site_names[state->current_site], mars_time.hour, mars_time.minute, mars_time.second); watch_set_colon(); - watch_set_indicator(WATCH_INDICATOR_24H); + watch_set_indicator(WATCH_INDICATOR_24H); } watch_display_string(buf, 0); -- cgit v1.2.3