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 #66, remove compiler extensions from tbldefs #67

Merged
merged 2 commits into from
Feb 16, 2023
Merged

Fix #66, remove compiler extensions from tbldefs #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d23a8f
Fix #66, remove compiler extensions from tbldefs
jphickey Feb 15, 2023
cbea300
Fix #66, update name of ExeCount Table
jphickey Feb 16, 2023
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
7 changes: 3 additions & 4 deletions fsw/tables/hs_amt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,10 @@
#include "hs_tbldefs.h"
#include "cfe_tbl_filedef.h"

static CFE_TBL_FileDef_t CFE_TBL_FileDef
__attribute__((__used__)) = {"HS_Default_AppMon_Tbl", HS_APP_NAME ".AppMon_Tbl", "HS AppMon Table", "hs_amt.tbl",
(sizeof(HS_AMTEntry_t) * HS_MAX_MONITORED_APPS)};
CFE_TBL_FileDef_t CFE_TBL_FileDef = {"HS_AppMon_Tbl", HS_APP_NAME ".AppMon_Tbl", "HS AppMon Table", "hs_amt.tbl",
(sizeof(HS_AMTEntry_t) * HS_MAX_MONITORED_APPS)};

HS_AMTEntry_t HS_Default_AppMon_Tbl[HS_MAX_MONITORED_APPS] = {
HS_AMTEntry_t HS_AppMon_Tbl[HS_MAX_MONITORED_APPS] = {
/* AppName NullTerm CycleCount ActionType */

/* 0 */ {"CFE_ES", 0, 10, HS_AMT_ACT_NOACT},
Expand Down
7 changes: 3 additions & 4 deletions fsw/tables/hs_emt.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,10 @@
#include "hs_tbldefs.h"
#include "cfe_tbl_filedef.h"

static CFE_TBL_FileDef_t CFE_TBL_FileDef
__attribute__((__used__)) = {"HS_Default_EventMon_Tbl", HS_APP_NAME ".EventMon_Tbl", "HS EventMon Table",
"hs_emt.tbl", (sizeof(HS_EMTEntry_t) * HS_MAX_MONITORED_EVENTS)};
CFE_TBL_FileDef_t CFE_TBL_FileDef = {"HS_EventMon_Tbl", HS_APP_NAME ".EventMon_Tbl", "HS EventMon Table", "hs_emt.tbl",
(sizeof(HS_EMTEntry_t) * HS_MAX_MONITORED_EVENTS)};

HS_EMTEntry_t HS_Default_EventMon_Tbl[HS_MAX_MONITORED_EVENTS] = {
HS_EMTEntry_t HS_EventMon_Tbl[HS_MAX_MONITORED_EVENTS] = {
/* AppName NullTerm EventID ActionType */

/* 0 */ {"CFE_ES", 0, 10, HS_EMT_ACT_NOACT},
Expand Down
7 changes: 3 additions & 4 deletions fsw/tables/hs_mat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,10 @@
#include "hs_tbldefs.h"
#include "cfe_tbl_filedef.h"

static CFE_TBL_FileDef_t CFE_TBL_FileDef
__attribute__((__used__)) = {"HS_Default_MsgActs_Tbl", HS_APP_NAME ".MsgActs_Tbl", "HS MsgActs Table", "hs_mat.tbl",
(sizeof(HS_MATEntry_t) * HS_MAX_MSG_ACT_TYPES)};
CFE_TBL_FileDef_t CFE_TBL_FileDef = {"HS_MsgActs_Tbl", HS_APP_NAME ".MsgActs_Tbl", "HS MsgActs Table", "hs_mat.tbl",
(sizeof(HS_MATEntry_t) * HS_MAX_MSG_ACT_TYPES)};

HS_MATEntry_t HS_Default_MsgActs_Tbl[HS_MAX_MSG_ACT_TYPES] = {
HS_MATEntry_t HS_MsgActs_Tbl[HS_MAX_MSG_ACT_TYPES] = {
/* EnableState Cooldown Message */

/* 0 */ {HS_MAT_STATE_DISABLED,
Expand Down
7 changes: 3 additions & 4 deletions fsw/tables/hs_xct.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,10 @@
#include "hs_tbldefs.h"
#include "cfe_tbl_filedef.h"

static CFE_TBL_FileDef_t CFE_TBL_FileDef
__attribute__((__used__)) = {"HS_Default_ExeCount_Tbl", HS_APP_NAME ".ExeCount_Tbl", "HS ExeCount Table",
"hs_xct.tbl", (sizeof(HS_XCTEntry_t) * HS_MAX_EXEC_CNT_SLOTS)};
CFE_TBL_FileDef_t CFE_TBL_FileDef = {"HS_ExeCount_Tbl", HS_APP_NAME ".ExeCount_Tbl", "HS ExeCount Table",
"hs_xct.tbl", (sizeof(HS_XCTEntry_t) * HS_MAX_EXEC_CNT_SLOTS)};

HS_XCTEntry_t HS_Default_ExeCount_Tbl[HS_MAX_EXEC_CNT_SLOTS] = {
HS_XCTEntry_t HS_ExeCount_Tbl[HS_MAX_EXEC_CNT_SLOTS] = {
/* ResourceName NullTerm ResourceType */

/* 0 */ {"CFE_ES", 0, HS_XCT_TYPE_APP_MAIN},
Expand Down