diff --git a/vscode/CMakeLists.txt b/vscode/CMakeLists.txt index 7dbe98e..bdbcfa0 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 f5610fa..04c9871 100644 --- a/vscode/FSM_OOP/baseFSM/FSM.c +++ b/vscode/FSM_OOP/baseFSM/FSM.c @@ -135,8 +135,6 @@ void constructFSM(FSM* pFSM){ /* public 函数 */ - - int getFSMCurState(FSM *pFSM){ return pFSM->privateVars.curState; } @@ -156,18 +154,30 @@ void registerChildFSM(FSM *parent, FSM *child, int index){ parent->privateVars.childFSM[index] = child; } -const void *getData(FSM* pFSM){ +const void *_getData(FSM* pFSM){ return (const void *)pFSM->data; } + void *_preloadIn(FSM *pFSM){ return pFSM->privateVars.preloader.in; } void _preloaderGetReady(FSM *pFSM){ + if(pFSM->privateVars.preloader.isReady){ + pFSM->privateVars.preloader.isOverflow = 1; + } pFSM->privateVars.preloader.isReady = 1; } +int _getPreloaderOverFlag(FSM *pFSM){ + return pFSM->privateVars.preloader.isOverflow; +} + +void _clearPreloaderOverFlag(FSM *pFSM){ + pFSM->privateVars.preloader.isOverflow = 0; +} + FSMVtbl *_vptrFSM(FSM* pFSM){ return &pFSM->vtbl; diff --git a/vscode/FSM_OOP/baseFSM/FSM_protected.h b/vscode/FSM_OOP/baseFSM/FSM_protected.h index fc23698..0b43d9c 100644 --- a/vscode/FSM_OOP/baseFSM/FSM_protected.h +++ b/vscode/FSM_OOP/baseFSM/FSM_protected.h @@ -60,6 +60,7 @@ typedef struct _FSMDataLoader { void *in; int isReady; + int isOverflow; size_t preloadSize; }FSMDataLoader; diff --git a/vscode/FSM_OOP/baseFSM/FSM_public.h b/vscode/FSM_OOP/baseFSM/FSM_public.h index 8f4cc6a..5168aff 100644 --- a/vscode/FSM_OOP/baseFSM/FSM_public.h +++ b/vscode/FSM_OOP/baseFSM/FSM_public.h @@ -6,9 +6,12 @@ typedef struct _FSM FSM; -#define Step(pFSM) _vptrFSM((FSM *)pFSM)->step((FSM *)pFSM) -#define PreloaderGetReady(pFSM) _preloaderGetReady((FSM *)pFSM); - +#define Step(pFSM) _vptrFSM((FSM *)pFSM)->step((FSM *)pFSM) +#define PreloaderGetReady(pFSM) _preloaderGetReady((FSM *)pFSM); +#define GetPreloaderOverFlag(pFSM) _getPreloaderOverFlag((FSM *)pFSM) +#define ClearPreloaderOverFlag(pFSM) _clearPreloaderOverFlag((FSM *)pFSM) +#define GetData(pFSM) _getData((FSM*)pFSM) + typedef struct _FSMHandler FSMHandler; // 这几个函数可认为是虚函数, 构造函数里不会初始化FSMVtbl, 必须由子类重新实现 @@ -22,15 +25,19 @@ typedef struct _FSMVtbl { void (*initDataLoader)(FSM *pFSM); // 子类必须重新实现 }FSMVtbl; - +/* --------------------------------- 状态机信息获取 -------------------------------- */ int getFSMCurState(FSM *pFSM); int getFSMCurEvent(FSM *pFSM); void setChildNum(FSM *pFSM, int num); void registerChildFSM(FSM *parent, FSM *child, int index); -const void *getData(FSM* pFSM); +const void *_getData(FSM* pFSM); + +/* ---------------------------------- 预装载器 ---------------------------------- */ void *_preloadIn(FSM *pFSM); void _preloaderGetReady(FSM *pFSM); +int _getPreloaderOverFlag(FSM *pFSM); +void _clearPreloaderOverFlag(FSM *pFSM); FSMVtbl *_vptrFSM(FSM* pFSM); diff --git a/vscode/FSM_OOP/childtest/main.c b/vscode/FSM_OOP/childtest/main.c index 6b353d6..dc89bcb 100644 --- a/vscode/FSM_OOP/childtest/main.c +++ b/vscode/FSM_OOP/childtest/main.c @@ -23,7 +23,7 @@ int main(){ ChildFSM_Input(cFSM)->arrindex = i; PreloaderGetReady(cFSM); - ChildFSMData* data = getData((FSM *)(cFSM)); + ChildFSMData* data = _getData((FSM *)(cFSM)); printf(" %d ", data->arrindex); diff --git a/vscode/FSM_OOP/keytest/keyFSM.h b/vscode/FSM_OOP/keytest/keyFSM.h index 78c0c12..620b002 100644 --- a/vscode/FSM_OOP/keytest/keyFSM.h +++ b/vscode/FSM_OOP/keytest/keyFSM.h @@ -29,8 +29,13 @@ const static char *keyStr[] = typedef struct _keyFSMData { + /* ----------------------------------- 输入 ----------------------------------- */ KeyIn in; + + /* ----------------------------------- 输出 ----------------------------------- */ KeyOutSignal out; + + /* ---------------------------------- 内部变量 ---------------------------------- */ int countDelay; int countMultiDown; }KeyFSMData; diff --git a/vscode/FSM_OOP/keytest/main.c b/vscode/FSM_OOP/keytest/main.c index cc0fa24..07d4abf 100644 --- a/vscode/FSM_OOP/keytest/main.c +++ b/vscode/FSM_OOP/keytest/main.c @@ -26,10 +26,11 @@ int main(){ for (int i = 0; i < NUM; i++) { printf("第%d次: ",i+1); - const KeyFSMData* data = getData((FSM *)keyFSM); + const KeyFSMData* data = _getData((FSM *)keyFSM); *KeyFSM_Input(keyFSM) = testin[i]; PreloaderGetReady(keyFSM); + ClearPreloaderOverFlag(keyFSM); Step(keyFSM); if(data->out){ diff --git a/vscode/FSM_OOP/template/main.c b/vscode/FSM_OOP/template/main.c index 4242bf1..bc815a8 100644 --- a/vscode/FSM_OOP/template/main.c +++ b/vscode/FSM_OOP/template/main.c @@ -14,8 +14,12 @@ int main(){ { TemplateFSM_Input(pFSM)->arrindex = i; PreloaderGetReady(pFSM); + + const TemplateFSMData* data = GetData(pFSM); + + int ovflag = GetPreloaderOverFlag(pFSM); - printf("%d," ,i); + printf("%d, 溢出情况:%d" ,i, ovflag); Step(pFSM); printf("\n"); diff --git a/vscode/FSM_OOP/template/templateFSM.h b/vscode/FSM_OOP/template/templateFSM.h index 610a13f..8650f74 100644 --- a/vscode/FSM_OOP/template/templateFSM.h +++ b/vscode/FSM_OOP/template/templateFSM.h @@ -2,8 +2,7 @@ #define __TEMPLATE_FSM_H_ -#define TemplateFSM_Input(pFSM) ((TemplateFSMIn *)_preloadIn((FSM *)pFSM)) - +#define TemplateFSM_Input(pFSM) ((TemplateFSMIn *)_preloadIn((FSM *)pFSM)) typedef struct _templateFSMIn { diff --git a/vscode/FSM_OOP/template/templateFSM_private.h b/vscode/FSM_OOP/template/templateFSM_private.h index 240a866..af07c1c 100644 --- a/vscode/FSM_OOP/template/templateFSM_private.h +++ b/vscode/FSM_OOP/template/templateFSM_private.h @@ -117,8 +117,8 @@ const static char *eventStr[] = { "E2D", }; static void printFSM(TemplateFSM* pFSM){ - FSM_LOG(" \t\tTemplateFSM: "); - FSM_LOG("上次事件:%s, 当前状态:%s, 动作:", eventStr[getFSMCurEvent((FSM *)pFSM)], stateStr[getFSMCurState((FSM *)pFSM)]); + FSM_LOG(" \tTemplateFSM: "); + FSM_LOG("上次事件:%s, 当前状态:%s, 预装载器溢出:%d ,动作:", eventStr[getFSMCurEvent((FSM *)pFSM)], stateStr[getFSMCurState((FSM *)pFSM)], _getPreloaderOverFlag((FSM *)pFSM)); } diff --git a/按键状态图2.png b/按键状态图2.png new file mode 100644 index 0000000..14ff1ce Binary files /dev/null and b/按键状态图2.png differ