Skip to content

Commit

Permalink
Merge pull request #8 from nasa/is-7-rm-deprecated-cfe-refs
Browse files Browse the repository at this point in the history 
Replace deprecated cfe refs, #7
  • Loading branch information
@skliper
skliper authored Sep 10, 2019
2 parents 01485fb + 18641e9 commit fd5e877
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 32 deletions.
24 changes: 12 additions & 12 deletions fsw/platform_inc/to_lab_sub_table.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,18 @@ static TO_subscription_t TO_SubTable[] =
{LC_HK_TLM_MID, {0,0}, 4},
#endif
/* cFE Core subscriptions */
{CFE_ES_HK_TLM_MID, {0,0}, 4},
{CFE_EVS_HK_TLM_MID, {0,0}, 4},
{CFE_SB_HK_TLM_MID, {0,0}, 4},
{CFE_TBL_HK_TLM_MID, {0,0}, 4},
{CFE_TIME_HK_TLM_MID, {0,0}, 4},
{CFE_TIME_DIAG_TLM_MID, {0,0}, 4},
{CFE_SB_STATS_TLM_MID, {0,0}, 4},
{CFE_TBL_REG_TLM_MID, {0,0}, 4},
{CFE_EVS_EVENT_MSG_MID, {0,0}, 32},
{CFE_ES_SHELL_TLM_MID, {0,0}, 32},
{CFE_ES_APP_TLM_MID, {0,0}, 4},
{CFE_ES_MEMSTATS_TLM_MID,{0,0}, 4},
{CFE_ES_HK_TLM_MID, {0,0}, 4},
{CFE_EVS_HK_TLM_MID, {0,0}, 4},
{CFE_SB_HK_TLM_MID, {0,0}, 4},
{CFE_TBL_HK_TLM_MID, {0,0}, 4},
{CFE_TIME_HK_TLM_MID, {0,0}, 4},
{CFE_TIME_DIAG_TLM_MID, {0,0}, 4},
{CFE_SB_STATS_TLM_MID, {0,0}, 4},
{CFE_TBL_REG_TLM_MID, {0,0}, 4},
{CFE_EVS_LONG_EVENT_MSG_MID, {0,0}, 32},
{CFE_ES_SHELL_TLM_MID, {0,0}, 32},
{CFE_ES_APP_TLM_MID, {0,0}, 4},
{CFE_ES_MEMSTATS_TLM_MID, {0,0}, 4},

{TO_UNUSED, {0,0}, 0},
{TO_UNUSED, {0,0}, 0},
Expand Down
56 changes: 36 additions & 20 deletions fsw/src/to_lab_app.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ static void TO_StartSending( TO_OUTPUT_ENABLE_PKT_t * pCmd );
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
void TO_Lab_AppMain(void)
{
uint32 RunStatus = CFE_ES_APP_RUN;
uint32 RunStatus = CFE_ES_RunStatus_APP_RUN;

CFE_ES_PerfLogEntry(TO_MAIN_TASK_PERF_ID);

Expand Down Expand Up @@ -164,7 +164,7 @@ void TO_init(void)
*/
CFE_EVS_Register(CFE_TO_EVS_Filters,
sizeof(CFE_TO_EVS_Filters)/sizeof(CFE_EVS_BinFilter_t),
CFE_EVS_BINARY_FILTER);
CFE_EVS_EventFilter_BINARY);
/*
** Initialize housekeeping packet (clear user data area)...
*/
Expand All @@ -180,13 +180,15 @@ void TO_init(void)
CFE_SB_Subscribe(TO_LAB_SEND_HK_MID, TO_Cmd_pipe);
}
else
CFE_EVS_SendEvent(TO_CRCMDPIPE_ERR_EID,CFE_EVS_ERROR, "L%d TO Can't create cmd pipe status %i",__LINE__,(int)status);
CFE_EVS_SendEvent(TO_CRCMDPIPE_ERR_EID,CFE_EVS_EventType_ERROR,
"L%d TO Can't create cmd pipe status %i",__LINE__,(int)status);

/* Create TO TLM pipe */
status = CFE_SB_CreatePipe(&TO_Tlm_pipe, ToTlmPipeDepth, ToTlmPipeName);
if (status != CFE_SUCCESS)
{
CFE_EVS_SendEvent(TO_TLMPIPE_ERR_EID,CFE_EVS_ERROR, "L%d TO Can't create Tlm pipe status %i",__LINE__,(int)status);
CFE_EVS_SendEvent(TO_TLMPIPE_ERR_EID,CFE_EVS_EventType_ERROR,
"L%d TO Can't create Tlm pipe status %i",__LINE__,(int)status);
}

/* Subscriptions for TLM pipe*/
Expand All @@ -199,7 +201,8 @@ void TO_init(void)
TO_SubTable[i].BufLimit);

