Skip to content

Fix #162, change RTS IDs to correct pattern #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jphickey merged 1 commit into from
Jun 10, 2026
+10 −8
Merged

Fix #162, change RTS IDs to correct pattern #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/dox_src/cfs_sc.dox
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 4 additions & 2 deletions fsw/inc/sc_internal_cfg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions fsw/src/sc_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions unit-test/sc_app_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;

Expand Down
Loading