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

Using debounce that triggers when there's no change for Xms rather than just ignoring new presses after Xms

Browse source
This commit is contained in:
David Volovskiy 2024-07-31 07:22:33 -04:00
parent 607946ed2e
commit e297b3013e
1 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
movement/movement.c
View file

@ -171,9 +171,6 @@ static inline void _movement_reset_inactivity_countdown(void) {
static inline void _movement_enable_fast_tick_if_needed(void) { static inline void _movement_enable_fast_tick_if_needed(void) {
if (!movement_state.fast_tick_enabled) { if (!movement_state.fast_tick_enabled) {
movement_state.fast_ticks = 0; movement_state.fast_ticks = 0;
movement_state.debounce_ticks_light = 0;
movement_state.debounce_ticks_alarm = 0;
movement_state.debounce_ticks_mode = 0;
watch_rtc_register_periodic_callback(cb_fast_tick, 128); watch_rtc_register_periodic_callback(cb_fast_tick, 128);
movement_state.fast_tick_enabled = true; movement_state.fast_tick_enabled = true;
} }
@ -392,6 +389,9 @@ void app_init(void) {
movement_state.settings.bit.led_duration = MOVEMENT_DEFAULT_LED_DURATION; movement_state.settings.bit.led_duration = MOVEMENT_DEFAULT_LED_DURATION;
movement_state.light_ticks = -1; movement_state.light_ticks = -1;
movement_state.alarm_ticks = -1; movement_state.alarm_ticks = -1;
movement_state.debounce_ticks_light = 0;
movement_state.debounce_ticks_alarm = 0;
movement_state.debounce_ticks_mode = 0;
movement_state.next_available_backup_register = 4; movement_state.next_available_backup_register = 4;
_movement_reset_inactivity_countdown(); _movement_reset_inactivity_countdown();
@ -634,24 +634,28 @@ static movement_event_type_t _figure_out_button_event(bool pin_level, movement_e
// now that that's out of the way, handle falling edge // now that that's out of the way, handle falling edge
uint16_t diff = movement_state.fast_ticks - *down_timestamp; uint16_t diff = movement_state.fast_ticks - *down_timestamp;
*down_timestamp = 0; *down_timestamp = 0;
_movement_disable_fast_tick_if_possible();
// any press over a half second is considered a long press. Fire the long-up event // any press over a half second is considered a long press. Fire the long-up event
if (diff > MOVEMENT_LONG_PRESS_TICKS) return button_down_event_type + 3; if (diff > MOVEMENT_LONG_PRESS_TICKS) return button_down_event_type + 3;
else return button_down_event_type + 1; else return button_down_event_type + 1;
} }
} }
static void light_btn_action(bool pin_level) { static void light_btn_action(void) {
_movement_reset_inactivity_countdown(); _movement_reset_inactivity_countdown();
bool pin_level = watch_get_pin_level(BTN_LIGHT);
event.event_type = _figure_out_button_event(pin_level, EVENT_LIGHT_BUTTON_DOWN, &movement_state.light_down_timestamp); event.event_type = _figure_out_button_event(pin_level, EVENT_LIGHT_BUTTON_DOWN, &movement_state.light_down_timestamp);
} }
static void mode_btn_action(bool pin_level) { static void mode_btn_action(void) {
_movement_reset_inactivity_countdown(); _movement_reset_inactivity_countdown();
bool pin_level = watch_get_pin_level(BTN_MODE);
event.event_type = _figure_out_button_event(pin_level, EVENT_MODE_BUTTON_DOWN, &movement_state.mode_down_timestamp); event.event_type = _figure_out_button_event(pin_level, EVENT_MODE_BUTTON_DOWN, &movement_state.mode_down_timestamp);
} }
static void alarm_btn_action(bool pin_level) { static void alarm_btn_action(void) {
_movement_reset_inactivity_countdown(); _movement_reset_inactivity_countdown();
bool pin_level = watch_get_pin_level(BTN_ALARM);
uint8_t event_type = _figure_out_button_event(pin_level, EVENT_ALARM_BUTTON_DOWN, &movement_state.alarm_down_timestamp); uint8_t event_type = _figure_out_button_event(pin_level, EVENT_ALARM_BUTTON_DOWN, &movement_state.alarm_down_timestamp);
if (movement_state.ignore_alarm_btn_after_sleep){ if (movement_state.ignore_alarm_btn_after_sleep){
if (event_type == EVENT_ALARM_BUTTON_UP || event_type == EVENT_ALARM_LONG_UP) movement_state.ignore_alarm_btn_after_sleep = false; if (event_type == EVENT_ALARM_BUTTON_UP || event_type == EVENT_ALARM_LONG_UP) movement_state.ignore_alarm_btn_after_sleep = false;
@ -660,27 +664,19 @@ static void alarm_btn_action(bool pin_level) {
event.event_type = event_type; event.event_type = event_type;
} }
static void debounce_btn_press(uint8_t pin, uint8_t *debounce_ticks, uint16_t *down_timestamp, void (*function)(bool)) { void cb_light_btn_interrupt(void) {
bool pin_level = watch_get_pin_level(pin); movement_state.debounce_ticks_light = DEBOUNCE_TICKS;
if (*debounce_ticks <= 1) {
function(pin_level);
*debounce_ticks = DEBOUNCE_TICKS;
}
else
*down_timestamp = 0;
_movement_enable_fast_tick_if_needed(); _movement_enable_fast_tick_if_needed();
} }
void cb_light_btn_interrupt(void) {
debounce_btn_press(BTN_LIGHT, &movement_state.debounce_ticks_light, &movement_state.light_down_timestamp, light_btn_action);
}
void cb_mode_btn_interrupt(void) { void cb_mode_btn_interrupt(void) {
debounce_btn_press(BTN_MODE, &movement_state.debounce_ticks_mode, &movement_state.mode_down_timestamp, mode_btn_action); movement_state.debounce_ticks_mode = DEBOUNCE_TICKS;
_movement_enable_fast_tick_if_needed();
} }
void cb_alarm_btn_interrupt(void) { void cb_alarm_btn_interrupt(void) {
debounce_btn_press(BTN_ALARM, &movement_state.debounce_ticks_alarm, &movement_state.alarm_down_timestamp, alarm_btn_action); movement_state.debounce_ticks_alarm = DEBOUNCE_TICKS;
_movement_enable_fast_tick_if_needed();
} }
void cb_alarm_btn_extwake(void) { void cb_alarm_btn_extwake(void) {
@ -693,9 +689,12 @@ void cb_alarm_fired(void) {
} }
void cb_fast_tick(void) { void cb_fast_tick(void) {
if (movement_state.debounce_ticks_light > 0 && --movement_state.debounce_ticks_light == 0) _movement_disable_fast_tick_if_possible(); if (movement_state.debounce_ticks_light > 0 && --movement_state.debounce_ticks_light == 0)
if (movement_state.debounce_ticks_alarm > 0 && --movement_state.debounce_ticks_alarm == 0) _movement_disable_fast_tick_if_possible(); light_btn_action();
if (movement_state.debounce_ticks_mode > 0 && --movement_state.debounce_ticks_mode == 0) _movement_disable_fast_tick_if_possible(); if (movement_state.debounce_ticks_alarm > 0 && --movement_state.debounce_ticks_alarm == 0)
alarm_btn_action();
if (movement_state.debounce_ticks_mode > 0 && --movement_state.debounce_ticks_mode == 0)
mode_btn_action();
if (movement_state.debounce_ticks_light + movement_state.debounce_ticks_mode + movement_state.debounce_ticks_alarm == 0) if (movement_state.debounce_ticks_light + movement_state.debounce_ticks_mode + movement_state.debounce_ticks_alarm == 0)
movement_state.fast_ticks++; movement_state.fast_ticks++;
if (movement_state.light_ticks > 0) movement_state.light_ticks--; if (movement_state.light_ticks > 0) movement_state.light_ticks--;