godcreator
/
FSM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

在DSP上测试按键状态机ok，168-289

This commit is contained in:
godcreator02 2024-07-02 14:44:07 +08:00
parent 951e6d1695
commit ea121bcb29
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test_on_28377/.cproject
View File

@ -65,10 +65,10 @@
<option id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DIAG_WRAP.1704240081" name="Wrap diagnostic messages (--diag_wrap) [deprecated]" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DIAG_WRAP.off" valueType="enumerated"/> <option id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DIAG_WRAP.1704240081" name="Wrap diagnostic messages (--diag_wrap) [deprecated]" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DIAG_WRAP" value="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DIAG_WRAP.off" valueType="enumerated"/>
<option id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DISPLAY_ERROR_NUMBER.65226327" name="Emit diagnostic identifier numbers (--display_error_number, -pden) [deprecated]" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/> <option id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DISPLAY_ERROR_NUMBER.65226327" name="Emit diagnostic identifier numbers (--display_error_number, -pden) [deprecated]" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DISPLAY_ERROR_NUMBER" value="true" valueType="boolean"/>
<option id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.ABI.476173017" name="Application binary interface [See 'General' page to edit] (--abi)" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.ABI.eabi" valueType="enumerated"/> <option id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.ABI.476173017" name="Application binary interface [See 'General' page to edit] (--abi)" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.ABI" value="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.ABI.eabi" valueType="enumerated"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DIAG_SUPPRESS.591047759" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DIAG_SUPPRESS" valueType="stringList"> <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DIAG_SUPPRESS.591047759" name="Suppress diagnostic &lt;id&gt; (--diag_suppress, -pds)" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.DIAG_SUPPRESS" valueType="stringList">
<listOptionValue builtIn="false" value="303"/> <listOptionValue builtIn="false" value="303"/>
</option> </option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.OTHER_FLAGS.1805123875" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.OTHER_FLAGS" valueType="stringList"> <option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.OTHER_FLAGS.1805123875" name="Other flags" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compilerID.OTHER_FLAGS" valueType="stringList">
<listOptionValue builtIn="false" value=""/> <listOptionValue builtIn="false" value=""/>
</option> </option>
<inputType id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compiler.inputType__C_SRCS.1245540863" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compiler.inputType__C_SRCS"/> <inputType id="com.ti.ccstudio.buildDefinitions.C2000_22.6.compiler.inputType__C_SRCS.1245540863" name="C Sources" superClass="com.ti.ccstudio.buildDefinitions.C2000_22.6.compiler.inputType__C_SRCS"/>

2
test_on_28377/main.c
View File

@ -53,7 +53,7 @@ void keyFSMTest(){
KeyOut out = readKeyFSMOut(keyFSM); KeyOut out = readKeyFSMOut(keyFSM);
if(out != Idle){ if(out != Idle){
printf("\t\t\t\t%d", out); printf("\t\t\t\t%d\n", out);
} }
else{ else{
index--; index--;

2
vscode/FSM_OOP/keytest/keyFSM.c
View File

@ -14,6 +14,8 @@
#include "keyFSM.h" #include "keyFSM.h"
#include "keyFSM_private.h" #include "keyFSM_private.h"
extern KeyIn keystat;
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */
/* 用户定义逻辑 */ /* 用户定义逻辑 */
/* -------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------- */

10
vscode/FSM_OOP/keytest/keyFSM_private.h
View File

@ -6,7 +6,7 @@
#include <stdio.h> #include <stdio.h>
#include <assert.h> #include <assert.h>
extern KeyIn keystat;
/* /*
@ -47,7 +47,7 @@ static State selectNextStateFcn(Idle_State)(KeyFSMData *data){
static State selectNextStateFcn(Waiting)(KeyFSMData *data){ static State selectNextStateFcn(Waiting)(KeyFSMData *data){
if(data->external.in == Down){ if(data->external.in == pDown){
FSM_LOG(" 物理按键按下 "); FSM_LOG(" 物理按键按下 ");
return DownDebouncing; return DownDebouncing;
} }
@ -86,7 +86,7 @@ static State selectNextStateFcn(Holding)(KeyFSMData *data){
} }
static State selectNextStateFcn(HoldUpDebouncing)(KeyFSMData *data){ static State selectNextStateFcn(HoldUpDebouncing)(KeyFSMData *data){
if(data->external.in == Down){ if(data->external.in == pDown){
FSM_LOG(" 物理按键按下 "); FSM_LOG(" 物理按键按下 ");
return Holding; return Holding;
} }
@ -97,7 +97,7 @@ static State selectNextStateFcn(HoldUpDebouncing)(KeyFSMData *data){
} }
static State selectNextStateFcn(UpDebouncing)(KeyFSMData *data){ static State selectNextStateFcn(UpDebouncing)(KeyFSMData *data){
if(data->external.in == Down){ if(data->external.in == pDown){
FSM_LOG(" 物理按键按下 "); FSM_LOG(" 物理按键按下 ");
if(data->internal.countMultiDown){ if(data->internal.countMultiDown){
return MultiDowning; return MultiDowning;
@ -114,7 +114,7 @@ static State selectNextStateFcn(UpDebouncing)(KeyFSMData *data){
} }
static State selectNextStateFcn(MultiDownWaiting)(KeyFSMData *data){ static State selectNextStateFcn(MultiDownWaiting)(KeyFSMData *data){
if(data->external.in == Down){ if(data->external.in == pDown){
FSM_LOG(" 物理按键按下 "); FSM_LOG(" 物理按键按下 ");
return MultiDownDebouncing; return MultiDownDebouncing;
} }

1
vscode/FSM_OOP/keytest/main.c
View File

@ -30,7 +30,6 @@ int main(){
for (int i = 0; i < NUM; i++) for (int i = 0; i < NUM; i++)
{ {
printf("第%d次: ",i+1); printf("第%d次: ",i+1);
const KeyFSMData* data = _getData((FSM *)keyFSM);
keystat = testin[i]; keystat = testin[i];