Fix #2233, Update data types in CFE msgs in EDS xml

nasa · Jan 10, 2023 · 21a4504 · 21a4504
1 parent 9f89010
commit 21a4504
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/modules/es/eds/cfe_es.xml b/modules/es/eds/cfe_es.xml
@@ -30,7 +30,7 @@
     <DataTypeSet>
 
       <EnumeratedDataType name="LogMode" shortDescription="Identifies handling of log messages after storage is filled" >
-        <IntegerDataEncoding sizeInBits="8" encoding="unsigned" />
+        <IntegerDataEncoding sizeInBits="32" encoding="unsigned" />
         <EnumerationList>
           <Enumeration label="OVERWRITE" value="0" shortDescription="Overwrite Log Mode" />
           <Enumeration label="DISCARD" value="1" shortDescription="Discard Log Mode" />

diff --git a/modules/tbl/eds/cfe_tbl.xml b/modules/tbl/eds/cfe_tbl.xml
@@ -206,7 +206,7 @@
               \cfetlmmnemonic  \TBL_LASTVALS
             </LongDescription>
           </Entry>
-          <Entry name="ActiveBuffer" type="BASE_TYPES/uint8" shortDescription="Indicator of whether table buffer validated was 0=Inactive, 1=Active">
+          <Entry name="ActiveBuffer" type="BASE_TYPES/StatusBit" shortDescription="Indicator of whether table buffer validated was 0=Inactive, 1=Active">
             <LongDescription>
               \cfetlmmnemonic  \TBL_LASTVALBUF
             </LongDescription>
@@ -306,22 +306,22 @@
               \cfetlmmnemonic  \TBL_FILECSECONDS
             </LongDescription>
           </Entry>
-          <Entry name="TableLoadedOnce" type="BASE_TYPES/uint8" shortDescription="Flag indicating whether table has been loaded once or not">
+          <Entry name="TableLoadedOnce" type="BASE_TYPES/StatusBit" shortDescription="Flag indicating whether table has been loaded once or not">
             <LongDescription>
               \cfetlmmnemonic  \TBL_LOADEDONCE
             </LongDescription>
           </Entry>
-          <Entry name="LoadPending" type="BASE_TYPES/uint8" shortDescription="Flag indicating an inactive buffer is ready to be copied">
+          <Entry name="LoadPending" type="BASE_TYPES/StatusBit" shortDescription="Flag indicating an inactive buffer is ready to be copied">
             <LongDescription>
               \cfetlmmnemonic  \TBL_UPDATEPNDNG
             </LongDescription>
           </Entry>
-          <Entry name="DumpOnly" type="BASE_TYPES/uint8" shortDescription="Flag indicating Table is NOT to be loaded">
+          <Entry name="DumpOnly" type="BASE_TYPES/StatusBit" shortDescription="Flag indicating Table is NOT to be loaded">
             <LongDescription>
               \cfetlmmnemonic  \TBL_DUMPONLY
             </LongDescription>
           </Entry>
-          <Entry name="DoubleBuffered" type="BASE_TYPES/uint8" shortDescription="Flag indicating Table has a dedicated inactive buffer">
+          <Entry name="DoubleBuffered" type="BASE_TYPES/StatusBit" shortDescription="Flag indicating Table has a dedicated inactive buffer">
             <LongDescription>
               \cfetlmmnemonic  \TBL_DBLBUFFERED
             </LongDescription>
@@ -341,7 +341,7 @@
               \cfetlmmnemonic  \TBL_OWNERAPP
             </LongDescription>
           </Entry>
-          <Entry name="Critical" type="BASE_TYPES/uint8" shortDescription="Indicates whether table is Critical or not">
+          <Entry name="Critical" type="BASE_TYPES/StatusBit" shortDescription="Indicates whether table is Critical or not">
             <LongDescription>
               \cfetlmmnemonic  \TBL_CRITICAL
             </LongDescription>

diff --git a/modules/time/eds/cfe_time.xml b/modules/time/eds/cfe_time.xml
@@ -86,15 +86,15 @@
       </EnumeratedDataType>
 
       <EnumeratedDataType name="SourceSelect" shortDescription="Clock Source Selection Parameters">
-        <IntegerDataEncoding sizeInBits="8" encoding="unsigned" />
+        <IntegerDataEncoding sizeInBits="16" encoding="unsigned" />
         <EnumerationList>
           <Enumeration label="INTERNAL" value="1" shortDescription="Use Internal Source" />
           <Enumeration label="EXTERNAL" value="2" shortDescription="Use External Source"  />
         </EnumerationList>
       </EnumeratedDataType>
 
       <EnumeratedDataType name="ToneSignalSelect" shortDescription="Tone Signal Selection Parameters">
-        <IntegerDataEncoding sizeInBits="8" encoding="unsigned" />
+        <IntegerDataEncoding sizeInBits="16" encoding="unsigned" />
         <EnumerationList>
           <Enumeration label="PRIMARY" value="1" shortDescription="Primary Source" />
           <Enumeration label="REDUNDANT" value="2" shortDescription="Redundant Source" />
@@ -110,15 +110,15 @@
       </EnumeratedDataType>
 
       <EnumeratedDataType name="FlywheelState" shortDescription="Fly-wheel status values" >
-        <IntegerDataEncoding sizeInBits="8" encoding="unsigned" />
+        <IntegerDataEncoding sizeInBits="16" encoding="unsigned" />
         <EnumerationList>
           <Enumeration label="NO_FLY" value="0" shortDescription="Not in flywheel state" />
           <Enumeration label="IS_FLY" value="1" shortDescription="In flywheel state" />
         </EnumerationList>
       </EnumeratedDataType>
 
       <EnumeratedDataType name="SetState" shortDescription="Clock status values (has the clock been set to correct time)">
-        <IntegerDataEncoding sizeInBits="8" encoding="unsigned" />
+        <IntegerDataEncoding sizeInBits="16" encoding="unsigned" />
         <EnumerationList>
           <Enumeration label="NOT_SET" value="0" shortDescription="Spacecraft time has not been set" />
           <Enumeration label="WAS_SET" value="1" shortDescription="Spacecraft time has been set"  />