mirror/second-movement
3
0
Fork 0
mirror of https://github.com/joeycastillo/second-movement.git synced 2025-10-29 19:47:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

move day one face into Second Movement as generic 'days since' face

Browse Source
This commit is contained in:
Joey Castillo 2025-03-22 10:09:10 -04:00
parent 16acc5f349
commit f8e25c3ac3
5 changed files with 139 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
movement.h
View File

@ -100,21 +100,6 @@ typedef union {
uint32_t reg;
} movement_location_t;
// movement_birthdate_t is for storing the user's birth date. This will be useful for calculating the user's age — or
// hey, playing happy birthday at midnight? Fields for birth time (with hour and minute resolution) are also available,
// partly because they fit so nicely, but also because they can be useful for certain astrological calculations.
// If you create a UI for birth date or need to access it, look for it in the RTC's BKUP[2] register.
typedef union {
struct {
uint16_t year : 12; // good through the year 4095
uint8_t month : 4;
uint8_t day : 5;
uint8_t hour : 5;
uint8_t minute : 6;
} bit;
uint32_t reg;
} movement_birthdate_t;
// movement_reserved_t is a placeholder for future use of the BKUP[3] register.
typedef union {
struct {

1
movement_faces.h
View File

@ -33,6 +33,7 @@
#include "fast_stopwatch_face.h"
#include "sunrise_sunset_face.h"
#include "moon_phase_face.h"
#include "days_since_face.h"
#include "character_set_face.h"
#include "accel_interrupt_count_face.h"
#include "all_segments_face.h"

1
watch-faces.mk
View File

@ -8,6 +8,7 @@ SRCS += \
./watch-faces/complication/fast_stopwatch_face.c \
./watch-faces/complication/sunrise_sunset_face.c \
./watch-faces/complication/moon_phase_face.c \
./watch-faces/complication/days_since_face.c \
./watch-faces/demo/accel_interrupt_count_face.c \
./watch-faces/demo/all_segments_face.c \
./watch-faces/demo/character_set_face.c \

175
legacy/watch_faces/complication/day_one_face.c → watch-faces/complication/days_since_face.c
View File

@ -24,131 +24,164 @@
#include <stdlib.h>
#include <string.h>
#include "day_one_face.h"
#include "days_since_face.h"
#include "watch.h"
#include "watch_utility.h"
#include "filesystem.h"
static uint32_t _day_one_face_juliandaynum(uint16_t year, uint16_t month, uint16_t day) {
static int days_since_instances;
static void persist_date(days_since_state_t *state) {
days_since_date_t maybe_date;
days_since_date_t current_date = {0};
current_date.bit.year = state->working_year;
current_date.bit.month = state->working_month;
current_date.bit.day = state->working_day;
char filename[13];
maybe_date.reg = 0xFFFFFFFF;
sprintf(filename, "since%03d.u32", state->face_index);
filesystem_read_file(filename, (char *) &maybe_date.reg, sizeof(days_since_date_t));
if (current_date.reg != maybe_date.reg) {
filesystem_write_file(filename, (char *) &current_date.reg, sizeof(days_since_date_t));
}
}
static uint32_t _days_since_face_juliandaynum(uint16_t year, uint16_t month, uint16_t day) {
// from here: https://en.wikipedia.org/wiki/Julian_day#Julian_day_number_calculation
return (1461 * (year + 4800 + (month - 14) / 12)) / 4 + (367 * (month - 2 - 12 * ((month - 14) / 12))) / 12 - (3 * ((year + 4900 + (month - 14) / 12) / 100))/4 + day - 32075;
}
static void _day_one_face_update(day_one_state_t *state) {
static void _days_since_face_update(days_since_state_t *state) {
char buf[15];
watch_date_time_t date_time = watch_rtc_get_date_time();
uint32_t julian_date = _day_one_face_juliandaynum(date_time.unit.year + WATCH_RTC_REFERENCE_YEAR, date_time.unit.month, date_time.unit.day);
uint32_t julian_birthdate = _day_one_face_juliandaynum(state->birth_year, state->birth_month, state->birth_day);
if (julian_date < julian_birthdate) {
sprintf(buf, "DA %6lu", julian_birthdate - julian_date);
uint32_t julian_now_date = _days_since_face_juliandaynum(date_time.unit.year + WATCH_RTC_REFERENCE_YEAR, date_time.unit.month, date_time.unit.day);
uint32_t julian_since_date = _days_since_face_juliandaynum(state->working_year, state->working_month, state->working_day);
watch_display_text_with_fallback(WATCH_POSITION_TOP_LEFT, "DAY", "DA");
watch_display_text(WATCH_POSITION_TOP_RIGHT, " ");
if (julian_now_date < julian_since_date) {
sprintf(buf, "%6lu", julian_since_date - julian_now_date);
} else {
sprintf(buf, "DA %6lu", julian_date - julian_birthdate);
sprintf(buf, "%6lu", julian_now_date - julian_since_date);
}
watch_display_string(buf, 0);
watch_display_text(WATCH_POSITION_BOTTOM, buf);
}
static void _day_one_face_abort_quick_cycle(day_one_state_t *state) {
static void _days_since_face_abort_quick_cycle(days_since_state_t *state) {
if (state->quick_cycle) {
state->quick_cycle = false;
movement_request_tick_frequency(4);
}
}
static void _day_one_face_increment(day_one_state_t *state) {
static void _days_since_face_increment(days_since_state_t *state) {
state->birthday_changed = true;
switch (state->current_page) {
case PAGE_YEAR:
state->birth_year = state->birth_year + 1;
if (state->birth_year > 2080) state->birth_year = 1900;
state->working_year = state->working_year + 1;
if (state->working_year > 2080) state->working_year = 1900;
break;
case PAGE_MONTH:
state->birth_month = (state->birth_month % 12) + 1;
state->working_month = (state->working_month % 12) + 1;
break;
case PAGE_DAY:
state->birth_day = (state->birth_day % watch_utility_days_in_month(state->birth_month, state->birth_year)) + 1;
state->working_day = (state->working_day % watch_utility_days_in_month(state->working_month, state->working_year)) + 1;
break;
default:
break;
}
}
void day_one_face_setup(uint8_t watch_face_index, void ** context_ptr) {
void days_since_face_setup(uint8_t watch_face_index, void ** context_ptr) {
(void) watch_face_index;
if (*context_ptr == NULL) {
*context_ptr = malloc(sizeof(day_one_state_t));
memset(*context_ptr, 0, sizeof(day_one_state_t));
movement_birthdate_t movement_birthdate = (movement_birthdate_t) watch_get_backup_data(2);
if (movement_birthdate.reg == 0) {
// if birth date is totally blank, set a reasonable starting date. this works well for anyone under 63, but
// you can keep pressing to go back to 1900; just pass the year 2080. also picked this date because if you
// set it to 1959-01-02, it counts up from the launch of Luna-1, the first spacecraft to leave the well.
movement_birthdate.bit.year = 1959;
movement_birthdate.bit.month = 1;
movement_birthdate.bit.day = 1;
watch_store_backup_data(movement_birthdate.reg, 2);
*context_ptr = malloc(sizeof(days_since_state_t));
memset(*context_ptr, 0, sizeof(days_since_state_t));
days_since_date_t since_date = {0};
days_since_state_t *state = (days_since_state_t *)*context_ptr;
state->face_index = days_since_instances++;
// load date from file if it exists
char filename[13];
sprintf(filename, "since%03d.u32", state->face_index);
if (filesystem_file_exists(filename)) {
filesystem_read_file(filename, (char *) &since_date, sizeof(days_since_date_t));
} else {
// if birth date is not set, set a reasonable starting date. this works well for anyone under 65, but
// you can keep pressing to go back to 1900; just go past the year 2080.
since_date.bit.year = 1959;
since_date.bit.month = 1;
since_date.bit.day = 1;
}
state->working_year = since_date.bit.year;
state->working_month = since_date.bit.month;
state->working_day = since_date.bit.day;
}
}
void day_one_face_activate(void *context) {
day_one_state_t *state = (day_one_state_t *)context;
void days_since_face_activate(void *context) {
days_since_state_t *state = (days_since_state_t *)context;
state->current_page = PAGE_DISPLAY;
state->quick_cycle = false;
state->ticks = 0;
// fetch the user's birth date from the birthday register.
movement_birthdate_t movement_birthdate = (movement_birthdate_t) watch_get_backup_data(2);
state->birth_year = movement_birthdate.bit.year;
state->birth_month = movement_birthdate.bit.month;
state->birth_day = movement_birthdate.bit.day;
}
bool day_one_face_loop(movement_event_t event, void *context) {
day_one_state_t *state = (day_one_state_t *)context;
bool days_since_face_loop(movement_event_t event, void *context) {
days_since_state_t *state = (days_since_state_t *)context;
char buf[9];
switch (event.event_type) {
case EVENT_ACTIVATE:
_day_one_face_update(state);
_days_since_face_update(state);
break;
case EVENT_LOW_ENERGY_UPDATE:
case EVENT_TICK:
if (state->quick_cycle) {
if (HAL_GPIO_BTN_ALARM_read()) {
_day_one_face_increment(state);
_days_since_face_increment(state);
} else {
_day_one_face_abort_quick_cycle(state);
_days_since_face_abort_quick_cycle(state);
}
}
switch (state->current_page) {
// if in settings mode, update whatever the current page is
case PAGE_YEAR:
watch_display_string("YR ", 0);
watch_display_text_with_fallback(WATCH_POSITION_TOP, "Year ", "YR");
if (event.subsecond % 2) {
sprintf(buf, "%4d", state->birth_year);
watch_display_string(buf, 4);
sprintf(buf, "%4d ", state->working_year);
watch_display_text(WATCH_POSITION_BOTTOM, buf);
} else {
watch_display_text(WATCH_POSITION_BOTTOM, " ");
}
break;
case PAGE_MONTH:
watch_display_string("MO ", 0);
watch_display_text_with_fallback(WATCH_POSITION_TOP, "Month", "MO");
if (event.subsecond % 2) {
sprintf(buf, "%2d", state->birth_month);
watch_display_string(buf, 4);
sprintf(buf, "%2d ", state->working_month);
watch_display_text(WATCH_POSITION_BOTTOM, buf);
} else {
watch_display_text(WATCH_POSITION_BOTTOM, " ");
}
break;
case PAGE_DAY:
watch_display_string("DA ", 0);
watch_display_text_with_fallback(WATCH_POSITION_TOP, "Day ", "DA");
if (event.subsecond % 2) {
sprintf(buf, "%2d", state->birth_day);
watch_display_string(buf, 6);
sprintf(buf, " %2d ", state->working_day);
watch_display_text(WATCH_POSITION_BOTTOM, buf);
} else {
watch_display_text(WATCH_POSITION_BOTTOM, " ");
}
break;
// otherwise, check if we have to update. the display only needs to change at midnight!
case PAGE_DISPLAY: {
watch_date_time_t date_time = watch_rtc_get_date_time();
if (date_time.unit.hour == 0 && date_time.unit.minute == 0 && date_time.unit.second == 0) {
_day_one_face_update(state);
_days_since_face_update(state);
}
break;}
case PAGE_DATE:
@ -156,7 +189,7 @@ bool day_one_face_loop(movement_event_t event, void *context) {
state->ticks--;
} else {
state->current_page = PAGE_DISPLAY;
_day_one_face_update(state);
_days_since_face_update(state);
}
break;
default:
@ -188,8 +221,10 @@ bool day_one_face_loop(movement_event_t event, void *context) {
if (state->current_page == PAGE_DISPLAY) {
// ...unless we've been pushed back to display mode.
movement_request_tick_frequency(1);
// force display since it normally won't update til midnight.
_day_one_face_update(state);
// save the date if it changed
persist_date(state);
// and force display since it normally won't update til midnight.
_days_since_face_update(state);
}
break;
default:
@ -204,14 +239,24 @@ bool day_one_face_loop(movement_event_t event, void *context) {
case PAGE_MONTH:
// fall through
case PAGE_DAY:
_day_one_face_abort_quick_cycle(state);
_day_one_face_increment(state);
_days_since_face_abort_quick_cycle(state);
_days_since_face_increment(state);
break;
case PAGE_DISPLAY:
{
watch_date_time_t date_time = watch_rtc_get_date_time();
uint32_t julian_now_date = _days_since_face_juliandaynum(date_time.unit.year + WATCH_RTC_REFERENCE_YEAR, date_time.unit.month, date_time.unit.day);
uint32_t julian_since_date = _days_since_face_juliandaynum(state->working_year, state->working_month, state->working_day);
if (julian_now_date < julian_since_date) {
watch_display_text_with_fallback(WATCH_POSITION_TOP, "Until", "DA");
} else {
watch_display_text_with_fallback(WATCH_POSITION_TOP, "SINCE", "DA");
}
state->current_page = PAGE_DATE;
sprintf(buf, "%04d%02d%02d", state->birth_year % 10000, state->birth_month % 100, state->birth_day % 100);
watch_display_string(buf, 2);
sprintf(buf, "%02d%02d%02d", state->working_year % 100, state->working_month % 100, state->working_day % 100);
watch_display_text(WATCH_POSITION_BOTTOM, buf);
state->ticks = 2;
}
break;
default:
break;
@ -237,10 +282,10 @@ bool day_one_face_loop(movement_event_t event, void *context) {
}
break;
case EVENT_ALARM_LONG_UP:
_day_one_face_abort_quick_cycle(state);
_days_since_face_abort_quick_cycle(state);
break;
case EVENT_TIMEOUT:
_day_one_face_abort_quick_cycle(state);
_days_since_face_abort_quick_cycle(state);
// return home if we're on a settings page (this saves our changes when we resign).
if (state->current_page != PAGE_DISPLAY) {
movement_move_to_face(0);
@ -254,17 +299,13 @@ bool day_one_face_loop(movement_event_t event, void *context) {
return true;
}
void day_one_face_resign(void *context) {
day_one_state_t *state = (day_one_state_t *)context;
void days_since_face_resign(void *context) {
days_since_state_t *state = (days_since_state_t *)context;
// if the user changed their birth date, store it to the birth date register
if (state->birthday_changed) {
day_one_state_t *state = (day_one_state_t *)context;
movement_birthdate_t movement_birthdate = (movement_birthdate_t) watch_get_backup_data(2);
movement_birthdate.bit.year = state->birth_year;
movement_birthdate.bit.month = state->birth_month;
movement_birthdate.bit.day = state->birth_day;
watch_store_backup_data(movement_birthdate.reg, 2);
days_since_state_t *state = (days_since_state_t *)context;
persist_date(state);
state->birthday_changed = false;
}
}

49
legacy/watch_faces/complication/day_one_face.h → watch-faces/complication/days_since_face.h
View File

@ -22,11 +22,10 @@
* SOFTWARE.
*/
#ifndef DAY_ONE_FACE_H_
#define DAY_ONE_FACE_H_
#pragma once
/*
* DAY ONE face
* DAYS SINCE face (previously Day One)
*
* This watch face displays the number of days since or until a given date.
* It was originally designed to display the number of days you’ve been alive,
@ -55,29 +54,39 @@ typedef enum {
PAGE_MONTH,
PAGE_DAY,
PAGE_DATE
} day_one_page_t;
} days_since_page_t;
typedef union {
struct {
uint16_t year : 12; // good through the year 4095
uint8_t month : 4;
uint8_t day : 5;
uint8_t hour : 5;
uint8_t minute : 6;
} bit;
uint32_t reg;
} days_since_date_t;
typedef struct {
day_one_page_t current_page;
uint16_t birth_year;
uint8_t birth_month;
uint8_t birth_day;
days_since_page_t current_page;
uint8_t face_index;
uint16_t working_year;
uint8_t working_month;
uint8_t working_day;
bool birthday_changed;
bool quick_cycle;
uint8_t ticks;
} day_one_state_t;
} days_since_state_t;
void day_one_face_setup(uint8_t watch_face_index, void ** context_ptr);
void day_one_face_activate(void *context);
bool day_one_face_loop(movement_event_t event, void *context);
void day_one_face_resign(void *context);
void days_since_face_setup(uint8_t watch_face_index, void ** context_ptr);
void days_since_face_activate(void *context);
bool days_since_face_loop(movement_event_t event, void *context);
void days_since_face_resign(void *context);
#define day_one_face ((const watch_face_t){ \
day_one_face_setup, \
day_one_face_activate, \
day_one_face_loop, \
day_one_face_resign, \
#define days_since_face ((const watch_face_t){ \
days_since_face_setup, \
days_since_face_activate, \
days_since_face_loop, \
days_since_face_resign, \
NULL, \
})
#endif // DAY_ONE_FACE_H_