From ae55f4b816e36f6a4a564344bd36600899295682 Mon Sep 17 00:00:00 2001 From: godcreator <974980621@qq.com> Date: Tue, 30 Jan 2024 23:07:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/CMakeLists.txt | 2 +- vscode/FSM_OOP/baseFSM/FSM.c | 2 +- vscode/FSM_OOP/baseFSM/FSM_public.h | 4 ++-- vscode/FSM_OOP/childtest/main.c | 4 ++-- vscode/FSM_OOP/keytest/main.c | 4 ++-- vscode/FSM_OOP/template/main.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/vscode/CMakeLists.txt b/vscode/CMakeLists.txt index bdbcfa0..7dbe98e 100644 --- a/vscode/CMakeLists.txt +++ b/vscode/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories(${PROJECT_SOURCE_DIR}/FSM_OOP/baseFSM) aux_source_directory(${PROJECT_SOURCE_DIR}/FSM_OOP/baseFSM SRC_FSM_OOP) -# set(keytest 789) +set(keytest 789) # set(child_parent 789) if(DEFINED keytest) include_directories(${PROJECT_SOURCE_DIR}/FSM_OOP/keytest) diff --git a/vscode/FSM_OOP/baseFSM/FSM.c b/vscode/FSM_OOP/baseFSM/FSM.c index 2dd62cc..f5610fa 100644 --- a/vscode/FSM_OOP/baseFSM/FSM.c +++ b/vscode/FSM_OOP/baseFSM/FSM.c @@ -164,7 +164,7 @@ void *_preloadIn(FSM *pFSM){ return pFSM->privateVars.preloader.in; } -void _setPreloaderReady(FSM *pFSM){ +void _preloaderGetReady(FSM *pFSM){ pFSM->privateVars.preloader.isReady = 1; } diff --git a/vscode/FSM_OOP/baseFSM/FSM_public.h b/vscode/FSM_OOP/baseFSM/FSM_public.h index f4381d3..8f4cc6a 100644 --- a/vscode/FSM_OOP/baseFSM/FSM_public.h +++ b/vscode/FSM_OOP/baseFSM/FSM_public.h @@ -7,7 +7,7 @@ typedef struct _FSM FSM; #define Step(pFSM) _vptrFSM((FSM *)pFSM)->step((FSM *)pFSM) -#define SetPreloaderReady(pFSM) _setPreloaderReady((FSM *)pFSM); +#define PreloaderGetReady(pFSM) _preloaderGetReady((FSM *)pFSM); typedef struct _FSMHandler FSMHandler; @@ -30,7 +30,7 @@ void registerChildFSM(FSM *parent, FSM *child, int index); const void *getData(FSM* pFSM); void *_preloadIn(FSM *pFSM); -void _setPreloaderReady(FSM *pFSM); +void _preloaderGetReady(FSM *pFSM); FSMVtbl *_vptrFSM(FSM* pFSM); diff --git a/vscode/FSM_OOP/childtest/main.c b/vscode/FSM_OOP/childtest/main.c index 28264ff..6b353d6 100644 --- a/vscode/FSM_OOP/childtest/main.c +++ b/vscode/FSM_OOP/childtest/main.c @@ -18,10 +18,10 @@ int main(){ for (int i = 0; i < 15; i++) { ParentFSM_Input(pFSM)->arrindex = i; - SetPreloaderReady(pFSM); + PreloaderGetReady(pFSM); ChildFSM_Input(cFSM)->arrindex = i; - SetPreloaderReady(cFSM); + PreloaderGetReady(cFSM); ChildFSMData* data = getData((FSM *)(cFSM)); printf(" %d ", data->arrindex); diff --git a/vscode/FSM_OOP/keytest/main.c b/vscode/FSM_OOP/keytest/main.c index ec840b6..cc0fa24 100644 --- a/vscode/FSM_OOP/keytest/main.c +++ b/vscode/FSM_OOP/keytest/main.c @@ -1,6 +1,6 @@ #include -#include "templateFSM.h" +#include "keyFSM.h" #include "FSM_public.h" #define NUM 60 @@ -29,7 +29,7 @@ int main(){ const KeyFSMData* data = getData((FSM *)keyFSM); *KeyFSM_Input(keyFSM) = testin[i]; - SetPreloaderReady(keyFSM); + PreloaderGetReady(keyFSM); Step(keyFSM); if(data->out){ diff --git a/vscode/FSM_OOP/template/main.c b/vscode/FSM_OOP/template/main.c index 2b969c2..4242bf1 100644 --- a/vscode/FSM_OOP/template/main.c +++ b/vscode/FSM_OOP/template/main.c @@ -13,7 +13,7 @@ int main(){ for (int i = 0; i < 15; i++) { TemplateFSM_Input(pFSM)->arrindex = i; - SetPreloaderReady(pFSM); + PreloaderGetReady(pFSM); printf("%d," ,i);