Parsing value to specific status enum.

EmOne · Oct 22, 2024 · 7600178 · 7600178
1 parent 8414cac
commit 7600178
Showing 1 changed file with 35 additions and 13 deletions.
diff --git a/src/main/yamcs/mdb/xtce.xml b/src/main/yamcs/mdb/xtce.xml
@@ -85,6 +85,28 @@
 					<Enumeration value="7" label="ENUM_VALUE_7" />
 				</EnumerationList>
 			</EnumeratedParameterType>
+			<EnumeratedParameterType name="EnumPumpStatus">
+				<UnitSet />
+				<IntegerDataEncoding sizeInBits="4" />
+				<EnumerationList>
+					<Enumeration value="0" label="PUMP OFF / BREAK OFF / DIR FWD" />
+					<Enumeration value="1" label="PUMP ON / BREAK OFF / DIR FWD" />
+					<Enumeration value="2" label="PUMP OFF / BREAK ON / DIR FWD" />
+					<Enumeration value="3" label="PUMP ON / BREAK ON / DIR FWD" />
+					<Enumeration value="4" label="PUMP OFF / BREAK OFF / DIR BWD" />
+					<Enumeration value="5" label="PUMP ON / BREAK OFF / DIR BWD" />
+					<Enumeration value="6" label="PUMP OFF / BREAK ON / DIR BWD" />
+					<Enumeration value="7" label="PUMP ON / BREAK ON / DIR BWD" />
+				</EnumerationList>
+			</EnumeratedParameterType>
+			<EnumeratedParameterType name="EnumCLRStatus">
+				<UnitSet />
+				<IntegerDataEncoding sizeInBits="8" />
+				<EnumerationList>
+					<Enumeration value="0" label="READY" />
+					<Enumeration value="255" label="WARNING" />
+				</EnumerationList>
+			</EnumeratedParameterType>
 			<IntegerParameterType name="AIIM_PKT_ID_Type" signed="false">
 				<UnitSet />
 				<IntegerDataEncoding sizeInBits="16" />
@@ -109,16 +131,16 @@
 				<MemberList>
 					<!-- <Member name="AIIM_ID" typeRef="AIIM_PKT_ID_Type" shortDescription="AiiM Message ID"/> -->
 					<Member name="AIIM_SEQ_NUMBER" typeRef="AIIM_SEQ_NUM_Type" shortDescription="AiiM Message Sequence Number"/>
-					<Member name="AIIM_EXP_7_STATUS" typeRef="AIIM_EXP_Type" shortDescription="AiiM Experiment #7 Status"/>
-					<Member name="AIIM_EXP_6_STATUS" typeRef="AIIM_EXP_Type" shortDescription="AiiM Experiment #6 Status"/>
-					<Member name="AIIM_EXP_5_STATUS" typeRef="AIIM_EXP_Type" shortDescription="AiiM Experiment #5 Status"/>
-					<Member name="AIIM_EXP_4_STATUS" typeRef="AIIM_EXP_Type" shortDescription="AiiM Experiment #4 Status"/>
-					<Member name="AIIM_EXP_3_STATUS" typeRef="AIIM_EXP_Type" shortDescription="AiiM Experiment #3 Status"/>
-					<Member name="AIIM_EXP_2_STATUS" typeRef="AIIM_EXP_Type" shortDescription="AiiM Experiment #2 Status"/>
-					<Member name="AIIM_EXP_1_STATUS" typeRef="AIIM_EXP_Type" shortDescription="AiiM Experiment #1 Status"/>
-					<Member name="AIIM_EXP_0_STATUS" typeRef="AIIM_EXP_Type" shortDescription="AiiM Experiment #0 Status"/>
+					<Member name="AIIM_EXP_7_STATUS" typeRef="EnumPumpStatus" shortDescription="AiiM Experiment #7 Status"/>
+					<Member name="AIIM_EXP_6_STATUS" typeRef="EnumPumpStatus" shortDescription="AiiM Experiment #6 Status"/>
+					<Member name="AIIM_EXP_5_STATUS" typeRef="EnumPumpStatus" shortDescription="AiiM Experiment #5 Status"/>
+					<Member name="AIIM_EXP_4_STATUS" typeRef="EnumPumpStatus" shortDescription="AiiM Experiment #4 Status"/>
+					<Member name="AIIM_EXP_3_STATUS" typeRef="EnumPumpStatus" shortDescription="AiiM Experiment #3 Status"/>
+					<Member name="AIIM_EXP_2_STATUS" typeRef="EnumPumpStatus" shortDescription="AiiM Experiment #2 Status"/>
+					<Member name="AIIM_EXP_1_STATUS" typeRef="EnumPumpStatus" shortDescription="AiiM Experiment #1 Status"/>
+					<Member name="AIIM_EXP_0_STATUS" typeRef="EnumPumpStatus" shortDescription="AiiM Experiment #0 Status"/>
 					<Member name="AIIM_CTL_RESERVED" typeRef="AIIM_RESV_BYTE_Type" shortDescription="AiiM Controller Reserved byte"/>
-					<Member name="AIIM_CTL_STATUS" typeRef="AIIM_CTL_STATUS_Type" shortDescription="AiiM Controller Status"/>
+					<Member name="AIIM_CTL_STATUS" typeRef="EnumCLRStatus" shortDescription="AiiM Controller Status"/>
 				</MemberList>
 			</AggregateParameterType>
 		</ParameterTypeSet>
@@ -253,7 +275,7 @@
 			</SequenceContainer>
 			<SequenceContainer name="AIIM_PACKET">
 				<EntryList>
-					<ParameterRefEntry parameterRef="AIIM_STATUS_PACKET"></ParameterRefEntry>
+					<ParameterRefEntry parameterRef="AIIM_STATUS_PACKET"/>
 				</EntryList>
 				<BaseContainer containerRef="TelemetryPacket">
 					<RestrictionCriteria>
@@ -451,9 +473,9 @@
 				</ArgumentList>
 				<CommandContainer name="AIIM_Command">
 					<EntryList>
-						<ArgumentRefEntry argumentRef="AIIM_MAIN_CMD"></ArgumentRefEntry>
-						<ArgumentRefEntry argumentRef="AIIM_SUB_CMD"></ArgumentRefEntry>
-						<ArgumentRefEntry argumentRef="AIIM_CMD_PARAMETERS"></ArgumentRefEntry>
+						<ArgumentRefEntry argumentRef="AIIM_MAIN_CMD"/>
+						<ArgumentRefEntry argumentRef="AIIM_SUB_CMD"/>
+						<ArgumentRefEntry argumentRef="AIIM_CMD_PARAMETERS"/>
 					</EntryList>
 					<BaseContainer containerRef="MyProjectPacket"/>
 				</CommandContainer>