Skip to content
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

Jump to bottom

Fix #2230, EDS Updates to match the current mainline #2231

Merged
merged 1 commit into from
Dec 20, 2022
Merged

Fix #2230, EDS Updates to match the current mainline #2231

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
85 changes: 85 additions & 0 deletions modules/cfe_testcase/eds/cfe_testcase.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--

GSC-18128-1, "Core Flight Executive Version 6.7"
LEW-19710-1, "CCSDS electronic data sheet implementation"

Copyright (c) 2006-2019 United States Government as represented by
the Administrator of the National Aeronautics and Space Administration.
All Rights Reserved.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

This document adheres to the Electronic Data Sheet (EDS) XML schema
as prescribed in CCSDS book 876.0.

Purpose:
This describes all interface objects for the Executive Services (CFE_ES)
core application

-->
<PackageFile xmlns="http://www.ccsds.org/schema/sois/seds">
<Package name="CFE_TEST" shortDescription="CFE Functional Test (FT) Application Package">

<DataTypeSet>

<ContainerDataType name="TestTable" shortDescription="Example Table Definition">
<EntryList>
<Entry name="Int1" type="BASE_TYPES/uint16" shortDescription="Example integer 1" />
<Entry name="Int2" type="BASE_TYPES/uint16" shortDescription="Example integer 2" />
</EntryList>
</ContainerDataType>

<ContainerDataType name="TestCmd" baseType="CFE_HDR/CommandHeader" shortDescription="Test command message">
<EntryList>
<Entry name="CmdPayload" type="BASE_TYPES/uint64" shortDescription="Example Payload" />
</EntryList>
</ContainerDataType>

<ContainerDataType name="TestTlm" baseType="CFE_HDR/TelemetryHeader" shortDescription="Test housekeeping message">
<EntryList>
<Entry name="TlmPayload" type="BASE_TYPES/uint64" shortDescription="Example Payload" />
</EntryList>
</ContainerDataType>

</DataTypeSet>

<ComponentSet>
<Component name="Application">
<RequiredInterfaceSet>
<Interface name="CMD" shortDescription="Software bus telecommand interface" type="CFE_SB/Telecommand">
<GenericTypeMapSet>
<GenericTypeMap name="TelecommandDataType" type="TestCmd" />
</GenericTypeMapSet>
</Interface>
<Interface name="HK_TLM" shortDescription="Software bus housekeeping telemetry interface" type="CFE_SB/Telemetry">
<GenericTypeMapSet>
<GenericTypeMap name="TelemetryDataType" type="TestTlm" />
</GenericTypeMapSet>
</Interface>
</RequiredInterfaceSet>
<Implementation>
<VariableSet>
<Variable type="BASE_TYPES/uint16" readOnly="true" name="CmdTopicId" initialValue="${CFE_MISSION/TEST_CMD_TOPICID}" />
<Variable type="BASE_TYPES/uint16" readOnly="true" name="TlmTopicId" initialValue="${CFE_MISSION/TEST_HK_TLM_TOPICID}" />
</VariableSet>
<ParameterMapSet>
<ParameterMap interface="CMD" parameter="TopicId" variableRef="CmdTopicId" />
<ParameterMap interface="HK_TLM" parameter="TopicId" variableRef="TlmTopicId" />
</ParameterMapSet>
</Implementation>
</Component>
</ComponentSet>

</Package>
</PackageFile>
38 changes: 0 additions & 38 deletions modules/core_api/eds/base_types.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,44 +102,6 @@
<StringDataType name="ApiName" length="${CFE_MISSION/MAX_API_LEN}" />
<StringDataType name="PathName" length="${CFE_MISSION/MAX_PATH_LEN}" />

<!--
CPU memory addresses in messages can be either 32 or 64 bits.
This depends on specific CPUs in use, but it should be consistent
across all cpus.
-->
<IntegerDataType name="CpuAddress" shortDescription="CPU memory address">
<IntegerDataEncoding sizeInBits="${CFE_MISSION/MAX_CPU_ADDRESS_SIZE} * 8" encoding="unsigned" byteOrder="${CFE_MISSION/DATA_BYTE_ORDER}" />
<Range>
<MinMaxRange max="2 ^ (8 * ${CFE_MISSION/MAX_CPU_ADDRESS_SIZE})" min="0" rangeType="inclusiveMinExclusiveMax"/>
</Range>
</IntegerDataType>

<!--
The following data types are a test/example of how 20-bit microseconds
can be used in outgoing telemetry packets. It defines a container with
a 20 bit "Micros" field followed by 12 bits of padding to create 32 bits.
If this is desired then two configuration parameters need to change:
- Set the 'TELEMETRY_SUBSECONDS_TYPE' EDS directive
- Set the 'CFE_SB_PACKET_TIME_SUBSECONDS_UNITS' config directive
And uncomment these types...


<IntegerDataType name="MicrosecondsValue">
<IntegerDataEncoding sizeInBits="20" encoding="unsigned" />
</IntegerDataType>
<IntegerDataType name="MicrosecondsPad">
<IntegerDataEncoding sizeInBits="12" encoding="unsigned" />
</IntegerDataType>

<ContainerDataType name="TlmMicrosecs">
<EntryList>
<Entry name="Micros" type="MicrosecondsValue" />
<Entry name="Pad" type="MicrosecondsPad" />
</EntryList>
</ContainerDataType>

-->

</DataTypeSet>

</Package>
Expand Down
Loading