Skip to content

Commit

Permalink
Merge pull request #2510 from jphickey:fix-2508-edsxml-updates
Browse files Browse the repository at this point in the history 
Fix #2508, EDS XML file updates
  • Loading branch information
@dzbaker
dzbaker committed Feb 2, 2024
2 parents 3e32c9d + 7f6a082 commit 431e4a2
Show file tree
Hide file tree
Showing 9 changed files with 94 additions and 706 deletions.
106 changes: 61 additions & 45 deletions cmake/sample_defs/eds/cfe-topicids.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,72 +46,88 @@
changes are made. Such changes would not be an issue if EDS were used across the board, but until that
milestone is met, this manually-specified approach offers more stability in distributed systems.
-->
<Define name="TELECOMMAND_NUM_TOPICIDS" value="60" />
<Define name="TELEMETRY_NUM_TOPICIDS" value="60" />
<Define name="TELECOMMAND_NUM_TOPICIDS" value="256" />
<Define name="TELEMETRY_NUM_TOPICIDS" value="256" />

<Define name="TELECOMMAND_BASE_TOPICID" value="1" />
<!-- GLOBAL Telemetry Topics - these are not specific to a CPU number -->
<Define name="GLOBAL_CMD_NUM_TOPICIDS" value="4" />
<Define name="GLOBAL_TLM_NUM_TOPICIDS" value="4" />

<Define name="GLOBAL_CMD_BASE_TOPICID" value="1" />
<Define name="GLOBAL_CMD_MAX_TOPICID" value="${CFE_MISSION/GLOBAL_CMD_BASE_TOPICID} + ${CFE_MISSION/GLOBAL_CMD_NUM_TOPICIDS}" />
<Define name="GLOBAL_TLM_BASE_TOPICID" value="${CFE_MISSION/GLOBAL_CMD_MAX_TOPICID}" />
<Define name="GLOBAL_TLM_MAX_TOPICID" value="${CFE_MISSION/GLOBAL_TLM_BASE_TOPICID} + ${CFE_MISSION/GLOBAL_TLM_NUM_TOPICIDS}" />

<Define name="TELECOMMAND_BASE_TOPICID" value="${CFE_MISSION/GLOBAL_TLM_MAX_TOPICID}" />
<Define name="TELECOMMAND_MAX_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + ${CFE_MISSION/TELECOMMAND_NUM_TOPICIDS}" />
<Define name="TELEMETRY_BASE_TOPICID" value="${CFE_MISSION/TELECOMMAND_MAX_TOPICID}" />
<Define name="TELEMETRY_MAX_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + ${CFE_MISSION/TELEMETRY_NUM_TOPICIDS}" />

<Define name="MAX_TOPICID" value="${CFE_MISSION/TELEMETRY_MAX_TOPICID}" />

<!-- CFE TIME is currently the only framework component that uses global IDs -->
<Define name="TIME_DATA_CMD_TOPICID" value="${CFE_MISSION/GLOBAL_CMD_BASE_TOPICID} + 0" />
<Define name="TIME_SEND_CMD_TOPICID" value="${CFE_MISSION/GLOBAL_CMD_BASE_TOPICID} + 2" />

