From: Joey Castillo Date: Sat, 15 Mar 2025 23:54:35 +0000 (-0400) Subject: move moon phase into Second Movement X-Git-Url: https://git.earman.xyz/?a=commitdiff_plain;h=a45dbd1d071ba0cea64d744c0270f1d165fc4ae1;p=sensor-watch.git move moon phase into Second Movement --- diff --git a/legacy/watch_faces/complication/moon_phase_face.c b/legacy/watch_faces/complication/moon_phase_face.c deleted file mode 100644 index 7b28e44..0000000 --- a/legacy/watch_faces/complication/moon_phase_face.c +++ /dev/null @@ -1,179 +0,0 @@ -/* - * MIT License - * - * Copyright (c) 2022 Joey Castillo - * - * Based on Phase of Moon App for Tidbyt - * https://github.com/tidbyt/community/blob/main/apps/phaseofmoon/phase_of_moon.star - * Copyright (c) 2022 Alan Fleming - * - * - * 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 -#include "moon_phase_face.h" -#include "watch_utility.h" - -#define LUNAR_DAYS 29.53058770576 -#define LUNAR_SECONDS (LUNAR_DAYS * (24 * 60 * 60)) -#define FIRST_MOON 947182440 // Saturday, 6 January 2000 18:14:00 in unix epoch time -#define NUM_PHASES 8 - -static const float phase_changes[] = {0, 1, 6.38264692644, 8.38264692644, 13.76529385288, 15.76529385288, 21.14794077932, 23.14794077932, 28.53058770576, 29.53058770576}; - -void moon_phase_face_setup(uint8_t watch_face_index, void ** context_ptr) { - (void) watch_face_index; - if (*context_ptr == NULL) { - *context_ptr = malloc(sizeof(moon_phase_state_t)); - memset(*context_ptr, 0, sizeof(moon_phase_state_t)); - } -} - -void moon_phase_face_activate(void *context) { - (void) context; -} - -static void _update(moon_phase_state_t *state, uint32_t offset) { - (void)state; - char buf[11]; - 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; - 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; - uint8_t phase_index = 0; - - for(phase_index = 0; phase_index <= NUM_PHASES; phase_index++) { - if (currentday > phase_changes[phase_index] && currentday <= phase_changes[phase_index + 1]) break; - } - - watch_display_string(" ", 0); - switch (phase_index) { - case 0: - case 8: - sprintf(buf, "%2d Neu ", date_time.unit.day); - break; - case 1: - sprintf(buf, "%2dCresnt", date_time.unit.day); - watch_set_pixel(2, 13); - watch_set_pixel(2, 15); - if (currentfrac > 0.125) watch_set_pixel(1, 13); - break; - case 2: - sprintf(buf, "%2d 1st q", date_time.unit.day); - watch_set_pixel(2, 13); - watch_set_pixel(2, 15); - watch_set_pixel(1, 13); - watch_set_pixel(1, 14); - break; - case 3: - sprintf(buf, "%2d Gibb ", date_time.unit.day); - watch_set_pixel(2, 13); - watch_set_pixel(2, 15); - watch_set_pixel(1, 14); - watch_set_pixel(1, 13); - watch_set_pixel(1, 15); - break; - case 4: - sprintf(buf, "%2d FULL ", date_time.unit.day); - watch_set_pixel(2, 13); - watch_set_pixel(2, 15); - watch_set_pixel(1, 14); - watch_set_pixel(2, 14); - watch_set_pixel(1, 15); - watch_set_pixel(0, 14); - watch_set_pixel(0, 13); - watch_set_pixel(1, 13); - break; - case 5: - sprintf(buf, "%2d Gibb ", date_time.unit.day); - watch_set_pixel(1, 14); - watch_set_pixel(2, 14); - watch_set_pixel(1, 15); - watch_set_pixel(0, 14); - watch_set_pixel(0, 13); - break; - case 6: - sprintf(buf, "%2d 3rd q", date_time.unit.day); - watch_set_pixel(1, 14); - watch_set_pixel(2, 14); - watch_set_pixel(0, 14); - watch_set_pixel(0, 13); - break; - case 7: - sprintf(buf, "%2dCresnt", date_time.unit.day); - watch_set_pixel(0, 14); - watch_set_pixel(0, 13); - if (currentfrac < 0.875) watch_set_pixel(2, 14); - break; - } - watch_display_string(buf, 2); -} - -bool moon_phase_face_loop(movement_event_t event, void *context) { - moon_phase_state_t *state = (moon_phase_state_t *)context; - watch_date_time_t date_time; - - switch (event.event_type) { - case EVENT_ACTIVATE: - _update(state, state->offset); - 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); - 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); - // and kill the offset so when the wearer wakes up, it matches what's on screen. - state->offset = 0; - // finally: clear out the last two digits and replace them with the sleep mode indicator - watch_display_string(" ", 8); - if (!watch_sleep_animation_is_running()) watch_start_sleep_animation(1000); - break; - case EVENT_ALARM_BUTTON_UP: - // 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); - break; - case EVENT_ALARM_LONG_PRESS: - state->offset = 0; - _update(state, state->offset); - break; - case EVENT_TIMEOUT: - // QUESTION: Should timeout reset offset to 0? - break; - default: - return movement_default_loop_handler(event); - } - - return true; -} - -void moon_phase_face_resign(void *context) { - moon_phase_state_t *state = (moon_phase_state_t *)context; - state->offset = 0; -} diff --git a/legacy/watch_faces/complication/moon_phase_face.h b/legacy/watch_faces/complication/moon_phase_face.h deleted file mode 100644 index b020982..0000000 --- a/legacy/watch_faces/complication/moon_phase_face.h +++ /dev/null @@ -1,72 +0,0 @@ -/* - * 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 MOON_PHASE_FACE_H_ -#define MOON_PHASE_FACE_H_ - -/* - * MOON PHASE face - * - * The Moon Phase face is similar to the Sunrise/Sunset face: it displays the - * current phase of the moon, along with the day of the month and a graphical - * representation of the moon on the top row. - * - * This graphical representation is a bit abstract. The segments that turn on - * represent the shape of the moon, waxing from the bottom right and waning at - * the top left. A small crescent at the bottom right will grow into a larger - * crescent, then add lines in the center for a quarter and half moon. All - * segments are on during a full moon. Then gradually the segments at the - * bottom right will turn off, until all that remains is a small waning - * crescent at the top left. - * - * All segments turn off during a new moon. - * - * On this screen you may press the Alarm button repeatedly to move forward - * in time: the day of the month at the top right will advance by one day for - * each button press, and both the text and the graphical representation will - * display the moon phase for that day. Try pressing the Alarm button 27 times - * now, just to visualize what the moon will look like over the next month. - */ - -#include "movement.h" - -typedef struct { - uint32_t offset; -} moon_phase_state_t; - -void moon_phase_face_setup(uint8_t watch_face_index, void ** context_ptr); -void moon_phase_face_activate(void *context); -bool moon_phase_face_loop(movement_event_t event, void *context); -void moon_phase_face_resign(void *context); - -#define moon_phase_face ((const watch_face_t){ \ - moon_phase_face_setup, \ - moon_phase_face_activate, \ - moon_phase_face_loop, \ - moon_phase_face_resign, \ - NULL, \ -}) - -#endif // MOON_PHASE_FACE_H_ - diff --git a/movement_faces.h b/movement_faces.h index 35e4f00..74ef444 100644 --- a/movement_faces.h +++ b/movement_faces.h @@ -32,6 +32,7 @@ #include "stopwatch_face.h" #include "fast_stopwatch_face.h" #include "sunrise_sunset_face.h" +#include "moon_phase_face.h" #include "character_set_face.h" #include "accel_interrupt_count_face.h" #include "all_segments_face.h" diff --git a/watch-faces.mk b/watch-faces.mk index 5be1c78..305b533 100644 --- a/watch-faces.mk +++ b/watch-faces.mk @@ -7,6 +7,7 @@ SRCS += \ ./watch-faces/complication/stopwatch_face.c \ ./watch-faces/complication/fast_stopwatch_face.c \ ./watch-faces/complication/sunrise_sunset_face.c \ + ./watch-faces/complication/moon_phase_face.c \ ./watch-faces/demo/accel_interrupt_count_face.c \ ./watch-faces/demo/all_segments_face.c \ ./watch-faces/demo/character_set_face.c \ diff --git a/watch-faces/complication/moon_phase_face.c b/watch-faces/complication/moon_phase_face.c new file mode 100644 index 0000000..14e21f8 --- /dev/null +++ b/watch-faces/complication/moon_phase_face.c @@ -0,0 +1,202 @@ +/* + * MIT License + * + * Copyright (c) 2022 Joey Castillo + * + * Based on Phase of Moon App for Tidbyt + * https://github.com/tidbyt/community/blob/main/apps/phaseofmoon/phase_of_moon.star + * Copyright (c) 2022 Alan Fleming + * + * + * 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 +#include "moon_phase_face.h" +#include "watch_utility.h" + +#define LUNAR_DAYS 29.53058770576 +#define LUNAR_SECONDS (LUNAR_DAYS * (24 * 60 * 60)) +#define FIRST_MOON 947182440 // Saturday, 6 January 2000 18:14:00 in unix epoch time +#define NUM_PHASES 8 + +static const float phase_changes[] = {0, 1, 6.38264692644, 8.38264692644, 13.76529385288, 15.76529385288, 21.14794077932, 23.14794077932, 28.53058770576, 29.53058770576}; + +void moon_phase_face_setup(uint8_t watch_face_index, void ** context_ptr) { + (void) watch_face_index; + if (*context_ptr == NULL) { + *context_ptr = malloc(sizeof(moon_phase_state_t)); + memset(*context_ptr, 0, sizeof(moon_phase_state_t)); + } +} + +void moon_phase_face_activate(void *context) { + (void) context; +} + +static void _update(moon_phase_state_t *state, uint32_t offset) { + (void)state; + char buf[11]; + 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; + 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; + uint8_t phase_index = 0; + + for(phase_index = 0; phase_index <= NUM_PHASES; phase_index++) { + if (currentday > phase_changes[phase_index] && currentday <= phase_changes[phase_index + 1]) break; + } + + watch_clear_display(); + + sprintf(buf, "%2d", date_time.unit.day); + watch_display_text(WATCH_POSITION_TOP_RIGHT, buf); + switch (phase_index) { + case 0: + case 8: + watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "NE!J", " Neu"); + break; + case 1: + watch_display_text(WATCH_POSITION_BOTTOM, "CresNt"); + watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "WAX", ""); + if (watch_get_lcd_type() == WATCH_LCD_TYPE_CLASSIC) { + watch_set_pixel(2, 13); + watch_set_pixel(2, 15); + if (currentfrac > 0.125) watch_set_pixel(1, 13); + } + break; + case 2: + watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "1stQtr", " 1st q"); + watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "WAX", ""); + if (watch_get_lcd_type() == WATCH_LCD_TYPE_CLASSIC) { + watch_set_pixel(2, 13); + watch_set_pixel(2, 15); + watch_set_pixel(1, 13); + watch_set_pixel(1, 14); + } + break; + case 3: + watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "GbboUs", " Gibb"); + watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "WAX", ""); + if (watch_get_lcd_type() == WATCH_LCD_TYPE_CLASSIC) { + watch_set_pixel(2, 13); + watch_set_pixel(2, 15); + watch_set_pixel(1, 14); + watch_set_pixel(1, 13); + watch_set_pixel(1, 15); + } + break; + case 4: + watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "FULL", " FULL "); + if (watch_get_lcd_type() == WATCH_LCD_TYPE_CLASSIC) { + watch_set_pixel(2, 13); + watch_set_pixel(2, 15); + watch_set_pixel(1, 14); + watch_set_pixel(2, 14); + watch_set_pixel(1, 15); + watch_set_pixel(0, 14); + watch_set_pixel(0, 13); + watch_set_pixel(1, 13); + } + break; + case 5: + watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "GbboUs", " Gibb"); + watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "WAN", ""); + if (watch_get_lcd_type() == WATCH_LCD_TYPE_CLASSIC) { + watch_set_pixel(1, 14); + watch_set_pixel(2, 14); + watch_set_pixel(1, 15); + watch_set_pixel(0, 14); + watch_set_pixel(0, 13); + } + break; + case 6: + watch_display_text_with_fallback(WATCH_POSITION_BOTTOM, "3rdQtr", " 3rd q"); + watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "WAN", ""); + if (watch_get_lcd_type() == WATCH_LCD_TYPE_CLASSIC) { + watch_set_pixel(1, 14); + watch_set_pixel(2, 14); + watch_set_pixel(0, 14); + watch_set_pixel(0, 13); + } + break; + case 7: + watch_display_text(WATCH_POSITION_BOTTOM, "CresNt"); + watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "WAN", ""); + if (watch_get_lcd_type() == WATCH_LCD_TYPE_CLASSIC) { + watch_set_pixel(0, 14); + watch_set_pixel(0, 13); + if (currentfrac < 0.875) watch_set_pixel(2, 14); + } + break; + } + watch_display_string(buf, 2); +} + +bool moon_phase_face_loop(movement_event_t event, void *context) { + moon_phase_state_t *state = (moon_phase_state_t *)context; + watch_date_time_t date_time; + + switch (event.event_type) { + case EVENT_ACTIVATE: + _update(state, state->offset); + 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); + 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); + // and kill the offset so when the wearer wakes up, it matches what's on screen. + state->offset = 0; + // finally: clear out the last two digits and replace them with the sleep mode indicator + watch_display_string(" ", 8); + if (!watch_sleep_animation_is_running()) watch_start_sleep_animation(1000); + break; + case EVENT_ALARM_BUTTON_UP: + // 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); + break; + case EVENT_ALARM_LONG_PRESS: + state->offset = 0; + _update(state, state->offset); + break; + case EVENT_TIMEOUT: + // QUESTION: Should timeout reset offset to 0? + break; + default: + return movement_default_loop_handler(event); + } + + return true; +} + +void moon_phase_face_resign(void *context) { + moon_phase_state_t *state = (moon_phase_state_t *)context; + state->offset = 0; +} diff --git a/watch-faces/complication/moon_phase_face.h b/watch-faces/complication/moon_phase_face.h new file mode 100644 index 0000000..b020982 --- /dev/null +++ b/watch-faces/complication/moon_phase_face.h @@ -0,0 +1,72 @@ +/* + * 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 MOON_PHASE_FACE_H_ +#define MOON_PHASE_FACE_H_ + +/* + * MOON PHASE face + * + * The Moon Phase face is similar to the Sunrise/Sunset face: it displays the + * current phase of the moon, along with the day of the month and a graphical + * representation of the moon on the top row. + * + * This graphical representation is a bit abstract. The segments that turn on + * represent the shape of the moon, waxing from the bottom right and waning at + * the top left. A small crescent at the bottom right will grow into a larger + * crescent, then add lines in the center for a quarter and half moon. All + * segments are on during a full moon. Then gradually the segments at the + * bottom right will turn off, until all that remains is a small waning + * crescent at the top left. + * + * All segments turn off during a new moon. + * + * On this screen you may press the Alarm button repeatedly to move forward + * in time: the day of the month at the top right will advance by one day for + * each button press, and both the text and the graphical representation will + * display the moon phase for that day. Try pressing the Alarm button 27 times + * now, just to visualize what the moon will look like over the next month. + */ + +#include "movement.h" + +typedef struct { + uint32_t offset; +} moon_phase_state_t; + +void moon_phase_face_setup(uint8_t watch_face_index, void ** context_ptr); +void moon_phase_face_activate(void *context); +bool moon_phase_face_loop(movement_event_t event, void *context); +void moon_phase_face_resign(void *context); + +#define moon_phase_face ((const watch_face_t){ \ + moon_phase_face_setup, \ + moon_phase_face_activate, \ + moon_phase_face_loop, \ + moon_phase_face_resign, \ + NULL, \ +}) + +#endif // MOON_PHASE_FACE_H_ +