Skip to content

Fix #79, Non CDS tables pass initialization but not loaded #80

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

Open
mafoste3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix #79, Non CDS tables pass initialization but not loaded #80

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
15 changes: 7 additions & 8 deletions fsw/src/md_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,6 @@ CFE_Status_t MD_InitTableServices(void)
CFE_TBL_Load(MD_AppData.MD_TableHandle[TblIndex], CFE_TBL_SRC_FILE, /* following ptr is memory ptr */
(const void *)TblFileName); /* Pointer to data to be loaded */

MD_AppData.MD_DwellTables[TblIndex].Enabled = MD_DWELL_STREAM_DISABLED;

if (Status != CFE_SUCCESS)
{
CFE_ES_WriteToSysLog("MD_APP: Error 0x%08X received loading tbl#%u\n", (unsigned int)Status,
Expand All @@ -465,6 +463,8 @@ CFE_Status_t MD_InitTableServices(void)
}
else
{
CFE_TBL_GetAddress((void *)&MD_LoadTablePtr, MD_AppData.MD_TableHandle[TblIndex]);
MD_CopyUpdatedTbl(MD_LoadTablePtr, TblIndex);
TblInits++;
}
}
Expand Down Expand Up @@ -622,11 +622,10 @@ void MD_ExecRequest(const CFE_SB_Buffer_t *BufPtr)

case MD_RESET_CNTRS_CC:

CFE_EVS_SendEvent(MD_RESET_INF_EID, CFE_EVS_EventType_INFORMATION,
"Reset Counters Cmd Received");
MD_AppData.CmdCounter = 0;
MD_AppData.ErrCounter = 0;
break;
CFE_EVS_SendEvent(MD_RESET_INF_EID, CFE_EVS_EventType_INFORMATION, "Reset Counters Cmd Received");
MD_AppData.CmdCounter = 0;
MD_AppData.ErrCounter = 0;
break;

case MD_START_DWELL_CC:

Expand Down Expand Up @@ -657,7 +656,7 @@ void MD_HkStatus()
{
uint8 TblIndex;
uint16 MemDwellEnableBits = 0;
MD_HkTlm_t * HkPktPtr = NULL;
MD_HkTlm_t *HkPktPtr = NULL;
MD_DwellPacketControl_t *ThisDwellTablePtr = NULL;

/* Assign pointer used as shorthand to access Housekeeping Packet fields */
Expand Down