<!-- Mission-specific mappings for CFE "topic IDs" -->
<!-- Executive Services (ES) Command Topics -->
<Define name="ES_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 0" />
<Define name="ES_SEND_HK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 1" />
<Define name="ES_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 6" />
<Define name="ES_SEND_HK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 8" />
<!-- Time Services (TIME) Command Topics -->
<Define name="TIME_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 2" />
<Define name="TIME_TONE_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 3" />
<Define name="TIME_ONEHZ_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 4" />
<Define name="TIME_SEND_HK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 5" />
<Define name="TIME_DATA_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 6" />
<Define name="TIME_FAKE_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 7" />
<Define name="TIME_SEND_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 8" />
<Define name="TIME_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 5" />
<Define name="TIME_TONE_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 16" />
<Define name="TIME_ONEHZ_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 17" />
<Define name="TIME_SEND_HK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 13" />
<!-- <Define name="TIME_FAKE_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 7" /> -->
<!-- Event Services (EVS) Command Topics -->
<Define name="EVS_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 9" />
<Define name="EVS_SEND_HK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 10" />
<Define name="EVS_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 1" />
<Define name="EVS_SEND_HK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 9" />
<!-- Software Bus (SB) Command Topics -->
<Define name="SB_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 11" />
<Define name="SB_SEND_HK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 12" />
<Define name="SB_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 3" />
<Define name="SB_SEND_HK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 11" />
<Define name="SB_SUB_RPT_CTRL_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 14" />
<!-- Table Services (TBL) Command Topics -->
<Define name="TBL_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 13" />
<Define name="TBL_SEND_HK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 14" />

<Define name="CI_LAB_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 15" />
<Define name="CI_LAB_SEND_HK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 16" />
<Define name="TO_LAB_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 17" />
<Define name="TO_LAB_SEND_HK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 18" />
<Define name="SAMPLE_APP_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 19" />
<Define name="SAMPLE_APP_SEND_HK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 20" />
<Define name="SB_SUB_RPT_CTRL_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 21" />
<Define name="TEST_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 22" />
<Define name="TBL_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 4" />
<Define name="TBL_SEND_HK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 12" />

<Define name="TEST_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 2" />

<Define name="TO_LAB_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 128" />
<Define name="TO_LAB_SEND_HK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 129" />
<Define name="SAMPLE_APP_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 130" />
<Define name="SAMPLE_APP_SEND_HK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 131" />
<Define name="CI_LAB_CMD_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 132" />
<Define name="CI_LAB_SEND_HK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 133" />
<Define name="CI_LAB_READ_UPLINK_TOPICID" value="${CFE_MISSION/TELECOMMAND_BASE_TOPICID} + 134" />


<!-- Executive Services (ES) Telemetry Topics -->
<Define name="ES_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 0" />
<Define name="ES_APP_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 1" />
<Define name="ES_APP_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 11" />
<Define name="ES_SHELL_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 2" />
<Define name="ES_MEMSTATS_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 3" />
<Define name="ES_MEMSTATS_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 16" />
<!-- Time Services (TIME) Telemetry Topics -->
<Define name="TIME_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 4" />
<Define name="TIME_DIAG_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 5" />
<Define name="TIME_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 5" />
<Define name="TIME_DIAG_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 6" />
<!-- Event Services (EVS) Telemetry Topics -->
<Define name="EVS_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 6" />
<Define name="EVS_SHORT_EVENT_MSG_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 7" />
<Define name="EVS_LONG_EVENT_MSG_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 8" />
<Define name="EVS_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 1" />
<Define name="EVS_SHORT_EVENT_MSG_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 8" />
<Define name="EVS_LONG_EVENT_MSG_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 9" />
<!-- Software Bus (SB) Telemetry Topics -->
<Define name="SB_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 9" />
<Define name="SB_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 3" />
<Define name="SB_STATS_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 10" />
<Define name="SB_ALLSUBS_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 11" />
<Define name="SB_ONESUB_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 12" />
<Define name="SB_ALLSUBS_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 13" />
<Define name="SB_ONESUB_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 14" />
<!-- Table Services (TBL) Telemetry Topics -->
<Define name="TBL_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 13" />
<Define name="TBL_REG_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 14" />

<Define name="CI_LAB_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 15" />
<Define name="TO_LAB_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 16" />
<Define name="TO_LAB_DATA_TYPES_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 17" />
<Define name="SAMPLE_APP_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 18" />
<Define name="TEST_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 19" />
<Define name="TBL_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 4" />
<Define name="TBL_REG_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 12" />

<Define name="TEST_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 2" />

