Merge branch 'hotfix/isLastHolding没初始化'

This commit is contained in:
godcreator 2024-01-23 23:38:20 +08:00
commit aa1f93ddbd
3 changed files with 4 additions and 1 deletions

View File

@ -40,6 +40,7 @@ static void initData(KeyFSM *pFSM){ // 必须重新实现
data->countMultiDown = 0; data->countMultiDown = 0;
data->in = Up; data->in = Up;
data->out = Idle; data->out = Idle;
data->isLastHolding = 0;
pFSM->base.data = data; pFSM->base.data = data;
} }

View File

@ -208,6 +208,7 @@ const static char *eventStr[] = {
"PhsicalDown", "PhsicalDown",
"PhsicalUp", "PhsicalUp",
"DelayCount5", "DelayCount5",
"HoldCount10",
}; };
static void printFSM(KeyFSM* pFSM){ static void printFSM(KeyFSM* pFSM){
printf("\tKeyFSM: "); printf("\tKeyFSM: ");

3
main.c
View File

@ -3,7 +3,7 @@
#include "keyFSM.h" #include "keyFSM.h"
#include "FSM_public.h" #include "FSM_public.h"
#define NUM 40 #define NUM 50
// KeyIn testin[NUM] = { // KeyIn testin[NUM] = {
// Up,Up,Up,Up,Up, Up,pDown,pDown,pDown,Up, pDown,pDown,pDown,pDown,pDown, // Up,Up,Up,Up,Up, Up,pDown,pDown,pDown,Up, pDown,pDown,pDown,pDown,pDown,
// pDown,pDown,pDown,Up,Up, pDown,pDown, // pDown,pDown,pDown,Up,Up, pDown,pDown,
@ -12,6 +12,7 @@
KeyIn testin[NUM] = { KeyIn testin[NUM] = {
Up,Up,pDown,pDown,Up, Up,Up,pDown,pDown,Up,
pDown,pDown,pDown,pDown,pDown, pDown,pDown,pDown,pDown,pDown,
pDown,pDown,pDown,Up,Up,
pDown,pDown,pDown,pDown,pDown, pDown,pDown,pDown,pDown,pDown,
pDown,pDown,pDown,pDown,pDown, pDown,pDown,pDown,pDown,pDown,
pDown,pDown,pDown,pDown,pDown, pDown,pDown,pDown,pDown,pDown,