Skip to content
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

Jump to bottom

Fix #128, Standardize naming of SCH_LAB functions/macros #129

Merged
merged 1 commit into from
Nov 14, 2023
Merged

Fix #128, Standardize naming of SCH_LAB functions/macros #129

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
Fix #128, Standardize macro/function names
  • Loading branch information
@thnkslprpt @jphickey
thnkslprpt authored and jphickey committed Nov 2, 2023
commit 18b97959d05a308e1455303ae4c97753f51e4ab0
2 changes: 1 addition & 1 deletion config/default_sch_lab_perfids.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion config/default_sch_lab_tbl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions fsw/src/sch_lab_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
/*
** AppMain
*/
void SCH_Lab_AppMain(void)
void SCH_LAB_AppMain(void)

Check notice

Code scanning / CodeQL-coding-standard

Long function without assertion Note

All functions of more than 10 lines should have at least one assertion.

Check notice

Code scanning / CodeQL-coding-standard

Function too long Note

SCH_LAB_AppMain has too many lines (69, while 60 are allowed).
{
int i;
uint32 SCH_OneHzPktsRcvd = 0;
Expand All @@ -78,7 +78,7 @@
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)
Expand All @@ -90,7 +90,7 @@
/* 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);
Expand All @@ -104,7 +104,7 @@
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)
{
Expand Down Expand Up @@ -202,7 +202,7 @@
/*
** 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);
Expand Down