消掉laststate,修改一下状态机框架,还没在DSP测试,不保证正确
This commit is contained in:
parent
040d04ef64
commit
ea394221ff
|
@ -3,9 +3,9 @@
|
|||
|
||||
#include "FSM_public.h"
|
||||
|
||||
#define during
|
||||
#define enter
|
||||
#define exit
|
||||
#define during during
|
||||
#define enter enter
|
||||
#define exit exit
|
||||
|
||||
#define transitionHandler(event) event##Handler
|
||||
#define actionFcn(action, state) state##_##action##Action
|
||||
|
@ -18,6 +18,10 @@ typedef int (*Avoid_WARNING_int_data)(void *data);
|
|||
typedef void (*Avoid_WARNING_void_fcns)(FSMHandler *fcns);
|
||||
|
||||
|
||||
#define addStateActionFcn(type, state) fcns->type##ActionTable[state] = (Avoid_WARNING_void_FSM)actionFcn(type, state)
|
||||
#define addTransitionHandler(state, event) fcns->transitionTable[index(state, event)] = (Avoid_WARNING_int_FSM)transitionHandler(event)
|
||||
|
||||
|
||||
typedef struct _FSM FSM;
|
||||
typedef struct _FSMHandler{
|
||||
int (**transitionTable)(FSM *pFSM);
|
||||
|
|
|
@ -15,12 +15,6 @@ static Event selectEvent(KeyFSMData *data){ // 必须重新实现
|
|||
}
|
||||
|
||||
if(data->countDelay == 3){
|
||||
if(data->countMultiDown && data->lastState == MultiDownWaiting){
|
||||
return MultiDown;
|
||||
}
|
||||
if(data->lastState == Holding){
|
||||
return UpDebouncing2Waiting;
|
||||
}
|
||||
return DelayCount3;
|
||||
}
|
||||
|
||||
|
@ -28,9 +22,6 @@ static Event selectEvent(KeyFSMData *data){ // 必须重新实现
|
|||
return PhsicalUp;
|
||||
}
|
||||
else{
|
||||
if(data->lastState == Holding){
|
||||
return UpDebouncing2Holding;
|
||||
}
|
||||
return PhsicalDown;
|
||||
}
|
||||
}
|
||||
|
@ -41,7 +32,7 @@ static void step(KeyFSM* pFSM){
|
|||
|
||||
KeyFSMData * data = pFSM->base.data;
|
||||
|
||||
printf("\t信号:%d, 计数%d, 上次状态%s", data->out, data->countDelay, stateStr[data->lastState]);
|
||||
printf("\t信号:%d, 计数%d ", data->out, data->countDelay);
|
||||
}
|
||||
|
||||
static void initData(KeyFSM *pFSM){ // 必须重新实现
|
||||
|
@ -50,54 +41,38 @@ static void initData(KeyFSM *pFSM){ // 必须重新实现
|
|||
data->countMultiDown = 0;
|
||||
data->in = Up;
|
||||
data->out = Idle;
|
||||
data->lastState = 0;
|
||||
|
||||
pFSM->base.data = data;
|
||||
}
|
||||
|
||||
static void setupHandler(FSMHandler* fcns){ // 必须重新实现
|
||||
fcns->duringActionTable[Waiting] = (Avoid_WARNING_void_FSM)actionFcn(during, Waiting);
|
||||
fcns->exitActionTable[Waiting] = (Avoid_WARNING_void_FSM)actionFcn(exit, Waiting);
|
||||
|
||||
fcns->duringActionTable[DownDebouncing] = (Avoid_WARNING_void_FSM)actionFcn(during, DownDebouncing);
|
||||
fcns->exitActionTable[DownDebouncing] = (Avoid_WARNING_void_FSM)actionFcn(exit, DownDebouncing);
|
||||
|
||||
fcns->duringActionTable[Downing] = (Avoid_WARNING_void_FSM)actionFcn(during, Downing);
|
||||
fcns->exitActionTable[Downing] = (Avoid_WARNING_void_FSM)actionFcn(exit, Downing);
|
||||
|
||||
fcns->duringActionTable[UpDebouncing] = (Avoid_WARNING_void_FSM)actionFcn(during, UpDebouncing);
|
||||
fcns->exitActionTable[UpDebouncing] = (Avoid_WARNING_void_FSM)actionFcn(exit, UpDebouncing);
|
||||
|
||||
fcns->duringActionTable[Holding] = (Avoid_WARNING_void_FSM)actionFcn(during, Holding);
|
||||
fcns->exitActionTable[Holding] = (Avoid_WARNING_void_FSM)actionFcn(exit, Holding);
|
||||
|
||||
fcns->duringActionTable[MultiDownWaiting] = (Avoid_WARNING_void_FSM)actionFcn(during, MultiDownWaiting);
|
||||
|
||||
fcns->duringActionTable[MultiDowning] = (Avoid_WARNING_void_FSM)actionFcn(during, MultiDowning);
|
||||
fcns->exitActionTable[MultiDowning] = (Avoid_WARNING_void_FSM)actionFcn(during, MultiDowning);
|
||||
addStateActionFcn(during, Waiting);
|
||||
addStateActionFcn(exit, Waiting);
|
||||
addStateActionFcn(during, DownDebouncing);
|
||||
addStateActionFcn(during, Downing);
|
||||
addStateActionFcn(exit, Downing);
|
||||
addStateActionFcn(during, UpDebouncing);
|
||||
addStateActionFcn(during, Holding);
|
||||
addStateActionFcn(exit, Holding);
|
||||
addStateActionFcn(during, MultiDownWaiting);
|
||||
addStateActionFcn(during, MultiDowning);
|
||||
addStateActionFcn(exit, MultiDowning);
|
||||
addStateActionFcn(during, HoldUpDebouncing);
|
||||
|
||||
|
||||
fcns->transitionTable[index(Waiting, PhsicalDown)] = (Avoid_WARNING_int_FSM)transitionHandler(PhsicalDown);
|
||||
|
||||
fcns->transitionTable[index(DownDebouncing, PhsicalUp)] = (Avoid_WARNING_int_FSM)transitionHandler(PhsicalUp);
|
||||
fcns->transitionTable[index(DownDebouncing, DelayCount3)] = (Avoid_WARNING_int_FSM)transitionHandler(DelayCount3);
|
||||
fcns->transitionTable[index(DownDebouncing, MultiDown)] = (Avoid_WARNING_int_FSM)transitionHandler(MultiDown);
|
||||
|
||||
fcns->transitionTable[index(Downing, PhsicalUp)] = (Avoid_WARNING_int_FSM)transitionHandler(PhsicalUp);
|
||||
fcns->transitionTable[index(Downing, HoldCount4)] = (Avoid_WARNING_int_FSM)transitionHandler(HoldCount4);
|
||||
|
||||
fcns->transitionTable[index(UpDebouncing, PhsicalDown)] = (Avoid_WARNING_int_FSM)transitionHandler(PhsicalDown);
|
||||
fcns->transitionTable[index(UpDebouncing, DelayCount3)] = (Avoid_WARNING_int_FSM)transitionHandler(DelayCount3);
|
||||
fcns->transitionTable[index(UpDebouncing, UpDebouncing2Holding)] = (Avoid_WARNING_int_FSM)transitionHandler(UpDebouncing2Holding);
|
||||
fcns->transitionTable[index(UpDebouncing, UpDebouncing2Waiting)] = (Avoid_WARNING_int_FSM)transitionHandler(UpDebouncing2Waiting);
|
||||
|
||||
fcns->transitionTable[index(Holding, PhsicalUp)] = (Avoid_WARNING_int_FSM)transitionHandler(PhsicalUp);
|
||||
|
||||
fcns->transitionTable[index(MultiDownWaiting, PhsicalDown)] = (Avoid_WARNING_int_FSM)transitionHandler(PhsicalDown);
|
||||
fcns->transitionTable[index(MultiDownWaiting, DelayCount3)] = (Avoid_WARNING_int_FSM)transitionHandler(DelayCount3);
|
||||
|
||||
fcns->transitionTable[index(MultiDowning, PhsicalUp)] = (Avoid_WARNING_int_FSM)transitionHandler(PhsicalUp);
|
||||
|
||||
addTransitionHandler(Waiting, PhsicalDown);
|
||||
addTransitionHandler(DownDebouncing, PhsicalUp);
|
||||
addTransitionHandler(DownDebouncing, DelayCount3);
|
||||
addTransitionHandler(Downing, PhsicalUp);
|
||||
addTransitionHandler(Downing, HoldCount4);
|
||||
addTransitionHandler(UpDebouncing, PhsicalDown);
|
||||
addTransitionHandler(UpDebouncing, DelayCount3);
|
||||
addTransitionHandler(Holding, PhsicalUp);
|
||||
addTransitionHandler(MultiDownWaiting, PhsicalDown);
|
||||
addTransitionHandler(MultiDownWaiting, DelayCount3);
|
||||
addTransitionHandler(MultiDowning, PhsicalUp);
|
||||
addTransitionHandler(HoldUpDebouncing, PhsicalDown);
|
||||
addTransitionHandler(HoldUpDebouncing, DelayCount3);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -22,7 +22,6 @@ typedef struct _keyFSMData
|
|||
int countMultiDown;
|
||||
KeyIn in;
|
||||
KeyOutSignal out;
|
||||
int lastState;
|
||||
}KeyFSMData;
|
||||
|
||||
typedef struct _KeyFSM KeyFSM;
|
||||
|
|
|
@ -29,6 +29,7 @@ typedef enum _State
|
|||
UpDebouncing,
|
||||
MultiDownWaiting,
|
||||
MultiDowning,
|
||||
HoldUpDebouncing,
|
||||
|
||||
Count_State,
|
||||
} State;
|
||||
|
@ -53,11 +54,6 @@ static void actionFcn(during, DownDebouncing)(KeyFSM *pFSM)
|
|||
printf(" during开启消抖 ");
|
||||
}
|
||||
|
||||
static void actionFcn(exit, DownDebouncing)(KeyFSM *pFSM){
|
||||
KeyFSMData * data = pFSM->base.data;
|
||||
data->lastState = Idle_State;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void actionFcn(during, Downing)(KeyFSM *pFSM)
|
||||
|
@ -79,12 +75,6 @@ static void actionFcn(during, UpDebouncing)(KeyFSM *pFSM){
|
|||
data->countDelay++;
|
||||
printf(" during松开消抖 ");
|
||||
}
|
||||
static void actionFcn(exit, UpDebouncing)(KeyFSM *pFSM){
|
||||
KeyFSMData * data = pFSM->base.data;
|
||||
data->lastState = Idle_State;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
static void actionFcn(during, Holding)(KeyFSM *pFSM){
|
||||
|
@ -124,6 +114,12 @@ static void actionFcn(exit, MultiDowning)(KeyFSM *pFSM){
|
|||
data->out = Idle;
|
||||
}
|
||||
|
||||
static void actionFcn(during, HoldUpDebouncing)(KeyFSM *pFSM)
|
||||
{
|
||||
KeyFSMData * data = pFSM->base.data;
|
||||
data->countDelay++;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
|
@ -137,9 +133,6 @@ typedef enum _Event{
|
|||
DelayCount3,
|
||||
|
||||
HoldCount4,
|
||||
MultiDown,
|
||||
UpDebouncing2Holding,
|
||||
UpDebouncing2Waiting,
|
||||
|
||||
Count_Event,
|
||||
}Event;
|
||||
|
@ -155,21 +148,18 @@ static State transitionHandler(PhsicalDown)(KeyFSM *pFSM)
|
|||
return DownDebouncing;
|
||||
|
||||
case UpDebouncing:
|
||||
if(data->countMultiDown){
|
||||
if(data->countMultiDown)
|
||||
return MultiDowning;
|
||||
}
|
||||
|
||||
if(data->lastState == Holding){
|
||||
data->lastState = Idle_State;
|
||||
return Holding;
|
||||
}
|
||||
else
|
||||
return Downing;
|
||||
|
||||
case HoldUpDebouncing:
|
||||
return Holding;
|
||||
|
||||
case MultiDownWaiting:
|
||||
data->lastState = MultiDownWaiting;
|
||||
return DownDebouncing;
|
||||
|
||||
|
||||
default:
|
||||
printf("检查状态转移表设计,不应该到这里");
|
||||
assert(0);
|
||||
|
@ -193,8 +183,7 @@ static State transitionHandler(PhsicalUp)(KeyFSM *pFSM)
|
|||
case Downing:
|
||||
return UpDebouncing;
|
||||
case Holding:
|
||||
data->lastState = Holding;
|
||||
return UpDebouncing;
|
||||
return HoldUpDebouncing;
|
||||
|
||||
case MultiDowning:
|
||||
return UpDebouncing;
|
||||
|
@ -230,6 +219,9 @@ static State transitionHandler(DelayCount3)(KeyFSM *pFSM){
|
|||
data->countMultiDown = 0;
|
||||
return Waiting;
|
||||
|
||||
case HoldUpDebouncing:
|
||||
return Waiting;
|
||||
|
||||
default:
|
||||
printf("检查状态转移表设计,不应该到这里");
|
||||
assert(0);
|
||||
|
@ -270,21 +262,7 @@ static State transitionHandler(MultiDown)(KeyFSM *pFSM){
|
|||
return MultiDowning;
|
||||
}
|
||||
|
||||
static State transitionHandler(UpDebouncing2Holding)(KeyFSM *pFSM){
|
||||
printf(" 回到长按 ");
|
||||
KeyFSMData * data = pFSM->base.data;
|
||||
data->countDelay = 0;
|
||||
data->out = Idle;
|
||||
return Holding;
|
||||
}
|
||||
|
||||
static State transitionHandler(UpDebouncing2Waiting)(KeyFSM *pFSM){
|
||||
printf(" 关闭消抖到等待 ");
|
||||
KeyFSMData * data = pFSM->base.data;
|
||||
data->countDelay = 0;
|
||||
data->out = Idle;
|
||||
return Waiting;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
|
@ -299,6 +277,7 @@ const static char *stateStr[] = {
|
|||
"UpDebouncing",
|
||||
"MultiDownWaiting",
|
||||
"MultiDowning",
|
||||
"HoldUpDebouncing",
|
||||
};
|
||||
const static char *eventStr[] = {
|
||||
"Idle",
|
||||
|
@ -306,9 +285,6 @@ const static char *eventStr[] = {
|
|||
"PhsicalUp",
|
||||
"DelayCount3",
|
||||
"HoldCount4",
|
||||
"MultiDown",
|
||||
"UpDebouncing2Holding",
|
||||
"UpDebouncing2Waiting"
|
||||
};
|
||||
static void printFSM(KeyFSM* pFSM){
|
||||
printf("\tKeyFSM: ");
|
||||
|
|
Loading…
Reference in New Issue