From 80971cf6657a3738acf40a0d19b7516ea5300abb Mon Sep 17 00:00:00 2001
From: Avi <thnkslprpt@gmail.com>
Date: Sun, 16 Oct 2022 21:20:22 +1000
Subject: [PATCH] Fix #128, Standardize macro/function names

---
 fsw/mission_inc/sch_lab_perfids.h |  2 +-
 fsw/platform_inc/sch_lab_table.h  |  2 +-
 fsw/src/sch_lab_app.c             | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/fsw/mission_inc/sch_lab_perfids.h b/fsw/mission_inc/sch_lab_perfids.h
index 370004a..1776522 100644
--- a/fsw/mission_inc/sch_lab_perfids.h
+++ b/fsw/mission_inc/sch_lab_perfids.h
@@ -23,6 +23,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/fsw/platform_inc/sch_lab_table.h b/fsw/platform_inc/sch_lab_table.h
index 8cb46fc..a8bc292 100644
--- a/fsw/platform_inc/sch_lab_table.h
+++ b/fsw/platform_inc/sch_lab_table.h
@@ -34,7 +34,7 @@
 */
 #define SCH_LAB_END_OF_TABLE         0
 #define SCH_LAB_MAX_SCHEDULE_ENTRIES 32
-#define SCH_TBL_DEFAULT_FILE         "/cf/sch_lab_table.tbl"
+#define SCH_LAB_TBL_DEFAULT_FILE     "/cf/sch_lab_table.tbl"
 
 /*
 ** Typedefs
diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c
index a8475e0..387fc0c 100644
--- a/fsw/src/sch_lab_app.c
+++ b/fsw/src/sch_lab_app.c
@@ -72,7 +72,7 @@ int32 SCH_LAB_AppInit(void);
 /*
 ** AppMain
 */
-void SCH_Lab_AppMain(void)
+void SCH_LAB_AppMain(void)
 {
     int                   i;
     uint32                SCH_OneHzPktsRcvd = 0;
@@ -82,7 +82,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)
@@ -94,7 +94,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);
@@ -108,7 +108,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)
         {
@@ -206,7 +206,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 SCH_LAB_SchTbl, RC = 0x%08lX\n", (unsigned long)Status);