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 #141, Convert int32 return codes and variables to CFE_Status_t #142

Merged
merged 1 commit into from
Nov 14, 2023
Merged

Fix #141, Convert int32 return codes and variables to CFE_Status_t #142

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 .github/workflows/codeql-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: "CodeQL Analysis"
on:
push:
pull_request:

jobs:
codeql:
name: Codeql
uses: nasa/cFS/.github/workflows/codeql-reusable.yml@main
with:
with:
component-path: apps/sch_lab
prep: 'make prep; make -C build/tools/elf2cfetbl'
make: 'make -C build/native/default_cpu1/apps/sch_lab'
1 change: 0 additions & 1 deletion .github/workflows/format-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ jobs:
format-check:
name: Run format check
uses: nasa/cFS/.github/workflows/format-check.yml@main

1 change: 0 additions & 1 deletion .github/workflows/static-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ jobs:
static-analysis:
name: Run cppcheck
uses: nasa/cFS/.github/workflows/static-analysis.yml@main

10 changes: 4 additions & 6 deletions fsw/platform_inc/sch_lab_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,10 @@

#define SCH_MAX_MSG_WORDS 32

#ifdef SOFTWARE_BIG_BIT_ORDER
#define SCH_PACK_32BIT(value) \
(uint16)((value & 0xFFFF0000) >> 16), (uint16)(value & 0x0000FFFF)
#else
#define SCH_PACK_32BIT(value) \
(uint16)(value & 0x0000FFFF), (uint16)((value & 0xFFFF0000) >> 16)
#ifdef SOFTWARE_BIG_BIT_ORDER
#define SCH_PACK_32BIT(value) (uint16)((value & 0xFFFF0000) >> 16), (uint16)(value & 0x0000FFFF)
#else
#define SCH_PACK_32BIT(value) (uint16)(value & 0x0000FFFF), (uint16)((value & 0xFFFF0000) >> 16)
#endif

/*
Expand Down
15 changes: 7 additions & 8 deletions fsw/src/sch_lab_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,10 @@ typedef struct
*/
SCH_LAB_GlobalData_t SCH_LAB_Global;


/*
** Local Function Prototypes
*/
int32 SCH_LAB_AppInit(void);
CFE_Status_t SCH_LAB_AppInit(void);

/*
** AppMain
Expand Down Expand Up @@ -155,10 +154,10 @@ void SCH_LAB_LocalTimerCallback(osal_id_t object_id, void *arg)
/* Initialization */
/* */
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
int32 SCH_LAB_AppInit(void)
CFE_Status_t SCH_LAB_AppInit(void)
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed

Check notice

Code scanning / CodeQL

Function too long

SCH_LAB_AppInit has too many lines (154, while 60 are allowed).

Check notice

Code scanning / CodeQL

Long function without assertion

All functions of more than 10 lines should have at least one assertion.
{
int i, x;
int32 Status;
CFE_Status_t Status;
int32 OsStatus;
uint32 TimerPeriod;
osal_id_t TimeBaseId = OS_OBJECT_ID_UNDEFINED;
Expand Down Expand Up @@ -245,15 +244,15 @@ int32 SCH_LAB_AppInit(void)
{
/* Initialize the message with the length of the header + payload */
CFE_MSG_Init(CFE_MSG_PTR(LocalStateEntry->CommandHeader), ConfigEntry->MessageID,
sizeof(LocalStateEntry->CommandHeader) + ConfigEntry->PayloadLength);
sizeof(LocalStateEntry->CommandHeader) + ConfigEntry->PayloadLength);
CFE_MSG_SetFcnCode(CFE_MSG_PTR(LocalStateEntry->CommandHeader), ConfigEntry->FcnCode);

LocalStateEntry->PacketRate = ConfigEntry->PacketRate;
LocalStateEntry->PacketRate = ConfigEntry->PacketRate;
LocalStateEntry->PayloadLength = ConfigEntry->PayloadLength;

for (x =0; x < SCH_MAX_MSG_WORDS; x++)
for (x = 0; x < SCH_MAX_MSG_WORDS; x++)
{
LocalStateEntry->MessageBuffer[x]=ConfigEntry->MessageBuffer[x];
LocalStateEntry->MessageBuffer[x] = ConfigEntry->MessageBuffer[x];
}
}
++ConfigEntry;
Expand Down
76 changes: 38 additions & 38 deletions fsw/tables/sch_lab_table.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
#include "lc_msgids.h"
#endif


/*
** Include headers for message IDs here
*/
Expand All @@ -70,43 +69,44 @@
** 3. If the table grows too big, increase SCH_LAB_MAX_SCHEDULE_ENTRIES
*/

