diff --git a/vscode/CMakeLists.txt b/vscode/CMakeLists.txt index bb30d7d..db5c3bf 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/keytest/keyFSM.c b/vscode/FSM_OOP/keytest/keyFSM.c index f982066..0dcda9d 100644 --- a/vscode/FSM_OOP/keytest/keyFSM.c +++ b/vscode/FSM_OOP/keytest/keyFSM.c @@ -32,8 +32,8 @@ static void initData(KeyFSM *pFSM){ // 必须重新实现 static void initDataLoader(KeyFSM *pFSM){ // 必须重新实现 - pFSM->base.privateVars.preloader.shadowData = malloc(sizeof(KeyIn)); - pFSM->base.privateVars.preloader.size = sizeof(KeyIn); + // pFSM->base.privateVars.preloader.shadowData = malloc(sizeof(KeyIn)); + // pFSM->base.privateVars.preloader.size = sizeof(KeyIn); } @@ -99,7 +99,7 @@ KeyFSM *createKeyFSM(){ pFSM = (KeyFSM *)newBaseFSM(Count_State, DEFAULT_STATE); #ifndef DSP28377 - pFSM->base.step = (Avoid_WARNING_Overrider_Fcns)step; + pFSM->base.publicFcns.step = (Avoid_WARNING_Overrider_Fcns)step; #endif pFSM->base.pureVtbl.setupHandler = (Avoid_WARNING_void_fcns)setupHandler; pFSM->base.pureVtbl.initData = (Avoid_WARNING_Overrider_Fcns)initData; diff --git a/vscode/FSM_OOP/template/templateFSM.c b/vscode/FSM_OOP/template/templateFSM.c index 9cedd93..16498c3 100644 --- a/vscode/FSM_OOP/template/templateFSM.c +++ b/vscode/FSM_OOP/template/templateFSM.c @@ -1,11 +1,3 @@ -/* - * @Author: godcreator02 qq974980621@gmail.com - * @Date: 2024-04-20 20:08:03 - * @LastEditors: godcreator02 qq974980621@gmail.com - * @LastEditTime: 2024-04-24 14:23:07 - * @FilePath: \vscode\FSM_OOP\template\templateFSM.c - * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE - */ #include #include #include diff --git a/vscode/FSM_OOP/template/templateFSM.h b/vscode/FSM_OOP/template/templateFSM.h index ccf29ff..5c8e9c1 100644 --- a/vscode/FSM_OOP/template/templateFSM.h +++ b/vscode/FSM_OOP/template/templateFSM.h @@ -22,7 +22,7 @@ enum TemplateFSMSignals{ * @brief 自定义外部数据 * */ -typedef struct _templateFSMExternalData +typedef struct TemplateFSMExternalData { int arrindex; int x; @@ -33,7 +33,7 @@ typedef struct _templateFSMExternalData * @brief 自定义内部数据 * */ -typedef struct _templateFSMInnerData +typedef struct TemplateFSMInnerData { int y1; int inner1; @@ -42,15 +42,15 @@ typedef struct _templateFSMInnerData /* -------------------------------------------------------------------------- */ /* 下面的改个名字就行了 */ /* -------------------------------------------------------------------------- */ -#define TemplateFSM_Input(pFSM) ((TemplateFSMExternalData *)_preloadIn((FSM *)pFSM)) +#define TemplateFSM_Input(pFSM) ((TemplateFSMExternalData *)_preloadIn((FSM *)pFSM)) /**< @deprecated 暂时弃用 */ -typedef struct _templateFSMData +typedef struct TemplateFSMData { TemplateFSMExternalData external; TemplateFSMInnerData internal; }TemplateFSMData; -typedef struct _TemplateFSM TemplateFSM; +typedef struct TemplateFSM TemplateFSM; TemplateFSM *createTemplateFSM(); diff --git a/vscode/FSM_OOP/template/templateFSM_private.h b/vscode/FSM_OOP/template/templateFSM_private.h index 6222cc8..9b30b58 100644 --- a/vscode/FSM_OOP/template/templateFSM_private.h +++ b/vscode/FSM_OOP/template/templateFSM_private.h @@ -18,7 +18,7 @@ extern int x; /* -------------------------------------------------------------------------- */ /* 继承基类 */ /* -------------------------------------------------------------------------- */ -typedef struct _TemplateFSM +typedef struct TemplateFSM { FSM base; }TemplateFSM;