Skip to content

Fix #102, Adds new hk peek and sym tlm packets #103

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
chillfig wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix #102, Adds new hk peek and sym tlm packets #103

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
20 changes: 20 additions & 0 deletions config/default_mm_msgdefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,26 @@ typedef struct
applicable */
} MM_HkTlm_Payload_t;

/**
* \brief Peek Packet Payload
*/
typedef struct
{
MM_MemType_Enum_t MemType; /**< \brief Memory type */
uint32 DataValue; /**< \brief Data from peek */
MM_MemAddress_t Address; /**< \brief Fully resolved address */
MM_MemSize_t BytesProcessed; /**< \brief Bytes processed */
} MM_PeekPacket_Payload_t;

/**
* \brief Symbol Lookup Packet Payload
*/
typedef struct
{
char SymName[CFE_MISSION_MAX_API_LEN]; /**< \brief Symbol name */
MM_MemAddress_t Address; /**< \brief Fully resolved address */
} MM_SymLookupPacket_Payload_t;

#endif /* DEFAULT_MM_MSGDEFS_H */

/**\}*/
4 changes: 3 additions & 1 deletion config/default_mm_msgids.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@
* \{
*/

#define MM_HK_TLM_MID MM_TLM_PLATFORM_MIDVAL(HK_TLM)
#define MM_HK_TLM_MID MM_TLM_PLATFORM_MIDVAL(HK_TLM)
#define MM_PEEK_TLM_MID MM_TLM_PLATFORM_MIDVAL(PEEK_TLM)
#define MM_SYM_LOOKUP_TLM_MID MM_TLM_PLATFORM_MIDVAL(SYM_LOOKUP_TLM)

#endif /* DEFAULT_MM_MSGIDS_H */

Expand Down
18 changes: 18 additions & 0 deletions config/default_mm_msgstruct.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,24 @@ typedef struct
CFE_MSG_TelemetryHeader_t TelemetryHeader;
} MM_SendHkCmd_t;

/**
* \brief Symbol Lookup Packet Structure
*/
typedef struct
{
CFE_MSG_TelemetryHeader_t TelemetryHeader; /**< \brief Telemetry header */
MM_SymLookupPacket_Payload_t Payload; /**< \brief Symbol Lookup Packet Payload */
} MM_SymLookupPacket_t;

/**
* \brief Peek Packet Structure
*/
typedef struct
{
CFE_MSG_TelemetryHeader_t TelemetryHeader; /**< \brief Telemetry header */
MM_PeekPacket_Payload_t Payload; /**< \brief Peek Packet Payload */
} MM_PeekPacket_t;

#endif /* DEFAULT_MM_MSGSTRUCT_H */

/**\}*/
44 changes: 44 additions & 0 deletions eds/mm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,22 @@
</EntryList>
</ContainerDataType>

<ContainerDataType name="PeekPacket_Payload" shortDescription="Peek Packet Payload">
<EntryList>
<Entry name="MemType" type="MemType" shortDescription="Memory type"/>
<Entry name="DataValue" type="BASE_TYPES/uint32" shortDescription="Data from peek"/>
<Entry name="Address" type="MemAddress" shortDescription="Fully resolved address"/>
<Entry name="BytesProcessed" type="MemSize" shortDescription="Bytes processed"/>
</EntryList>
</ContainerDataType>

<ContainerDataType name="SymLookupPacket_Payload" shortDescription="Symbol Lookup Packet Payload">
<EntryList>
<Entry name="SymName" type="SymName" shortDescription="Symbol Name string"/>
<Entry name="Address" type="MemAddress" shortDescription="Fully resolved address"/>
</EntryList>
</ContainerDataType>

<!-- COMMANDS -->

<ContainerDataType name="CommandBase" baseType="CFE_HDR/CommandHeader"/>
Expand Down Expand Up @@ -344,6 +360,18 @@
<Entry type="HkTlm_Payload" name="Payload"/>
</EntryList>
</ContainerDataType>

<ContainerDataType name="PeekPacket" baseType="CFE_HDR/TelemetryHeader">
<EntryList>
<Entry type="PeekPacket_Payload" name="Payload"/>
</EntryList>
</ContainerDataType>

<ContainerDataType name="SymLookupPacket" baseType="CFE_HDR/TelemetryHeader">
<EntryList>
<Entry type="SymLookupPacket_Payload" name="Payload"/>
</EntryList>
</ContainerDataType>
</DataTypeSet>

<ComponentSet>
Expand All @@ -366,19 +394,35 @@
<GenericTypeMap name="TelemetryDataType" type="HkTlm" />
</GenericTypeMapSet>
</Interface>

<Interface name="PEEK_TLM" shortDescription="Software bus peek telemetry interface" type="CFE_SB/Telemetry">
<GenericTypeMapSet>
<GenericTypeMap name="TelemetryDataType" type="PeekPacket" />
</GenericTypeMapSet>
</Interface>

<Interface name="SYM_LOOKUP_TLM" shortDescription="Software bus symbol lookup telemetry interface" type="CFE_SB/Telemetry">
<GenericTypeMapSet>
<GenericTypeMap name="TelemetryDataType" type="SymLookupPacket" />
</GenericTypeMapSet>
</Interface>
</RequiredInterfaceSet>

