From 5201b5769c6d62549885ac257ef5e5110b22395a Mon Sep 17 00:00:00 2001 From: godcreator <974980621@qq.com> Date: Tue, 30 Jan 2024 16:26:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E6=95=B4=E7=90=86=E4=B8=80?= =?UTF-8?q?=E4=B8=8B=E6=96=87=E4=BB=B6=EF=BC=8C=E7=88=B6=E5=AD=90=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9C=BA=E5=9C=A828377=E4=B8=8A=E4=B9=9F=E6=B5=8B?= =?UTF-8?q?=E8=AF=95ok=EF=BC=8C=E8=AE=BF=E9=97=AE=E5=88=B0=E5=AD=90?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9C=BA=E6=9C=80=E6=85=A2500=EF=BC=8C?= =?UTF-8?q?=E5=8F=AA=E6=9C=89=E7=88=B6=E7=8A=B6=E6=80=81=E6=9C=BA230?= =?UTF-8?q?=E5=B7=A6=E5=8F=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- test_on_28377/.ccsproject | 2 - test_on_28377/.cproject | 184 +++++++++--------- test_on_28377/.project | 32 +-- test_on_28377/main.c | 4 +- .../targetConfigs/TMS320F28377D.ccxml | 60 ++++-- .../.vscode}/c_cpp_properties.json | 0 {.vscode => vscode/.vscode}/launch.json | 0 {.vscode => vscode/.vscode}/settings.json | 0 {.vscode => vscode/.vscode}/tasks.json | 0 CMakeLists.txt => vscode/CMakeLists.txt | 0 {FSM_OOP => vscode/FSM_OOP}/baseFSM/FSM.c | 0 .../FSM_OOP}/baseFSM/FSM_private.h | 0 .../FSM_OOP}/baseFSM/FSM_protected.h | 0 .../FSM_OOP}/baseFSM/FSM_public.h | 0 .../FSM_OOP}/childtest/ParentFSM.c | 0 .../FSM_OOP}/childtest/childFSM.c | 0 .../FSM_OOP}/childtest/childFSM.h | 0 .../FSM_OOP}/childtest/childFSM_private.h | 0 {FSM_OOP => vscode/FSM_OOP}/childtest/main.c | 0 .../FSM_OOP}/childtest/parentFSM.h | 0 {FSM_OOP => vscode/FSM_OOP}/keytest/keyFSM.c | 0 {FSM_OOP => vscode/FSM_OOP}/keytest/keyFSM.h | 0 .../FSM_OOP}/keytest/keyFSM_private.h | 0 {FSM_OOP => vscode/FSM_OOP}/keytest/main.c | 0 .../FSM_OOP}/template/templateFSM.c | 0 .../FSM_OOP}/template/templateFSM.h | 0 .../FSM_OOP}/template/templateFSM_private.h | 0 28 files changed, 157 insertions(+), 127 deletions(-) rename {.vscode => vscode/.vscode}/c_cpp_properties.json (100%) rename {.vscode => vscode/.vscode}/launch.json (100%) rename {.vscode => vscode/.vscode}/settings.json (100%) rename {.vscode => vscode/.vscode}/tasks.json (100%) rename CMakeLists.txt => vscode/CMakeLists.txt (100%) rename {FSM_OOP => vscode/FSM_OOP}/baseFSM/FSM.c (100%) rename {FSM_OOP => vscode/FSM_OOP}/baseFSM/FSM_private.h (100%) rename {FSM_OOP => vscode/FSM_OOP}/baseFSM/FSM_protected.h (100%) rename {FSM_OOP => vscode/FSM_OOP}/baseFSM/FSM_public.h (100%) rename {FSM_OOP => vscode/FSM_OOP}/childtest/ParentFSM.c (100%) rename {FSM_OOP => vscode/FSM_OOP}/childtest/childFSM.c (100%) rename {FSM_OOP => vscode/FSM_OOP}/childtest/childFSM.h (100%) rename {FSM_OOP => vscode/FSM_OOP}/childtest/childFSM_private.h (100%) rename {FSM_OOP => vscode/FSM_OOP}/childtest/main.c (100%) rename {FSM_OOP => vscode/FSM_OOP}/childtest/parentFSM.h (100%) rename {FSM_OOP => vscode/FSM_OOP}/keytest/keyFSM.c (100%) rename {FSM_OOP => vscode/FSM_OOP}/keytest/keyFSM.h (100%) rename {FSM_OOP => vscode/FSM_OOP}/keytest/keyFSM_private.h (100%) rename {FSM_OOP => vscode/FSM_OOP}/keytest/main.c (100%) rename {FSM_OOP => vscode/FSM_OOP}/template/templateFSM.c (100%) rename {FSM_OOP => vscode/FSM_OOP}/template/templateFSM.h (100%) rename {FSM_OOP => vscode/FSM_OOP}/template/templateFSM_private.h (100%) diff --git a/.gitignore b/.gitignore index df82e2b..9156076 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/build/ +**/build/ **/CPU1_RAM/ \ No newline at end of file diff --git a/test_on_28377/.ccsproject b/test_on_28377/.ccsproject index 52e41ab..e499556 100644 --- a/test_on_28377/.ccsproject +++ b/test_on_28377/.ccsproject @@ -2,6 +2,4 @@ - - diff --git a/test_on_28377/.cproject b/test_on_28377/.cproject index 932ab24..91cf160 100644 --- a/test_on_28377/.cproject +++ b/test_on_28377/.cproject @@ -15,8 +15,8 @@ - - @@ -126,8 +129,8 @@ - - diff --git a/test_on_28377/.project b/test_on_28377/.project index d4a2e53..a64290f 100644 --- a/test_on_28377/.project +++ b/test_on_28377/.project @@ -1,6 +1,6 @@ - 02code_speed_test + FSM_test @@ -28,62 +28,68 @@ FSM.c 1 - PARENT-1-PROJECT_LOC/FSM_vscode/FSM_OOP/baseFSM/FSM.c + copy_PARENT/vscode/FSM_OOP/baseFSM/FSM.c FSM_private.h 1 - PARENT-1-PROJECT_LOC/FSM_vscode/FSM_OOP/baseFSM/FSM_private.h + copy_PARENT/vscode/FSM_OOP/baseFSM/FSM_private.h FSM_protected.h 1 - PARENT-1-PROJECT_LOC/FSM_vscode/FSM_OOP/baseFSM/FSM_protected.h + copy_PARENT/vscode/FSM_OOP/baseFSM/FSM_protected.h FSM_public.h 1 - PARENT-1-PROJECT_LOC/FSM_vscode/FSM_OOP/baseFSM/FSM_public.h + copy_PARENT/vscode/FSM_OOP/baseFSM/FSM_public.h ParentFSM.c 1 - PARENT-1-PROJECT_LOC/FSM_vscode/FSM_OOP/childtest/ParentFSM.c + copy_PARENT/vscode/FSM_OOP/childtest/ParentFSM.c childFSM.c 1 - PARENT-1-PROJECT_LOC/FSM_vscode/FSM_OOP/childtest/childFSM.c + copy_PARENT/vscode/FSM_OOP/childtest/childFSM.c childFSM.h 1 - PARENT-1-PROJECT_LOC/FSM_vscode/FSM_OOP/childtest/childFSM.h + copy_PARENT/vscode/FSM_OOP/childtest/childFSM.h childFSM_private.h 1 - PARENT-1-PROJECT_LOC/FSM_vscode/FSM_OOP/childtest/childFSM_private.h + copy_PARENT/vscode/FSM_OOP/childtest/childFSM_private.h keyFSM.c 1 - PARENT-1-PROJECT_LOC/FSM_vscode/FSM_OOP/keytest/keyFSM.c + copy_PARENT/vscode/FSM_OOP/keytest/keyFSM.c keyFSM.h 1 - PARENT-1-PROJECT_LOC/FSM_vscode/FSM_OOP/keytest/keyFSM.h + copy_PARENT/vscode/FSM_OOP/keytest/keyFSM.h keyFSM_private.h 1 - PARENT-1-PROJECT_LOC/FSM_vscode/FSM_OOP/keytest/keyFSM_private.h + copy_PARENT/vscode/FSM_OOP/keytest/keyFSM_private.h parentFSM.h 1 - PARENT-1-PROJECT_LOC/FSM_vscode/FSM_OOP/childtest/parentFSM.h + copy_PARENT/vscode/FSM_OOP/childtest/parentFSM.h + + + copy_PARENT + $%7BPARENT-3-CCS_INSTALL_ROOT%7D/godsays/indexfiles/AZ8OJKZLGK/FSM + + diff --git a/test_on_28377/main.c b/test_on_28377/main.c index 4f10b01..51379e1 100644 --- a/test_on_28377/main.c +++ b/test_on_28377/main.c @@ -133,8 +133,8 @@ void main(void) GPIO_SetupPinOptions(INPUT_GPIO, GPIO_INPUT, GPIO_PULLUP); - childTest(); -// keyFSMTest(); +// childTest(); + keyFSMTest(); // funptrTest(); } diff --git a/test_on_28377/targetConfigs/TMS320F28377D.ccxml b/test_on_28377/targetConfigs/TMS320F28377D.ccxml index ffd01a6..242481c 100644 --- a/test_on_28377/targetConfigs/TMS320F28377D.ccxml +++ b/test_on_28377/targetConfigs/TMS320F28377D.ccxml @@ -1,6 +1,7 @@ - + + @@ -16,7 +17,8 @@ - + + @@ -32,7 +34,8 @@ - + + @@ -48,7 +51,8 @@ - + + @@ -64,7 +68,8 @@ - + + @@ -80,7 +85,8 @@ - + + @@ -96,7 +102,8 @@ - + + @@ -112,7 +119,8 @@ - + + @@ -128,7 +136,8 @@ - + + @@ -144,7 +153,8 @@ - + + @@ -160,7 +170,8 @@ - + + @@ -176,7 +187,8 @@ - + + @@ -192,7 +204,8 @@ - + + @@ -208,7 +221,8 @@ - + + @@ -224,7 +238,8 @@ - + + @@ -240,7 +255,8 @@ - + + @@ -256,7 +272,8 @@ - + + @@ -272,7 +289,8 @@ - + + @@ -288,7 +306,8 @@ - + + @@ -304,7 +323,8 @@ - + + diff --git a/.vscode/c_cpp_properties.json b/vscode/.vscode/c_cpp_properties.json similarity index 100% rename from .vscode/c_cpp_properties.json rename to vscode/.vscode/c_cpp_properties.json diff --git a/.vscode/launch.json b/vscode/.vscode/launch.json similarity index 100% rename from .vscode/launch.json rename to vscode/.vscode/launch.json diff --git a/.vscode/settings.json b/vscode/.vscode/settings.json similarity index 100% rename from .vscode/settings.json rename to vscode/.vscode/settings.json diff --git a/.vscode/tasks.json b/vscode/.vscode/tasks.json similarity index 100% rename from .vscode/tasks.json rename to vscode/.vscode/tasks.json diff --git a/CMakeLists.txt b/vscode/CMakeLists.txt similarity index 100% rename from CMakeLists.txt rename to vscode/CMakeLists.txt diff --git a/FSM_OOP/baseFSM/FSM.c b/vscode/FSM_OOP/baseFSM/FSM.c similarity index 100% rename from FSM_OOP/baseFSM/FSM.c rename to vscode/FSM_OOP/baseFSM/FSM.c diff --git a/FSM_OOP/baseFSM/FSM_private.h b/vscode/FSM_OOP/baseFSM/FSM_private.h similarity index 100% rename from FSM_OOP/baseFSM/FSM_private.h rename to vscode/FSM_OOP/baseFSM/FSM_private.h diff --git a/FSM_OOP/baseFSM/FSM_protected.h b/vscode/FSM_OOP/baseFSM/FSM_protected.h similarity index 100% rename from FSM_OOP/baseFSM/FSM_protected.h rename to vscode/FSM_OOP/baseFSM/FSM_protected.h diff --git a/FSM_OOP/baseFSM/FSM_public.h b/vscode/FSM_OOP/baseFSM/FSM_public.h similarity index 100% rename from FSM_OOP/baseFSM/FSM_public.h rename to vscode/FSM_OOP/baseFSM/FSM_public.h diff --git a/FSM_OOP/childtest/ParentFSM.c b/vscode/FSM_OOP/childtest/ParentFSM.c similarity index 100% rename from FSM_OOP/childtest/ParentFSM.c rename to vscode/FSM_OOP/childtest/ParentFSM.c diff --git a/FSM_OOP/childtest/childFSM.c b/vscode/FSM_OOP/childtest/childFSM.c similarity index 100% rename from FSM_OOP/childtest/childFSM.c rename to vscode/FSM_OOP/childtest/childFSM.c diff --git a/FSM_OOP/childtest/childFSM.h b/vscode/FSM_OOP/childtest/childFSM.h similarity index 100% rename from FSM_OOP/childtest/childFSM.h rename to vscode/FSM_OOP/childtest/childFSM.h diff --git a/FSM_OOP/childtest/childFSM_private.h b/vscode/FSM_OOP/childtest/childFSM_private.h similarity index 100% rename from FSM_OOP/childtest/childFSM_private.h rename to vscode/FSM_OOP/childtest/childFSM_private.h diff --git a/FSM_OOP/childtest/main.c b/vscode/FSM_OOP/childtest/main.c similarity index 100% rename from FSM_OOP/childtest/main.c rename to vscode/FSM_OOP/childtest/main.c diff --git a/FSM_OOP/childtest/parentFSM.h b/vscode/FSM_OOP/childtest/parentFSM.h similarity index 100% rename from FSM_OOP/childtest/parentFSM.h rename to vscode/FSM_OOP/childtest/parentFSM.h diff --git a/FSM_OOP/keytest/keyFSM.c b/vscode/FSM_OOP/keytest/keyFSM.c similarity index 100% rename from FSM_OOP/keytest/keyFSM.c rename to vscode/FSM_OOP/keytest/keyFSM.c diff --git a/FSM_OOP/keytest/keyFSM.h b/vscode/FSM_OOP/keytest/keyFSM.h similarity index 100% rename from FSM_OOP/keytest/keyFSM.h rename to vscode/FSM_OOP/keytest/keyFSM.h diff --git a/FSM_OOP/keytest/keyFSM_private.h b/vscode/FSM_OOP/keytest/keyFSM_private.h similarity index 100% rename from FSM_OOP/keytest/keyFSM_private.h rename to vscode/FSM_OOP/keytest/keyFSM_private.h diff --git a/FSM_OOP/keytest/main.c b/vscode/FSM_OOP/keytest/main.c similarity index 100% rename from FSM_OOP/keytest/main.c rename to vscode/FSM_OOP/keytest/main.c diff --git a/FSM_OOP/template/templateFSM.c b/vscode/FSM_OOP/template/templateFSM.c similarity index 100% rename from FSM_OOP/template/templateFSM.c rename to vscode/FSM_OOP/template/templateFSM.c diff --git a/FSM_OOP/template/templateFSM.h b/vscode/FSM_OOP/template/templateFSM.h similarity index 100% rename from FSM_OOP/template/templateFSM.h rename to vscode/FSM_OOP/template/templateFSM.h diff --git a/FSM_OOP/template/templateFSM_private.h b/vscode/FSM_OOP/template/templateFSM_private.h similarity index 100% rename from FSM_OOP/template/templateFSM_private.h rename to vscode/FSM_OOP/template/templateFSM_private.h