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

Merge branches 'stephan242-inactivity-countdown-when-le-never' and 'stephan242-off-by-one'

Browse Source
This commit is contained in:
Alex Maestas
2026-04-08 04:42:48 +00:00
parent 5fa9b7bd24 546097dc94 e0a429aabe
commit a5fcde118e
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
movement.c
+9 -5
View File
@@ -257,11 +257,15 @@ static inline void _movement_reset_inactivity_countdown(void) {
movement_volatile_state.enter_sleep_mode = false; movement_volatile_state.enter_sleep_mode = false;
watch_rtc_register_comp_callback_no_schedule( if (movement_state.settings.bit.le_interval == 0) {
cb_sleep_timeout_interrupt, watch_rtc_disable_comp_callback_no_schedule(SLEEP_TIMEOUT);
counter + movement_le_inactivity_deadlines[movement_state.settings.bit.le_interval] * freq, } else {
SLEEP_TIMEOUT watch_rtc_register_comp_callback_no_schedule(
); cb_sleep_timeout_interrupt,
counter + movement_le_inactivity_deadlines[movement_state.settings.bit.le_interval] * freq,
SLEEP_TIMEOUT
);
}
movement_volatile_state.schedule_next_comp = true; movement_volatile_state.schedule_next_comp = true;
} }
watch-faces/settings/settings_face.c
+4 -1
View File
@@ -293,7 +293,10 @@ void settings_face_setup(uint8_t watch_face_index, void ** context_ptr) {
settings_state_t *state = (settings_state_t *)*context_ptr; settings_state_t *state = (settings_state_t *)*context_ptr;
int8_t current_setting = 0; int8_t current_setting = 0;
state->num_settings = 7; // baseline, without LED settings state->num_settings = 6; // baseline, without LED settings
#ifndef MOVEMENT_LOW_ENERGY_MODE_FORBIDDEN
state->num_settings++;
#endif
#ifdef BUILD_GIT_HASH #ifdef BUILD_GIT_HASH
state->num_settings++; state->num_settings++;
#endif #endif