fern/sensor-watch
1
0
Fork 0
mirror of https://github.com/firewalkwithm3/Sensor-Watch.git synced 2024-11-22 11:10:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Made the days_in_month its own function

Browse source
This commit is contained in:
David Volovskiy 2024-08-10 07:40:52 -04:00
parent 6ae5dfef70
commit 09576807eb
7 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/beats-time/app.c
View file

@ -204,7 +204,6 @@ void set_time_mode_handle_primary_button(void) {
void set_time_mode_handle_secondary_button(void) { void set_time_mode_handle_secondary_button(void) {
watch_date_time date_time = watch_rtc_get_date_time(); watch_date_time date_time = watch_rtc_get_date_time();
const uint8_t days_in_month[12] = {31, 28, 31, 30, 31, 30, 30, 31, 30, 31, 30, 31};
switch (application_state.page) { switch (application_state.page) {
case 0: // hour case 0: // hour
@ -227,7 +226,7 @@ void set_time_mode_handle_secondary_button(void) {
date_time.unit.day = date_time.unit.day + 1; date_time.unit.day = date_time.unit.day + 1;
break; break;
} }
if (date_time.unit.day > days_in_month[date_time.unit.month - 1] + (is_leap(date_time.unit.year) && date_time.unit.month == 2)) if (date_time.unit.day > days_in_month(date_time.unit.month, date_time.unit.year + WATCH_RTC_REFERENCE_YEAR))
date_time.unit.day = 1; date_time.unit.day = 1;
watch_rtc_set_date_time(date_time); watch_rtc_set_date_time(date_time);
} }

4
movement/watch_faces/complication/day_one_face.c
View file

@ -28,8 +28,6 @@
#include "watch.h" #include "watch.h"
#include "watch_utility.h" #include "watch_utility.h"
static const uint8_t days_in_month[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
static uint32_t _day_one_face_juliandaynum(uint16_t year, uint16_t month, uint16_t day) { static uint32_t _day_one_face_juliandaynum(uint16_t year, uint16_t month, uint16_t day) {
// from here: https://en.wikipedia.org/wiki/Julian_day#Julian_day_number_calculation // 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; 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;
@ -71,7 +69,7 @@ static void _day_one_face_increment(day_one_state_t *state) {
default: default:
break; break;
} }
if (state->birth_day == 0 || state->birth_day > (days_in_month[state->birth_month - 1] + (is_leap(state->birth_year) && state->birth_month == 2))) if (state->birth_day == 0 || state->birth_day > days_in_month(state->birth_month, state->birth_year))
state->birth_day = 1; state->birth_day = 1;
} }

5
movement/watch_faces/complication/time_left_face.c
View file

@ -159,7 +159,6 @@ static void _draw(time_left_state_t *state, uint8_t subsecond) {
/// @brief handle short or long pressing the alarm button /// @brief handle short or long pressing the alarm button
static void _handle_alarm_button(time_left_state_t *state) { static void _handle_alarm_button(time_left_state_t *state) {
const uint8_t days_in_month[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
switch (state->current_page) { switch (state->current_page) {
case TIME_LEFT_FACE_SETTINGS_STATE: // birth year case TIME_LEFT_FACE_SETTINGS_STATE: // birth year
state->birth_date.bit.year++; state->birth_date.bit.year++;
@ -182,9 +181,9 @@ static void _handle_alarm_button(time_left_state_t *state) {
state->target_date.bit.day++; state->target_date.bit.day++;
break; break;
} }
if (state->birth_date.bit.day > (days_in_month[state->birth_date.bit.month - 1] + (is_leap(state->birth_date.bit.year) && state->birth_date.bit.month == 2))) if (state->birth_date.bit.day > days_in_month(state->birth_date.bit.month, state->birth_date.bit.year))
state->birth_date.bit.day = 1; state->birth_date.bit.day = 1;
if (state->target_date.bit.day > (days_in_month[state->target_date.bit.month - 1] + (is_leap(state->target_date.bit.year) && state->target_date.bit.month == 2))) if (state->target_date.bit.day > days_in_month(state->target_date.bit.month, state->birth_date.bit.year))
state->target_date.bit.day = 1; state->target_date.bit.day = 1;
} }

3
movement/watch_faces/settings/set_time_face.c
View file

@ -34,7 +34,6 @@ static bool _quick_ticks_running;
static void _handle_alarm_button(movement_settings_t *settings, watch_date_time date_time, uint8_t current_page) { static void _handle_alarm_button(movement_settings_t *settings, watch_date_time date_time, uint8_t current_page) {
// handles short or long pressing of the alarm button // handles short or long pressing of the alarm button
const uint8_t days_in_month[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
switch (current_page) { switch (current_page) {
case 0: // hour case 0: // hour
@ -61,7 +60,7 @@ static void _handle_alarm_button(movement_settings_t *settings, watch_date_time
if (settings->bit.time_zone > 40) settings->bit.time_zone = 0; if (settings->bit.time_zone > 40) settings->bit.time_zone = 0;
break; break;
} }
if (date_time.unit.day > (days_in_month[date_time.unit.month - 1] + (is_leap(date_time.unit.year) &&date_time.unit.month == 2))) if (date_time.unit.day > days_in_month(date_time.unit.month, date_time.unit.year + WATCH_RTC_REFERENCE_YEAR))
date_time.unit.day = 1; date_time.unit.day = 1;
watch_rtc_set_date_time(date_time); watch_rtc_set_date_time(date_time);
} }

5
movement/watch_faces/settings/set_time_hackwatch_face.c
View file

@ -48,7 +48,6 @@ void set_time_hackwatch_face_activate(movement_settings_t *settings, void *conte
bool set_time_hackwatch_face_loop(movement_event_t event, movement_settings_t *settings, void *context) { bool set_time_hackwatch_face_loop(movement_event_t event, movement_settings_t *settings, void *context) {
uint8_t current_page = *((uint8_t *)context); uint8_t current_page = *((uint8_t *)context);
const uint8_t days_in_month[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
if (event.subsecond == 15) // Delay displayed time update by ~0.5 seconds, to align phase exactly to main clock at 1Hz if (event.subsecond == 15) // Delay displayed time update by ~0.5 seconds, to align phase exactly to main clock at 1Hz
date_time_settings = watch_rtc_get_date_time(); date_time_settings = watch_rtc_get_date_time();
@ -121,7 +120,7 @@ bool set_time_hackwatch_face_loop(movement_event_t event, movement_settings_t *s
case 5: // day case 5: // day
date_time_settings.unit.day = date_time_settings.unit.day - 2; date_time_settings.unit.day = date_time_settings.unit.day - 2;
if (date_time_settings.unit.day == 0) { if (date_time_settings.unit.day == 0) {
date_time_settings.unit.day = days_in_month[date_time_settings.unit.month - 1] + (is_leap(date_time_settings.unit.year) && date_time_settings.unit.month == 2); date_time_settings.unit.day = days_in_month(date_time_settings.unit.month, date_time_settings.unit.year + WATCH_RTC_REFERENCE_YEAR);
} else } else
date_time_settings.unit.day++; date_time_settings.unit.day++;
break; break;
@ -172,7 +171,7 @@ bool set_time_hackwatch_face_loop(movement_event_t event, movement_settings_t *s
if (settings->bit.time_zone > 40) settings->bit.time_zone = 0; if (settings->bit.time_zone > 40) settings->bit.time_zone = 0;
break; break;
} }
if (date_time_settings.unit.day > (days_in_month[date_time_settings.unit.month - 1] + (is_leap(date_time_settings.unit.year) && date_time_settings.unit.month == 2))) if (date_time_settings.unit.day > days_in_month(date_time_settings.unit.month, date_time_settings.unit.year + WATCH_RTC_REFERENCE_YEAR))
date_time_settings.unit.day = 1; date_time_settings.unit.day = 1;
if (current_page != 2) // Do not set time when we are at seconds, it was already set previously if (current_page != 2) // Do not set time when we are at seconds, it was already set previously
watch_rtc_set_date_time(date_time_settings); watch_rtc_set_date_time(date_time_settings);

8
watch-library/shared/watch/watch_utility.c
View file

@ -315,3 +315,11 @@ uint32_t watch_utility_offset_timestamp(uint32_t now, int8_t hours, int8_t minut
new += seconds; new += seconds;
return new; return new;
} }
uint8_t days_in_month(uint8_t month, uint16_t year) {
static const uint8_t days_in_month[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
uint8_t days = days_in_month[month - 1];
if (month == 2 && is_leap(year))
days += 1;
return days;
}

6
watch-library/shared/watch/watch_utility.h
View file

@ -164,4 +164,10 @@ float watch_utility_thermistor_temperature(uint16_t value, bool highside, float
*/ */
uint32_t watch_utility_offset_timestamp(uint32_t now, int8_t hours, int8_t minutes, int8_t seconds); uint32_t watch_utility_offset_timestamp(uint32_t now, int8_t hours, int8_t minutes, int8_t seconds);
/** @brief Returns the number of days in a month. It also handles Leap Years for February.
* @param month The month of the date (1-12)
* @param year The year of the date (ex. 2022)
*/
uint8_t days_in_month(uint8_t month, uint16_t year);
#endif #endif