<Define name="TO_LAB_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 128" />
<Define name="TO_LAB_DATA_TYPES_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 129" />
<Define name="SAMPLE_APP_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 131" />
<Define name="CI_LAB_HK_TLM_TOPICID" value="${CFE_MISSION/TELEMETRY_BASE_TOPICID} + 132" />

</Package>
</DesignParameters>
40 changes: 32 additions & 8 deletions cmake/sample_defs/eds/config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,23 @@
-->
<DesignParameters>

<Package name="SAMPLE_APP">
<Define name="STRING_VAL_LEN" value="10" />
</Package>

<Package name="CI_LAB">
<Define name="BASE_UDP_PORT" value="1234" />
</Package>

<Package name="TO_LAB">
<Define name="TLM_PORT" value="1235" />
<Define name="MAX_SUBSCRIPTIONS" value="32" />
</Package>

<Package name="CFE_ES" shortDescription="Executive Services">
<!-- Placeholder, currently no options yet -->
</Package>

<Package name="CFE_EVS" shortDescription="Event Services Configuration">
<!-- The bitmasks do not yet have a way to directly associate with the data structure yet -->
<Define name="DEBUG_BIT" value="0x0001" />
Expand All @@ -50,19 +67,28 @@
<Define name="MSGID_BIT_SIZE" value="32" />
</Package>

<Package name="CFE_TBL" shortDescription="Table Services">
<!-- Placeholder, currently no options yet -->
</Package>

<Package name="CFE_TIME" shortDescription="Time Services">
<!-- Placeholder, currently no options yet -->
</Package>

<Package name="SCH_LAB" shortDescription="SCH_LAB configurable items">
<Define name="MAX_SCHEDULE_ENTRIES" value="32" />
<Define name="MAX_ARGS_PER_ENTRY" value="32" />
</Package>

<Package name="CFE_MISSION" shortDescription="cFE mission configuration">

<!--
Memory size values in CFE CMD/TLM messages.
Global Memory reference integer size for all messages.
Traditionally in CFE these were only 32 bit values. Keeping as 32-bit
(4 bytes) allows more compatibility with older non-EDS tools, but
can be increased for large object support.
allows better compatibility with older (non-EDS) tools, but
can be increased for larger sizes if any 64 bit CPUs are deployed.
-->
<Define name="MEM_REFERENCE_SIZE_BITS" value="32" />
<Define name="MEM_REFERENCE_SIZE_BITS" value="64" />

<!--
Note on header type selection - this should be defined to the bare
Expand All @@ -79,10 +105,6 @@
<Define name="DATA_BYTE_ORDER" value="bigEndian"/>
<Define name="SIGNED_INTEGER_ENCODING" value="twosComplement"/>
<Define name="SPACECRAFT_ID" value="66"/>
<Define name="TELECOMMAND_BASE_TOPICID" value="1"/>
<Define name="TELECOMMAND_MAX_TOPICID" value="61"/>
<Define name="TELEMETRY_BASE_TOPICID" value="61"/>
<Define name="TELEMETRY_MAX_TOPICID" value="121"/>

<Define name="ES_CDS_MAX_NAME_LENGTH" value="16">
<LongDescription>
Expand Down Expand Up @@ -556,6 +578,8 @@
</LongDescription>
</Define>

<Define name="OS_MAX_NUM_OPEN_FILES" value="50" />

</Package>

</DesignParameters>
1 change: 1 addition & 0 deletions modules/core_api/eds/base_types.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
<!-- Commonly used string types in all CFE/CFS messages -->
<StringDataType name="ApiName" length="${CFE_MISSION/MAX_API_LEN}" />
<StringDataType name="PathName" length="${CFE_MISSION/MAX_PATH_LEN}" />
<StringDataType name="FileName" length="${CFE_MISSION/MAX_FILE_LEN}" />

<!--
Memory addresses in CMD/TLM: These are integer types based on the
Expand Down
Loading

0 comments on commit 431e4a2

Please sign in to comment.