if (status != CFE_SUCCESS)
CFE_EVS_SendEvent(TO_SUBSCRIBE_ERR_EID,CFE_EVS_ERROR,"L%d TO Can't subscribe to stream 0x%x status %i", __LINE__,
CFE_EVS_SendEvent(TO_SUBSCRIBE_ERR_EID,CFE_EVS_EventType_ERROR,
"L%d TO Can't subscribe to stream 0x%x status %i", __LINE__,
TO_SubTable[i].Stream,(int)status);
}

Expand All @@ -208,7 +211,7 @@ void TO_init(void)
*/
OS_TaskInstallDeleteHandler(&TO_delete_callback);

CFE_EVS_SendEvent (TO_INIT_INF_EID, CFE_EVS_INFORMATION,
CFE_EVS_SendEvent (TO_INIT_INF_EID, CFE_EVS_EventType_INFORMATION,
"TO Lab Initialized. Version %d.%d.%d.%d Awaiting enable command.",
TO_LAB_MAJOR_VERSION,
TO_LAB_MINOR_VERSION,
Expand All @@ -228,7 +231,8 @@ void TO_StartSending( TO_OUTPUT_ENABLE_PKT_t * pCmd )
sizeof (tlm_dest_IP),
sizeof (pCmd->dest_IP));
suppress_sendto = FALSE;
CFE_EVS_SendEvent(TO_TLMOUTENA_INF_EID,CFE_EVS_INFORMATION,"TO telemetry output enabled for IP %s", tlm_dest_IP);
CFE_EVS_SendEvent(TO_TLMOUTENA_INF_EID,CFE_EVS_EventType_INFORMATION,
"TO telemetry output enabled for IP %s", tlm_dest_IP);

if(downlink_on == FALSE) /* Then turn it on, otherwise we will just switch destination addresses*/
{
Expand Down Expand Up @@ -266,7 +270,8 @@ void TO_process_commands(void)
break;

default:
CFE_EVS_SendEvent(TO_MSGID_ERR_EID,CFE_EVS_ERROR, "L%d TO: Invalid Msg ID Rcvd 0x%x",__LINE__,MsgId);
CFE_EVS_SendEvent(TO_MSGID_ERR_EID,CFE_EVS_EventType_ERROR,
"L%d TO: Invalid Msg ID Rcvd 0x%x",__LINE__,MsgId);
break;
}
break;
Expand All @@ -291,7 +296,8 @@ void TO_exec_local_command(CFE_SB_MsgPtr_t cmd)
switch (CommandCode)
{
case TO_NOP_CC:
CFE_EVS_SendEvent(TO_NOOP_INF_EID,CFE_EVS_INFORMATION, "No-op command");
CFE_EVS_SendEvent(TO_NOOP_INF_EID,CFE_EVS_EventType_INFORMATION,
"No-op command");
break;

case TO_RESET_STATUS_CC:
Expand Down Expand Up @@ -321,7 +327,8 @@ void TO_exec_local_command(CFE_SB_MsgPtr_t cmd)
break;

default:
CFE_EVS_SendEvent(TO_FNCODE_ERR_EID,CFE_EVS_ERROR, "L%d TO: Invalid Function Code Rcvd In Ground Command 0x%x",__LINE__,
CFE_EVS_SendEvent(TO_FNCODE_ERR_EID,CFE_EVS_EventType_ERROR,
"L%d TO: Invalid Function Code Rcvd In Ground Command 0x%x",__LINE__,
CommandCode);
valid = FALSE;
}
Expand Down Expand Up @@ -410,7 +417,8 @@ void TO_output_status(void)
void TO_openTLM(void)
{
if ( (TLMsockid = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) < 0)
CFE_EVS_SendEvent(TO_TLMOUTSOCKET_ERR_EID,CFE_EVS_ERROR, "L%d, TO TLM socket errno: %d",__LINE__, errno);
CFE_EVS_SendEvent(TO_TLMOUTSOCKET_ERR_EID,CFE_EVS_EventType_ERROR,
"L%d, TO TLM socket errno: %d",__LINE__, errno);

/*---------------- Add static arp entries ----------------*/

Expand All @@ -431,10 +439,12 @@ void TO_AddPkt( TO_ADD_PKT_t * pCmd)
pCmd->BufLimit);

if(status != CFE_SUCCESS)
CFE_EVS_SendEvent(TO_ADDPKT_ERR_EID,CFE_EVS_ERROR, "L%d TO Can't subscribe 0x%x status %i",__LINE__,
CFE_EVS_SendEvent(TO_ADDPKT_ERR_EID,CFE_EVS_EventType_ERROR,
"L%d TO Can't subscribe 0x%x status %i",__LINE__,
pCmd->Stream, (int)status);
else
CFE_EVS_SendEvent(TO_ADDPKT_INF_EID,CFE_EVS_INFORMATION, "L%d TO AddPkt 0x%x, QoS %d.%d, limit %d",__LINE__,
CFE_EVS_SendEvent(TO_ADDPKT_INF_EID,CFE_EVS_EventType_INFORMATION,
"L%d TO AddPkt 0x%x, QoS %d.%d, limit %d",__LINE__,
pCmd->Stream,
pCmd->Flags.Priority,
pCmd->Flags.Reliability,
Expand All @@ -452,10 +462,12 @@ void TO_RemovePkt(TO_REMOVE_PKT_t * pCmd)

status = CFE_SB_Unsubscribe(pCmd->Stream, TO_Tlm_pipe);
if(status != CFE_SUCCESS)
CFE_EVS_SendEvent(TO_REMOVEPKT_ERR_EID,CFE_EVS_ERROR,"L%d TO Can't Unsubscribe to Stream 0x%x on pipe %d, status %i",__LINE__,
CFE_EVS_SendEvent(TO_REMOVEPKT_ERR_EID,CFE_EVS_EventType_ERROR,
"L%d TO Can't Unsubscribe to Stream 0x%x on pipe %d, status %i",__LINE__,
pCmd->Stream, TO_Tlm_pipe, (int)status);
else
CFE_EVS_SendEvent(TO_REMOVEPKT_INF_EID,CFE_EVS_INFORMATION,"L%d TO RemovePkt 0x%x",__LINE__, pCmd->Stream);
CFE_EVS_SendEvent(TO_REMOVEPKT_INF_EID,CFE_EVS_EventType_INFORMATION,
"L%d TO RemovePkt 0x%x",__LINE__, pCmd->Stream);
} /* End of TO_RemovePkt() */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand All @@ -475,23 +487,27 @@ void TO_RemoveAllPkt(void)
status = CFE_SB_Unsubscribe(TO_SubTable[i].Stream, TO_Tlm_pipe);

if(status != CFE_SUCCESS)
CFE_EVS_SendEvent(TO_REMOVEALLPTKS_ERR_EID,CFE_EVS_ERROR, "L%d TO Can't Unsubscribe to stream 0x%x status %i", __LINE__,
CFE_EVS_SendEvent(TO_REMOVEALLPTKS_ERR_EID,CFE_EVS_EventType_ERROR,
"L%d TO Can't Unsubscribe to stream 0x%x status %i", __LINE__,
TO_SubTable[i].Stream, (int)status);
}
}

/* remove commands as well */
status = CFE_SB_Unsubscribe(TO_LAB_CMD_MID, TO_Cmd_pipe);
if(status != CFE_SUCCESS)
CFE_EVS_SendEvent(TO_REMOVECMDTO_ERR_EID,CFE_EVS_ERROR, "L%d TO Can't Unsubscribe to cmd stream 0x%x status %i", __LINE__,
CFE_EVS_SendEvent(TO_REMOVECMDTO_ERR_EID,CFE_EVS_EventType_ERROR,
"L%d TO Can't Unsubscribe to cmd stream 0x%x status %i", __LINE__,
TO_LAB_CMD_MID, (int)status);

status = CFE_SB_Unsubscribe(TO_LAB_SEND_HK_MID, TO_Cmd_pipe);
if (status != CFE_SUCCESS)
CFE_EVS_SendEvent(TO_REMOVEHKTO_ERR_EID,CFE_EVS_ERROR, "L%d TO Can't Unsubscribe to cmd stream 0x%x status %i", __LINE__,
CFE_EVS_SendEvent(TO_REMOVEHKTO_ERR_EID,CFE_EVS_EventType_ERROR,
"L%d TO Can't Unsubscribe to cmd stream 0x%x status %i", __LINE__,
TO_LAB_CMD_MID, (int)status);

CFE_EVS_SendEvent(TO_REMOVEALLPKTS_INF_EID,CFE_EVS_INFORMATION, "L%d TO Unsubscribed to all Commands and Telemetry", __LINE__);
CFE_EVS_SendEvent(TO_REMOVEALLPKTS_INF_EID,CFE_EVS_EventType_INFORMATION,
"L%d TO Unsubscribed to all Commands and Telemetry", __LINE__);
} /* End of TO_RemoveAllPkt() */

/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
Expand Down Expand Up @@ -533,7 +549,7 @@ void TO_forward_telemetry(void)
}
if (status < 0)
{
CFE_EVS_SendEvent(TO_TLMOUTSTOP_ERR_EID,CFE_EVS_ERROR,
CFE_EVS_SendEvent(TO_TLMOUTSTOP_ERR_EID,CFE_EVS_EventType_ERROR,
"L%d TO sendto errno %d. Tlm output supressed\n", __LINE__, errno);
suppress_sendto = TRUE;
}
Expand Down

0 comments on commit fd5e877

Please sign in to comment.