Cons-n-Stuff/aic_pico
1
0
Fork 0
mirror of https://github.com/whowechina/aic_pico.git synced 2025-02-20 20:41:17 +01:00
Code Releases Activity

Fix keystuck detection

Browse Source
This commit is contained in:
whowechina 2024-05-21 12:56:41 +08:00
parent e48b5c615b
commit a4ed1f5419
2 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
firmware/src/keypad.c
View File

@ -21,22 +21,11 @@ static const uint8_t keypad_gpio[] = KEYPAD_DEF;
static bool sw_val[KEY_NUM]; /* true if pressed */
static uint64_t sw_freeze_time[KEY_NUM];
static bool keypad_en = true;
static bool keystuck = false;
void keypad_init()
{
gpio_init(KEYPAD_EN);
gpio_set_function(KEYPAD_EN, GPIO_FUNC_SIO);
gpio_set_dir(KEYPAD_EN, GPIO_IN);
gpio_pull_up(KEYPAD_EN);
keypad_en = gpio_get(KEYPAD_EN);
if (!keypad_en) {
return;
}
for (int i = 0; i < KEY_NUM; i++)
{
for (int i = 0; i < KEY_NUM; i++) {
sw_val[i] = false;
sw_freeze_time[i] = 0;
int8_t gpio = keypad_gpio[i];
@ -44,7 +33,9 @@ void keypad_init()
gpio_set_function(gpio, GPIO_FUNC_SIO);
gpio_set_dir(gpio, GPIO_IN);
gpio_pull_up(gpio);
if (gpio_get(gpio) == 0) {
}
for (int i = 0; i < KEY_NUM; i++) {
if (gpio_get(keypad_gpio[i]) == 0) {
keystuck = true;
break;
}
@ -53,7 +44,12 @@ void keypad_init()
uint8_t keypad_key_num()
{
return keypad_en ? KEY_NUM : 0;
return KEY_NUM;
}
bool keypad_is_stuck()
{
return keystuck;
}
static uint16_t keypad_reading;
@ -62,7 +58,7 @@ static uint16_t keypad_reading;
#define DEBOUNCE_FREEZE_TIME_US 20000
void keypad_update()
{
if (!keypad_en || keystuck) {
if (keystuck) {
return;
}
@ -92,8 +88,3 @@ uint16_t keypad_read()
{
return keypad_reading;
}
bool keypad_is_stuck()
{
return keystuck;
}

2
firmware/src/keypad.h
View File

@ -11,8 +11,8 @@
void keypad_init();
uint8_t keypad_key_num();
bool keypad_is_stuck();
void keypad_update();
uint16_t keypad_read();
bool keypad_is_stuck();
#endif