<Implementation>
<VariableSet>
<Variable type="BASE_TYPES/uint16" readOnly="true" name="CmdTopicId" initialValue="${CFE_MISSION/MM_CMD_TOPICID}"/>
<Variable type="BASE_TYPES/uint16" readOnly="true" name="SendHkTopicId" initialValue="${CFE_MISSION/MM_SEND_HK_TOPICID}"/>
<Variable type="BASE_TYPES/uint16" readOnly="true" name="HkTlmTopicId" initialValue="${CFE_MISSION/MM_HK_TLM_TOPICID}"/>
<Variable type="BASE_TYPES/uint16" readOnly="true" name="PeekTlmTopicId" initialValue="${CFE_MISSION/MM_PEEK_TLM_TOPICID}"/>
<Variable type="BASE_TYPES/uint16" readOnly="true" name="SymLookupTlmTopicId" initialValue="${CFE_MISSION/MM_SYM_LOOKUP_TLM_TOPICID}"/>
</VariableSet>

<ParameterMapSet>
<ParameterMap interface="CMD" parameter="TopicId" variableRef="CmdTopicId" />
<ParameterMap interface="SEND_HK" parameter="TopicId" variableRef="SendHkTopicId" />
<ParameterMap interface="HK_TLM" parameter="TopicId" variableRef="HkTlmTopicId" />
<ParameterMap interface="PEEK_TLM" parameter="TopicId" variableRef="PeekTlmTopicId" />
<ParameterMap interface="SYM_LOOKUP_TLM" parameter="TopicId" variableRef="SymLookupTlmTopicId" />
</ParameterMapSet>
</Implementation>
</Component>
Expand Down
6 changes: 6 additions & 0 deletions fsw/inc/mm_topicids.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,10 @@
#define MM_MISSION_HK_TLM_TOPICID MM_MISSION_TIDVAL(HK_TLM)
#define DEFAULT_MM_MISSION_HK_TLM_TOPICID 0x87

#define MM_MISSION_PEEK_TLM_TOPICID MM_MISSION_TIDVAL(PEEK_TLM)
#define DEFAULT_MM_MISSION_PEEK_TLM_TOPICID 0x88

#define MM_MISSION_SYM_LOOKUP_TLM_TOPICID MM_MISSION_TIDVAL(SYM_LOOKUP_TLM)
#define DEFAULT_MM_MISSION_SYM_LOOKUP_TLM_TOPICID 0x89

#endif /* MM_TOPICIDS_H */
14 changes: 14 additions & 0 deletions fsw/src/mm_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,20 @@ CFE_Status_t MM_AppInit(void)
*/
CFE_MSG_Init(CFE_MSG_PTR(MM_AppData.HkTlm.TelemetryHeader), CFE_SB_ValueToMsgId(MM_HK_TLM_MID), sizeof(MM_HkTlm_t));

/*
** Initialize the local peek telemetry packet (clear user data area)
*/
CFE_MSG_Init(CFE_MSG_PTR(MM_AppData.PeekPacket.TelemetryHeader),
CFE_SB_ValueToMsgId(MM_PEEK_TLM_MID),
sizeof(MM_PeekPacket_t));

/*
** Initialize the local symbol lookup telemetry packet (clear user data area)
*/
CFE_MSG_Init(CFE_MSG_PTR(MM_AppData.SymLookupPacket.TelemetryHeader),
CFE_SB_ValueToMsgId(MM_SYM_LOOKUP_TLM_MID),
sizeof(MM_SymLookupPacket_t));

/*
** Create Software Bus message pipe
*/
Expand Down
4 changes: 3 additions & 1 deletion fsw/src/mm_app.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@
*/
typedef struct
{
MM_HkTlm_t HkTlm; /**< \brief Housekeeping telemetry packet */
MM_HkTlm_t HkTlm; /**< \brief Housekeeping telemetry packet */
MM_SymLookupPacket_t SymLookupPacket; /**< \brief Symbol lookup telemetry packet */
MM_PeekPacket_t PeekPacket; /**< \brief Memory peek telemetry packet */

CFE_SB_PipeId_t CmdPipe; /**< \brief Command pipe ID */

Expand Down
9 changes: 9 additions & 0 deletions fsw/src/mm_cmds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,15 @@ CFE_Status_t MM_LookupSymCmd(const MM_LookupSymCmd_t *Msg)
"Symbol Lookup Command: Name = '%s' Addr = %p",
SymName,
(void *)ResolvedAddr);

/* Update Symbol Look Up Tlm */
strncpy(MM_AppData.SymLookupPacket.Payload.SymName,
SymName,
sizeof(MM_AppData.SymLookupPacket.Payload.SymName));

MM_AppData.SymLookupPacket.Payload.Address = ResolvedAddr;
CFE_SB_TimeStampMsg(CFE_MSG_PTR(MM_AppData.SymLookupPacket.TelemetryHeader));
CFE_SB_TransmitMsg(CFE_MSG_PTR(MM_AppData.SymLookupPacket.TelemetryHeader), true);
}
else
{
Expand Down
9 changes: 9 additions & 0 deletions fsw/src/mm_dump.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,15 @@ int32 MM_PeekMem(const MM_PeekCmd_t *CmdPtr, cpuaddr SrcAddress)
(void *)SrcAddress,
(unsigned int)DataSize,
(unsigned int)DataValue);

/* Update Peek TLM Packet */
MM_AppData.PeekPacket.Payload.MemType = CmdPtr->Payload.MemType;
MM_AppData.PeekPacket.Payload.Address = SrcAddress;
MM_AppData.PeekPacket.Payload.BytesProcessed = BytesProcessed;
MM_AppData.PeekPacket.Payload.DataValue = DataValue;

CFE_SB_TimeStampMsg(CFE_MSG_PTR(MM_AppData.PeekPacket.TelemetryHeader));
CFE_SB_TransmitMsg(CFE_MSG_PTR(MM_AppData.PeekPacket.TelemetryHeader), true);
}
else
{
Expand Down
Loading