SCH_LAB_ScheduleTable_t SCH_TBL_Structure = {.TickRate = 100,
.Config = {
{CFE_SB_MSGID_WRAP_VALUE(CFE_ES_SEND_HK_MID), 100, 0}, /* Example of a 1hz packet */
{CFE_SB_MSGID_WRAP_VALUE(CFE_TBL_SEND_HK_MID), 50, 0},
{CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_SEND_HK_MID), 98, 0},
{CFE_SB_MSGID_WRAP_VALUE(CFE_SB_SEND_HK_MID), 97, 0},
{CFE_SB_MSGID_WRAP_VALUE(CFE_EVS_SEND_HK_MID), 96, 0},

/* Example of including additional open source apps */
#ifdef HAVE_CI_LAB
{CFE_SB_MSGID_WRAP_VALUE(CI_LAB_SEND_HK_MID), 95, 0},
#endif
#ifdef HAVE_TO_LAB
{CFE_SB_MSGID_WRAP_VALUE(TO_LAB_SEND_HK_MID), 94, 0},
#endif
#ifdef HAVE_SAMPLE_APP
{CFE_SB_MSGID_WRAP_VALUE(SAMPLE_APP_SEND_HK_MID), 93, 0},
#endif
#ifdef HAVE_SC
{CFE_SB_MSGID_WRAP_VALUE(SC_SEND_HK_MID), 92, 0},
{CFE_SB_MSGID_WRAP_VALUE(SC_1HZ_WAKEUP_MID), 91, 0},
#endif
#ifdef HAVE_HS
{CFE_SB_MSGID_WRAP_VALUE(HS_SEND_HK_MID), 90, 0}, /* Example of a message that wouldn't be sent */
#endif
#ifdef HAVE_FM
{CFE_SB_MSGID_WRAP_VALUE(FM_SEND_HK_MID), 101, 0},
#endif
#ifdef HAVE_DS
{CFE_SB_MSGID_WRAP_VALUE(DS_SEND_HK_MID), 102, 0},
#endif
#ifdef HAVE_LC
{CFE_SB_MSGID_WRAP_VALUE(LC_SEND_HK_MID), 103, 0},
{CFE_SB_MSGID_WRAP_VALUE(LC_SAMPLE_AP_MID), 500, 0, 8, { 0, 175, 1 }},
#endif

}};
SCH_LAB_ScheduleTable_t SCH_TBL_Structure = {
.TickRate = 100,
.Config = {
{CFE_SB_MSGID_WRAP_VALUE(CFE_ES_SEND_HK_MID), 100, 0}, /* Example of a 1hz packet */
{CFE_SB_MSGID_WRAP_VALUE(CFE_TBL_SEND_HK_MID), 50, 0},
{CFE_SB_MSGID_WRAP_VALUE(CFE_TIME_SEND_HK_MID), 98, 0},
{CFE_SB_MSGID_WRAP_VALUE(CFE_SB_SEND_HK_MID), 97, 0},
{CFE_SB_MSGID_WRAP_VALUE(CFE_EVS_SEND_HK_MID), 96, 0},

/* Example of including additional open source apps */
#ifdef HAVE_CI_LAB

Check notice

Code scanning / CodeQL

Conditional compilation

Use of conditional compilation must be kept to a minimum.
{CFE_SB_MSGID_WRAP_VALUE(CI_LAB_SEND_HK_MID), 95, 0},
#endif
#ifdef HAVE_TO_LAB

Check notice

Code scanning / CodeQL

Conditional compilation

Use of conditional compilation must be kept to a minimum.
{CFE_SB_MSGID_WRAP_VALUE(TO_LAB_SEND_HK_MID), 94, 0},
#endif
#ifdef HAVE_SAMPLE_APP

Check notice

Code scanning / CodeQL

Conditional compilation

Use of conditional compilation must be kept to a minimum.
{CFE_SB_MSGID_WRAP_VALUE(SAMPLE_APP_SEND_HK_MID), 93, 0},
#endif
#ifdef HAVE_SC

Check notice

Code scanning / CodeQL

Conditional compilation

Use of conditional compilation must be kept to a minimum.
{CFE_SB_MSGID_WRAP_VALUE(SC_SEND_HK_MID), 92, 0},
{CFE_SB_MSGID_WRAP_VALUE(SC_1HZ_WAKEUP_MID), 91, 0},
#endif
#ifdef HAVE_HS

Check notice

Code scanning / CodeQL

Conditional compilation

Use of conditional compilation must be kept to a minimum.
{CFE_SB_MSGID_WRAP_VALUE(HS_SEND_HK_MID), 90, 0}, /* Example of a message that wouldn't be sent */
#endif
#ifdef HAVE_FM

Check notice

Code scanning / CodeQL

Conditional compilation

Use of conditional compilation must be kept to a minimum.
{CFE_SB_MSGID_WRAP_VALUE(FM_SEND_HK_MID), 101, 0},
#endif
#ifdef HAVE_DS

Check notice

Code scanning / CodeQL

Conditional compilation

Use of conditional compilation must be kept to a minimum.
{CFE_SB_MSGID_WRAP_VALUE(DS_SEND_HK_MID), 102, 0},
#endif
#ifdef HAVE_LC

Check notice

Code scanning / CodeQL

Conditional compilation

Use of conditional compilation must be kept to a minimum.
{CFE_SB_MSGID_WRAP_VALUE(LC_SEND_HK_MID), 103, 0},
{CFE_SB_MSGID_WRAP_VALUE(LC_SAMPLE_AP_MID), 500, 0, 8, {0, 175, 1}},
#endif

}};

/*
** The macro below identifies:
Expand Down