hueso/Sensor-Watch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

mars clock: add support for sols

Browse Source
This commit is contained in:
Joey Castillo 2022-03-05 09:59:32 -05:00
parent 08af2ed398
commit 3ad093715d
2 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
movement/watch_faces/clock/mars_time_face.c
View File

@ -31,18 +31,26 @@
// note: lander coordinates come from Mars24's `marslandmarks.xml` file // note: lander coordinates come from Mars24's `marslandmarks.xml` file
static double site_longitudes[MARS_TIME_NUM_SITES] = { static double site_longitudes[MARS_TIME_NUM_SITES] = {
0, // Mars Coordinated Time, at the meridian 0, // Mars Coordinated Time, at the meridian
360.0 - 137.441635, // Curiosity lander site 360.0 - 109.9, // Zhurong lander site
360.0 - 135.623447, // InSight lander site
360.0 - 77.45088572, // Perseverance 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] = { static char site_names[MARS_TIME_NUM_SITES][3] = {
"MC", "MC",
"CU", "ZH",
"IN",
"PE", "PE",
"ZH" "IN",
"CU",
};
static uint16_t landing_sols[MARS_TIME_NUM_SITES] = {
0,
52387,
52304,
51511,
49269,
}; };
typedef struct { typedef struct {
@ -63,6 +71,8 @@ static void _update(movement_settings_t *settings, mars_time_state_t *state) {
char buf[11]; char buf[11];
watch_date_time date_time = watch_rtc_get_date_time(); 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); 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 jdut = 2440587.5 + ((double)now / 86400.0);
double jdtt = jdut + ((37.0 + 32.184) / 86400.0); double jdtt = jdut + ((37.0 + 32.184) / 86400.0);
double jd2k = jdtt - 2451545.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); lmt = fmod(lmst + 24, 24);
} }
mars_clock_hms_t mars_time; if (state->displaying_sol) {
_h_to_hms(&mars_time, lmt); // TODO: this is not right, mission sol should turn over at midnight local time?
sprintf(&buf[0], "%s %02d%02d%02d", site_names[state->current_site], mars_time.hour, mars_time.minute, mars_time.second); uint16_t sol = floor(msd) - landing_sols[state->current_site];
watch_set_colon(); if (sol < 1000) sprintf(&buf[0], "%s Sol%3d", site_names[state->current_site], sol);
watch_set_indicator(WATCH_INDICATOR_24H); 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); 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(); movement_move_to_next_face();
break; break;
case EVENT_LIGHT_BUTTON_UP: case EVENT_LIGHT_BUTTON_UP:
state->displaying_sol = !state->displaying_sol;
_update(settings, state);
break;
case EVENT_LIGHT_LONG_PRESS:
movement_illuminate_led(); movement_illuminate_led();
break; break;
case EVENT_ALARM_BUTTON_UP: case EVENT_ALARM_BUTTON_UP:

7
movement/watch_faces/clock/mars_time_face.h
View File

@ -29,15 +29,16 @@
typedef enum { typedef enum {
MARS_TIME_MERIDIAN, MARS_TIME_MERIDIAN,
MARS_TIME_CURIOSITY_SITE,
MARS_TIME_INSIGHT_SITE,
MARS_TIME_PERSEVERANCE_SITE,
MARS_TIME_ZHURONG_SITE, MARS_TIME_ZHURONG_SITE,
MARS_TIME_PERSEVERANCE_SITE,
MARS_TIME_INSIGHT_SITE,
MARS_TIME_CURIOSITY_SITE,
MARS_TIME_NUM_SITES, MARS_TIME_NUM_SITES,
} mars_time_site_t; } mars_time_site_t;
typedef struct { typedef struct {
mars_time_site_t current_site; mars_time_site_t current_site;
bool displaying_sol;
} mars_time_state_t; } 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_setup(movement_settings_t *settings, uint8_t watch_face_index, void ** context_ptr);