Skip to content

Commit

Permalink
Fix #436, apply name changes to EDS dispatcher
Browse files Browse the repository at this point in the history
Renames symbols to match recent EdsLib change.

This also includes a patch to the XML file, as having the enable flag
declared as a boolean made some conditionals unreachable (the compiler
starts enforcing the range of a bool).
  • Loading branch information
jphickey committed Mar 7, 2024
1 parent f65d679 commit e2039fb
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
8 changes: 4 additions & 4 deletions config/default_cf_extern_typedefs.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@
#include "cf_eds_typedefs.h"

typedef CF_QueueIdx_Enum_t CF_QueueIdx_t;
#define CF_QueueIdx_NUM (1 + CF_QueueIdx_Enum_t_MAX)
#define CF_GetSet_ValueID_MAX (1 + CF_GetSet_ValueID_Enum_t_MAX)
#define CF_QueueIdx_NUM (1 + EdsDataType_CF_QueueIdx_t_MAX)
#define CF_GetSet_ValueID_MAX (1 + EdsDataType_CF_GetSet_ValueID_t_MAX)

typedef CF_EntityId_Atom_t CF_EntityId_t;
typedef CF_TransactionSeq_Atom_t CF_TransactionSeq_t;

typedef CF_CFDP_Enum_t CF_CFDP_Class_t;
typedef CF_GetSet_ValueID_Enum_t CF_GetSet_ValueID_t;

typedef BASE_TYPES_PathName_String_t CF_PathName_t;
typedef BASE_TYPES_FileName_String_t CF_FileName_t;
typedef EdsDataType_BASE_TYPES_PathName_t CF_PathName_t;
typedef EdsDataType_BASE_TYPES_FileName_t CF_FileName_t;

#define CF_FILENAME_MAX_NAME ((int)sizeof(CF_FileName_t))
#define CF_FILENAME_MAX_LEN ((int)sizeof(CF_PathName_t))
Expand Down
11 changes: 8 additions & 3 deletions eds/cf.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,14 @@
<IntegerDataEncoding sizeInBits="32" encoding="unsigned" />
</IntegerDataType>

<BooleanDataType name="EnableFlag" shortDescription="Enable/Disable logical value">
<BooleanDataEncoding sizeInBits="8" />
</BooleanDataType>
<EnumeratedDataType name="EnableFlag" shortDescription="Enable/Disable logical value">
<EnumerationList>
<Enumeration label="NO" value="0" shortDescription="Option Disabled" />
<Enumeration label="YES" value="1" shortDescription="Option Enabled" />
</EnumerationList>

<IntegerDataEncoding sizeInBits="8" />
</EnumeratedDataType>

<IntegerDataType name="ChannelId" shortDescription="Channel Identifier Value">
<IntegerDataEncoding sizeInBits="8" encoding="unsigned" />
Expand Down
10 changes: 4 additions & 6 deletions fsw/src/cf_eds_dispatch.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include "cfe_msg.h"

static const CF_Application_Component_Telecommand_DispatchTable_t CF_TC_DISPATCH_TABLE = {
static const EdsDispatchTable_CF_Application_CFE_SB_Telecommand_t CF_TC_DISPATCH_TABLE = {
.CMD =
{

Expand Down Expand Up @@ -48,8 +48,7 @@ void CF_AppPipe(const CFE_SB_Buffer_t *msg)
CFE_MSG_Size_t MsgSize;
CFE_MSG_FcnCode_t MsgFc;

status = CF_Application_Component_Telecommand_Dispatch(CFE_SB_Telecommand_indication_Command_ID, msg,
&CF_TC_DISPATCH_TABLE);
status = EdsDispatch_CF_Application_Telecommand(msg, &CF_TC_DISPATCH_TABLE);

if (status != CFE_SUCCESS)
{
Expand All @@ -58,9 +57,8 @@ void CF_AppPipe(const CFE_SB_Buffer_t *msg)

if (status == CFE_STATUS_UNKNOWN_MSG_ID)
{
CFE_EVS_SendEvent(CF_EID_ERR_INVALID_MID, CFE_EVS_EventType_ERROR,
"L%d TO: Invalid Msg ID Rcvd 0x%x status=0x%08x", __LINE__,
(unsigned int)CFE_SB_MsgIdToValue(MsgId), (unsigned int)status);
CFE_EVS_SendEvent(CF_MID_ERR_EID, CFE_EVS_EventType_ERROR, "L%d TO: Invalid Msg ID Rcvd 0x%x status=0x%08x",
__LINE__, (unsigned int)CFE_SB_MsgIdToValue(MsgId), (unsigned int)status);
}
else if (status == CFE_STATUS_WRONG_MSG_LENGTH)
{
Expand Down

0 comments on commit e2039fb

Please sign in to comment.