Index: leahi_dialin/ro/modules/valves.py =================================================================== diff -u -rbefe788cdfef820b43ddcabef0e03877676bc452 -r1ad88aeeeed4db45b614481317a0e97019ec500e --- leahi_dialin/ro/modules/valves.py (.../valves.py) (revision befe788cdfef820b43ddcabef0e03877676bc452) +++ leahi_dialin/ro/modules/valves.py (.../valves.py) (revision 1ad88aeeeed4db45b614481317a0e97019ec500e) @@ -39,14 +39,15 @@ @unique class ROValveNames(DialinEnum): - VWI = 0 # Valve (M4) - VROD = 1 # Valve (P39) - VFF = 2 # Valve (P6) - VPI = 3 # Valve (P11) - VCR = 4 # Valve (P33) - VCB = 5 # Valve (P34) - VCD = 6 # Valve (P37) - VFB = 7 # Valve (M7) + VWI = 0 # Valve (M4 VWi) + VROD = 1 # Valve (P39 VROd) + VFF = 2 # Valve (P6 VFF) + VPI = 3 # Valve (P11 VPi) + VCR = 4 # Valve (P33 VCr) + VCB = 5 # Valve (P34 VCb) + VCD = 6 # Valve (P37 VCd) + VFB = 7 # Valve (M7 VFB) + SPP = 8 # Valve (P20 SPP) class ROValves(AbstractSubSystem): """ @@ -84,8 +85,8 @@ self.valve_state_VCB = {"id": ROValveNames.VCB.value, "state": DEENERGIZED} self.valve_state_VCD = {"id": ROValveNames.VCD.value, "state": DEENERGIZED} self.valve_state_VROD = {"id": ROValveNames.VROD.value, "state": DEENERGIZED} + self.valve_state_SPP = {"id": ROValveNames.SPP.value, "state": DEENERGIZED} - # NOTE: The len function counts the enums with the same number only once. This is not the case in the DG valves # class because each valve must have a unique ID. self.valve_states_enum = [0 for _ in range(len(ROValveNames))] @@ -101,13 +102,14 @@ """ return [ self.valve_state_VWI.get("state"), - self.valve_state_VROD.get("state"), + self.valve_state_VFB.get("state"), self.valve_state_VFF.get("state"), self.valve_state_VPI.get("state"), self.valve_state_VCR.get("state"), self.valve_state_VCB.get("state"), self.valve_state_VCD.get("state"), - self.valve_state_VFB.get("state"), + self.valve_state_VROD.get("state"), + self.valve_state_SPP.get("state") ] @staticmethod @@ -150,7 +152,8 @@ "valve_state_VCR", "valve_state_VCB", "valve_state_VCD", - "valve_state_VFB", + "valve_state_VROD", + "valve_state_SPP" "valve_states_enum" ]) def _handler_valves_sync(self, message, timestamp=0.0): @@ -165,13 +168,14 @@ self.valve_states_all = vst[0] # Extract each valve state from U16 valves states using bit-masking self.valve_state_VWI["state"] = self._binary_to_valve_state(vst[0] & 1) - self.valve_state_VROD["state"] = self._binary_to_valve_state(vst[0] & 2) + self.valve_state_VFB["state"] = self._binary_to_valve_state(vst[0] & 2) self.valve_state_VFF["state"] = self._binary_to_valve_state(vst[0] & 4) self.valve_state_VPI["state"] = self._binary_to_valve_state(vst[0] & 8) self.valve_state_VCR["state"] = self._binary_to_valve_state(vst[0] & 16) self.valve_state_VCB["state"] = self._binary_to_valve_state(vst[0] & 32) self.valve_state_VCD["state"] = self._binary_to_valve_state(vst[0] & 64) - self.valve_state_VFB["state"] = self._binary_to_valve_state(vst[0] & 128) + self.valve_state_VROD["state"] = self._binary_to_valve_state(vst[0] & 128) + self.valve_state_SPP["state"] = self._binary_to_valve_state(vst[0] & 256) start = self.END_POS_VALVES_STATES end = start + 1