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

Fixed stuck fast_tick

Browse Source
This commit is contained in:
David Volovskiy 2024-07-29 21:43:32 -04:00
parent 73c3ba3ae7
commit 7f2ac61375
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
movement/movement.c
View File

@ -99,7 +99,7 @@
#include <emscripten.h> #include <emscripten.h>
#endif #endif
#define DEBOUNCE_TICKS 20 // In terms of *7.8125ms #define DEBOUNCE_TICKS 2 // In terms of *7.8125ms
movement_state_t movement_state; movement_state_t movement_state;
void * watch_face_contexts[MOVEMENT_NUM_FACES]; void * watch_face_contexts[MOVEMENT_NUM_FACES];
@ -633,7 +633,6 @@ 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;
@ -685,21 +684,20 @@ void cb_alarm_fired(void) {
} }
static void debounce_btn_press(uint8_t pin, uint8_t *debounce_ticks, bool *debounce_btn_trig, uint16_t *down_timestamp, void (*function)(bool)) { static void debounce_btn_press(uint8_t pin, uint8_t *debounce_ticks, bool *debounce_btn_trig, uint16_t *down_timestamp, void (*function)(bool)) {
if (*debounce_ticks > 0) (*debounce_ticks)--; if (*debounce_ticks > 0)
{
if (--(*debounce_ticks) == 0)
_movement_disable_fast_tick_if_possible();
}
if (*debounce_btn_trig) { if (*debounce_btn_trig) {
bool pin_level = watch_get_pin_level(pin); bool pin_level = watch_get_pin_level(pin);
*debounce_btn_trig = false; *debounce_btn_trig = false;
if (pin_level) { if (*debounce_ticks == 0) {
function(pin_level);
}
else if (*debounce_ticks == 0) {
function(pin_level); function(pin_level);
*debounce_ticks = DEBOUNCE_TICKS; *debounce_ticks = DEBOUNCE_TICKS;
} }
else { else
*down_timestamp = 0; *down_timestamp = 0;
_movement_disable_fast_tick_if_possible();
}
} }
} }