diff --git a/test_on_28377/.cproject b/test_on_28377/.cproject index e1d4e28..a7ce628 100644 --- a/test_on_28377/.cproject +++ b/test_on_28377/.cproject @@ -65,10 +65,10 @@ - diff --git a/test_on_28377/main.c b/test_on_28377/main.c index 21be006..b8276e0 100644 --- a/test_on_28377/main.c +++ b/test_on_28377/main.c @@ -53,7 +53,7 @@ void keyFSMTest(){ KeyOut out = readKeyFSMOut(keyFSM); if(out != Idle){ - printf("\t\t\t\t%d", out); + printf("\t\t\t\t%d\n", out); } else{ index--; diff --git a/vscode/FSM_OOP/keytest/keyFSM.c b/vscode/FSM_OOP/keytest/keyFSM.c index a9f9b7c..f3899dd 100644 --- a/vscode/FSM_OOP/keytest/keyFSM.c +++ b/vscode/FSM_OOP/keytest/keyFSM.c @@ -14,6 +14,8 @@ #include "keyFSM.h" #include "keyFSM_private.h" +extern KeyIn keystat; + /* -------------------------------------------------------------------------- */ /* 用户定义逻辑 */ /* -------------------------------------------------------------------------- */ diff --git a/vscode/FSM_OOP/keytest/keyFSM_private.h b/vscode/FSM_OOP/keytest/keyFSM_private.h index c080ee6..195bcb2 100644 --- a/vscode/FSM_OOP/keytest/keyFSM_private.h +++ b/vscode/FSM_OOP/keytest/keyFSM_private.h @@ -6,7 +6,7 @@ #include #include -extern KeyIn keystat; + /* @@ -47,7 +47,7 @@ static State selectNextStateFcn(Idle_State)(KeyFSMData *data){ static State selectNextStateFcn(Waiting)(KeyFSMData *data){ - if(data->external.in == Down){ + if(data->external.in == pDown){ FSM_LOG(" 物理按键按下 "); return DownDebouncing; } @@ -86,7 +86,7 @@ static State selectNextStateFcn(Holding)(KeyFSMData *data){ } static State selectNextStateFcn(HoldUpDebouncing)(KeyFSMData *data){ - if(data->external.in == Down){ + if(data->external.in == pDown){ FSM_LOG(" 物理按键按下 "); return Holding; } @@ -97,7 +97,7 @@ static State selectNextStateFcn(HoldUpDebouncing)(KeyFSMData *data){ } static State selectNextStateFcn(UpDebouncing)(KeyFSMData *data){ - if(data->external.in == Down){ + if(data->external.in == pDown){ FSM_LOG(" 物理按键按下 "); if(data->internal.countMultiDown){ return MultiDowning; @@ -114,7 +114,7 @@ static State selectNextStateFcn(UpDebouncing)(KeyFSMData *data){ } static State selectNextStateFcn(MultiDownWaiting)(KeyFSMData *data){ - if(data->external.in == Down){ + if(data->external.in == pDown){ FSM_LOG(" 物理按键按下 "); return MultiDownDebouncing; } diff --git a/vscode/FSM_OOP/keytest/main.c b/vscode/FSM_OOP/keytest/main.c index bd4ee63..a87be29 100644 --- a/vscode/FSM_OOP/keytest/main.c +++ b/vscode/FSM_OOP/keytest/main.c @@ -30,7 +30,6 @@ int main(){ for (int i = 0; i < NUM; i++) { printf("第%d次: ",i+1); - const KeyFSMData* data = _getData((FSM *)keyFSM); keystat = testin[i];