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

moved tick_freq to deadline_state_t structure.

Browse Source
This commit is contained in:
Konrad Rieck 2024-03-02 21:11:17 +01:00 committed by Matheus Afonso Martins Moreira
parent c102a10165
commit fab8c94428
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
movement/watch_faces/complication/deadline_face.c
View File

@ -100,8 +100,6 @@
#define SETTINGS_NUM (5) #define SETTINGS_NUM (5)
const char settings_titles[SETTINGS_NUM][3] = { "YR", "MO", "DA", "HR", "M1" }; const char settings_titles[SETTINGS_NUM][3] = { "YR", "MO", "DA", "HR", "M1" };
static uint8_t tick_freq;
/* Local functions */ /* Local functions */
static void _running_init(movement_settings_t *settings, deadline_state_t * state); static void _running_init(movement_settings_t *settings, deadline_state_t * state);
static bool _running_loop(movement_event_t event, movement_settings_t *settings, void *context); static bool _running_loop(movement_event_t event, movement_settings_t *settings, void *context);
@ -113,7 +111,7 @@ static void _setting_display(movement_event_t event, movement_settings_t *settin
/* Utility functions */ /* Utility functions */
static void _increment_date(movement_settings_t *settings, deadline_state_t * state, watch_date_time date_time); static void _increment_date(movement_settings_t *settings, deadline_state_t * state, watch_date_time date_time);
static inline int32_t _get_tz_offset(movement_settings_t *settings); static inline int32_t _get_tz_offset(movement_settings_t *settings);
static inline void _change_tick_freq(uint8_t freq); static inline void _change_tick_freq(uint8_t freq, deadline_state_t * state);
static inline bool _is_leap(int16_t y); static inline bool _is_leap(int16_t y);
static inline int _days_in_month(int16_t mpnth, int16_t y); static inline int _days_in_month(int16_t mpnth, int16_t y);
static inline unsigned int _mod(int a, int b); static inline unsigned int _mod(int a, int b);
@ -188,11 +186,11 @@ static inline void _beep_disable(movement_settings_t *settings)
} }
/* Change tick frequency */ /* Change tick frequency */
static inline void _change_tick_freq(uint8_t freq) static inline void _change_tick_freq(uint8_t freq, deadline_state_t *state)
{ {
if (tick_freq != freq) { if (state->tick_freq != freq) {
movement_request_tick_frequency(freq); movement_request_tick_frequency(freq);
tick_freq = freq; state->tick_freq = freq;
} }
} }
@ -416,7 +414,7 @@ static bool _running_loop(movement_event_t event, movement_settings_t *settings,
} }
/* Slow down frequency after first loop for snappiness */ /* Slow down frequency after first loop for snappiness */
_change_tick_freq(1); _change_tick_freq(1, state);
return true; return true;
} }
@ -469,7 +467,7 @@ static void _setting_display(movement_event_t event, movement_settings_t *settin
/* Init setting mode */ /* Init setting mode */
static void _setting_init(movement_settings_t *settings, deadline_state_t *state) static void _setting_init(movement_settings_t *settings, deadline_state_t *state)
{ {
_change_tick_freq(4); _change_tick_freq(4, state);
state->current_page = 0; state->current_page = 0;
/* Init fresh deadline to next day */ /* Init fresh deadline to next day */
@ -489,20 +487,20 @@ static bool _setting_loop(movement_event_t event, movement_settings_t *settings,
switch (event.event_type) { switch (event.event_type) {
case EVENT_TICK: case EVENT_TICK:
if (tick_freq == 8) { if (state->tick_freq == 8) {
if (watch_get_pin_level(BTN_ALARM)) { if (watch_get_pin_level(BTN_ALARM)) {
_increment_date(settings, state, date_time); _increment_date(settings, state, date_time);
_setting_display(event, settings, state, date_time); _setting_display(event, settings, state, date_time);
} else { } else {
_change_tick_freq(4); _change_tick_freq(4, state);
} }
} }
break; break;
case EVENT_ALARM_LONG_PRESS: case EVENT_ALARM_LONG_PRESS:
_change_tick_freq(8); _change_tick_freq(8, state);
break; break;
case EVENT_ALARM_LONG_UP: case EVENT_ALARM_LONG_UP:
_change_tick_freq(4); _change_tick_freq(4, state);
break; break;
case EVENT_LIGHT_LONG_PRESS: case EVENT_LIGHT_LONG_PRESS:
_beep_button(settings); _beep_button(settings);
@ -515,14 +513,14 @@ static bool _setting_loop(movement_event_t event, movement_settings_t *settings,
_setting_display(event, settings, state, date_time); _setting_display(event, settings, state, date_time);
break; break;
case EVENT_ALARM_BUTTON_UP: case EVENT_ALARM_BUTTON_UP:
_change_tick_freq(4); _change_tick_freq(4, state);
_increment_date(settings, state, date_time); _increment_date(settings, state, date_time);
_setting_display(event, settings, state, date_time); _setting_display(event, settings, state, date_time);
break; break;
case EVENT_TIMEOUT: case EVENT_TIMEOUT:
_beep_button(settings); _beep_button(settings);
_schedule_alarm(settings, state); _schedule_alarm(settings, state);
_change_tick_freq(1); _change_tick_freq(1, state);
movement_move_to_face(0); movement_move_to_face(0);
break; break;
case EVENT_MODE_BUTTON_UP: case EVENT_MODE_BUTTON_UP:

1
movement/watch_faces/complication/deadline_face.h
View File

@ -43,6 +43,7 @@ typedef struct {
uint8_t current_page:3; uint8_t current_page:3;
uint8_t current_index:2; uint8_t current_index:2;
uint8_t alarm_enabled:1; uint8_t alarm_enabled:1;
uint8_t tick_freq;
uint32_t deadlines[DEADLINE_FACE_DATES]; uint32_t deadlines[DEADLINE_FACE_DATES];
} deadline_state_t; } deadline_state_t;