From 99cec13adb57ddcda367633902644c854ab762ca Mon Sep 17 00:00:00 2001
From: Joseph Hickey <joseph.p.hickey@nasa.gov>
Date: Fri, 5 Jun 2026 14:03:36 -0400
Subject: [PATCH] Fix #162, change RTS IDs to correct pattern

Changes the definition to the proper "default" pattern which allows the
value to be overridden on a mission config basis.
---
 docs/dox_src/cfs_sc.dox   | 4 ++--
 fsw/inc/sc_internal_cfg.h | 6 ++++--
 fsw/src/sc_app.c          | 4 ++--
 unit-test/sc_app_tests.c  | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/docs/dox_src/cfs_sc.dox b/docs/dox_src/cfs_sc.dox
index 0ffb7bc..1fcadb3 100644
--- a/docs/dox_src/cfs_sc.dox
+++ b/docs/dox_src/cfs_sc.dox
@@ -139,11 +139,11 @@
 
   <H2>Power On Resets</H2>
 
-  The RTS ID defined by #RTS_ID_AUTO_POWER_ON is started (if non-zero).
+  The RTS ID defined by #SC_RTS_ID_AUTO_POWER_ON is started (if non-zero).
 
   <H2>Processor Resets</H2>
 
-  The RTS ID defined by #RTS_ID_AUTO_PROCESSOR is started (if non-zero).
+  The RTS ID defined by #SC_RTS_ID_AUTO_PROCESSOR is started (if non-zero).
 
   <H2>Absolute Time Processor (ATP)</H2>
 
diff --git a/fsw/inc/sc_internal_cfg.h b/fsw/inc/sc_internal_cfg.h
index 854452c..fe3f866 100644
--- a/fsw/inc/sc_internal_cfg.h
+++ b/fsw/inc/sc_internal_cfg.h
@@ -333,7 +333,8 @@
  * \par Limits:
  *       Must be a valid RTS ID or 0
  */
-#define RTS_ID_AUTO_POWER_ON 1
+#define SC_RTS_ID_AUTO_POWER_ON                  SC_INTERNAL_CFGVAL(RTS_ID_AUTO_POWER_ON)
+#define DEFAULT_SC_INTERNAL_RTS_ID_AUTO_POWER_ON 0
 
 /**
  * \brief Autostart RTS ID after processor reset
@@ -345,7 +346,8 @@
  * \par Limits:
  *       Must be a valid RTS ID or 0
  */
-#define RTS_ID_AUTO_PROCESSOR 2
+#define SC_RTS_ID_AUTO_PROCESSOR                  SC_INTERNAL_CFGVAL(RTS_ID_AUTO_PROCESSOR)
+#define DEFAULT_SC_INTERNAL_RTS_ID_AUTO_PROCESSOR 0
 
 /**
  * \brief Mission specific version number for SC application
diff --git a/fsw/src/sc_app.c b/fsw/src/sc_app.c
index 7b8c2f8..b367e18 100644
--- a/fsw/src/sc_app.c
+++ b/fsw/src/sc_app.c
@@ -174,11 +174,11 @@ CFE_Status_t SC_AppInit(void)
     /* Select auto-exec RTS to start during first HK request */
     if (CFE_ES_GetResetType(NULL) == CFE_PSP_RST_TYPE_POWERON)
     {
-        SC_AppData.AutoStartRTS = SC_RTS_NUM_C(RTS_ID_AUTO_POWER_ON);
+        SC_AppData.AutoStartRTS = SC_RTS_NUM_C(SC_RTS_ID_AUTO_POWER_ON);
     }
     else
     {
-        SC_AppData.AutoStartRTS = SC_RTS_NUM_C(RTS_ID_AUTO_PROCESSOR);
+        SC_AppData.AutoStartRTS = SC_RTS_NUM_C(SC_RTS_ID_AUTO_PROCESSOR);
     }
 
     /* Must be able to register for events */
diff --git a/unit-test/sc_app_tests.c b/unit-test/sc_app_tests.c
index 35cb710..6401ac2 100644
--- a/unit-test/sc_app_tests.c
+++ b/unit-test/sc_app_tests.c
@@ -146,7 +146,7 @@ void SC_AppInit_Test_NominalPowerOnReset(void)
 
     Expected_SC_AppData.NextCmdTime[SC_Process_ATP] = SC_MAX_TIME;
     Expected_SC_AppData.NextCmdTime[SC_Process_RTP] = SC_MAX_WAKEUP_CNT;
-    Expected_SC_AppData.AutoStartRTS                = SC_RTS_NUM_C(RTS_ID_AUTO_POWER_ON);
+    Expected_SC_AppData.AutoStartRTS                = SC_RTS_NUM_C(SC_RTS_ID_AUTO_POWER_ON);
 
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetMsgId), &TestMsgId, sizeof(TestMsgId), false);
     UT_SetDataBuffer(UT_KEY(CFE_MSG_GetSize), &MsgSize, sizeof(MsgSize), false);
@@ -223,7 +223,7 @@ void SC_AppInit_Test_Nominal(void)
 
     Expected_SC_AppData.NextCmdTime[SC_Process_ATP] = SC_MAX_TIME;
     Expected_SC_AppData.NextCmdTime[SC_Process_RTP] = SC_MAX_WAKEUP_CNT;
-    Expected_SC_AppData.AutoStartRTS                = SC_RTS_NUM_C(RTS_ID_AUTO_PROCESSOR);
+    Expected_SC_AppData.AutoStartRTS                = SC_RTS_NUM_C(SC_RTS_ID_AUTO_PROCESSOR);
 
     Expected_SC_OperData.HkPacket.Payload.ContinueAtsOnFailureFlag = SC_AtsCont_TRUE;