shimun/solo
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Merge branch 'master' of github.com:solokeys/solo

Browse Source
This commit is contained in:
Conor Patrick 2019-08-23 14:53:22 +08:00
commit abe306a649
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
targets/stm32l432/src/device.c
View File

@ -55,7 +55,16 @@ static int is_physical_button_pressed()
static int is_touch_button_pressed() static int is_touch_button_pressed()
{ {
return tsc_read_button(0) || tsc_read_button(1); int is_pressed = (tsc_read_button(0) || tsc_read_button(1));
#ifndef IS_BOOTLOADER
if (is_pressed)
{
// delay for debounce, and longer than polling timer period.
delay(95);
return (tsc_read_button(0) || tsc_read_button(1));
}
#endif
return is_pressed;
} }
int (*IS_BUTTON_PRESSED)() = is_physical_button_pressed; int (*IS_BUTTON_PRESSED)() = is_physical_button_pressed;
@ -66,7 +75,7 @@ static void edge_detect_touch_button()
uint8_t current_touch = 0; uint8_t current_touch = 0;
if (is_touch_button_pressed == IS_BUTTON_PRESSED) if (is_touch_button_pressed == IS_BUTTON_PRESSED)
{ {
current_touch = IS_BUTTON_PRESSED(); current_touch = (tsc_read_button(0) || tsc_read_button(1));
// 1 sample per 25 ms // 1 sample per 25 ms
if ((millis() - __last_button_bounce_time) > 25) if ((millis() - __last_button_bounce_time) > 25)
@ -153,7 +162,6 @@ void device_set_status(uint32_t status)
int device_is_button_pressed() int device_is_button_pressed()
{ {
return IS_BUTTON_PRESSED(); return IS_BUTTON_PRESSED();
} }