From ea121bcb2938b90e9f51139d513cf80b56150c0f Mon Sep 17 00:00:00 2001
From: godcreator02 <qq974980621@gmail.com>
Date: Tue, 2 Jul 2024 14:44:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8DSP=E4=B8=8A=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E6=8C=89=E9=94=AE=E7=8A=B6=E6=80=81=E6=9C=BAok=EF=BC=8C168-289?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_on_28377/.cproject                 |  4 ++--
 test_on_28377/main.c                    |  2 +-
 vscode/FSM_OOP/keytest/keyFSM.c         |  2 ++
 vscode/FSM_OOP/keytest/keyFSM_private.h | 10 +++++-----
 vscode/FSM_OOP/keytest/main.c           |  1 -
 5 files changed, 10 insertions(+), 9 deletions(-)

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 @@
 								<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.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"/>
 								</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=""/>
 								</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"/>
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 <stdio.h>
 #include <assert.h>
 
-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];