From 18b97959d05a308e1455303ae4c97753f51e4ab0 Mon Sep 17 00:00:00 2001 From: Avi Date: Sun, 16 Oct 2022 21:20:22 +1000 Subject: [PATCH] Fix #128, Standardize macro/function names --- config/default_sch_lab_perfids.h | 2 +- config/default_sch_lab_tbl.h | 2 +- fsw/src/sch_lab_app.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/default_sch_lab_perfids.h b/config/default_sch_lab_perfids.h index 62ce922..fca02db 100644 --- a/config/default_sch_lab_perfids.h +++ b/config/default_sch_lab_perfids.h @@ -26,6 +26,6 @@ #ifndef SCH_LAB_PERFIDS_H #define SCH_LAB_PERFIDS_H -#define SCH_MAIN_TASK_PERF_ID 36 +#define SCH_LAB_MAIN_TASK_PERF_ID 36 #endif diff --git a/config/default_sch_lab_tbl.h b/config/default_sch_lab_tbl.h index 9c37b08..cbc77ee 100644 --- a/config/default_sch_lab_tbl.h +++ b/config/default_sch_lab_tbl.h @@ -43,6 +43,6 @@ * There is no extra encapsulation here, this header only * defines the default file name to use for the SCH table */ -#define SCH_TBL_DEFAULT_FILE "/cf/sch_lab_table.tbl" +#define SCH_LAB_TBL_DEFAULT_FILE "/cf/sch_lab_table.tbl" #endif diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c index eee9119..43d9287 100644 --- a/fsw/src/sch_lab_app.c +++ b/fsw/src/sch_lab_app.c @@ -68,7 +68,7 @@ int32 SCH_LAB_AppInit(void); /* ** AppMain */ -void SCH_Lab_AppMain(void) +void SCH_LAB_AppMain(void) { int i; uint32 SCH_OneHzPktsRcvd = 0; @@ -78,7 +78,7 @@ void SCH_Lab_AppMain(void) SCH_LAB_StateEntry_t *LocalStateEntry; CFE_SB_Buffer_t * SBBufPtr; - CFE_ES_PerfLogEntry(SCH_MAIN_TASK_PERF_ID); + CFE_ES_PerfLogEntry(SCH_LAB_MAIN_TASK_PERF_ID); Status = SCH_LAB_AppInit(); if (Status != CFE_SUCCESS) @@ -90,7 +90,7 @@ void SCH_Lab_AppMain(void) /* Loop Forever */ while (CFE_ES_RunLoop(&RunStatus) == true) { - CFE_ES_PerfLogExit(SCH_MAIN_TASK_PERF_ID); + CFE_ES_PerfLogExit(SCH_LAB_MAIN_TASK_PERF_ID); /* Pend on timing sem */ OsStatus = OS_CountSemTake(SCH_LAB_Global.TimingSem); @@ -104,7 +104,7 @@ void SCH_Lab_AppMain(void) Status = CFE_STATUS_EXTERNAL_RESOURCE_FAIL; } - CFE_ES_PerfLogEntry(SCH_MAIN_TASK_PERF_ID); + CFE_ES_PerfLogEntry(SCH_LAB_MAIN_TASK_PERF_ID); if (Status == CFE_SUCCESS) { @@ -202,7 +202,7 @@ int32 SCH_LAB_AppInit(void) /* ** Loading Table */ - Status = CFE_TBL_Load(SCH_LAB_Global.TblHandle, CFE_TBL_SRC_FILE, SCH_TBL_DEFAULT_FILE); + Status = CFE_TBL_Load(SCH_LAB_Global.TblHandle, CFE_TBL_SRC_FILE, SCH_LAB_TBL_DEFAULT_FILE); if (Status != CFE_SUCCESS) { CFE_ES_WriteToSysLog("SCH_LAB: Error Loading Table ScheduleTable, RC = 0x%08lX\n", (unsigned long)Status);