Index: leahi_dialin/fp/modules/valves.py =================================================================== diff -u -re5ca0f1169fc78f5a753c9ca487e30db41d65484 -reb67b89430884617a0762dea8bdd4eec859809e2 --- leahi_dialin/fp/modules/valves.py (.../valves.py) (revision e5ca0f1169fc78f5a753c9ca487e30db41d65484) +++ leahi_dialin/fp/modules/valves.py (.../valves.py) (revision eb67b89430884617a0762dea8bdd4eec859809e2) @@ -40,12 +40,16 @@ @unique class FPValveNames(DialinEnum): M4_VALV = 0 # Valve (M4 VWi) - P39_VALV = 1 # Valve (P39 VROd) + M7_VALV = 1 # Valve (M7) P6_VALV = 2 # Valve (P6 VFF) P11_VALV = 3 # Valve (P11 VPi) P33_VALV = 4 # Valve (P33 VCr) P34_VALV = 5 # Valve (P34 VCb) P37_VALV = 6 # Valve (P37 VCd) + P39_VALV = 7 # Valve (P39 VROd) + P20_VALV = 8 # Valve (P20) + P43_VALV = 9 # Valve (P43) + NUM_OF_VALVES = 10 # Number of valves class FPValves(AbstractSubSystem): """ @@ -75,15 +79,17 @@ self.valve_states_all = 0x0000 self.m4_valv = {"id": FPValveNames.M4_VALV.value, "state": DEENERGIZED} - self.p39_valv = {"id": FPValveNames.P39_VALV.value, "state": DEENERGIZED} + self.m7_valv = {"id": FPValveNames.M7_VALV.value, "state": DEENERGIZED} self.p6_valv = {"id": FPValveNames.P6_VALV.value, "state": DEENERGIZED} self.p11_valv = {"id": FPValveNames.P11_VALV.value, "state": DEENERGIZED} self.p33_valv = {"id": FPValveNames.P33_VALV.value, "state": DEENERGIZED} self.p34_valv = {"id": FPValveNames.P34_VALV.value, "state": DEENERGIZED} self.p37_valv = {"id": FPValveNames.P37_VALV.value, "state": DEENERGIZED} + self.p39_valv = {"id": FPValveNames.P39_VALV.value, "state": DEENERGIZED} + self.p20_valv = {"id": FPValveNames.P20_VALV.value, "state": DEENERGIZED} + self.p43_valv = {"id": FPValveNames.P43_VALV.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. + # NOTE: The len function counts the enums with the same number only once. self.valve_states_enum = [0 for _ in range(len(FPValveNames))] for valve in FPValveNames.__members__: @@ -97,12 +103,15 @@ """ return [ self.m4_valv.get("state"), - self.p39_valv.get("state"), + self.m7_valv.get("state"), self.p6_valv.get("state"), self.p11_valv.get("state"), self.p33_valv.get("state"), self.p34_valv.get("state"), self.p37_valv.get("state"), + self.p39_valv.get("state"), + self.p20_valv.get("state"), + self.p43_valv.get("state") ] @staticmethod @@ -139,12 +148,15 @@ "fp_valves_states_timestamp", "valve_states_all", "m4_valv", - "p39_valv", + "m7_valv", "p6_valv", "p11_valv", "p33_valv", "p34_valv", "p37_valv", + "p39_valv", + "p20_valv", + "p43_valv", "valve_states_enum" ]) def _handler_valves_sync(self, message, timestamp=0.0): @@ -159,13 +171,17 @@ self.valve_states_all = vst[0] # Extract each valve state from U16 valves states using bit-masking self.m4_valv["state"] = self._binary_to_valve_state(vst[0] & 1) - self.p39_valv["state"] = self._binary_to_valve_state(vst[0] & 2) + self.m7_valv["state"] = self._binary_to_valve_state(vst[0] & 2) self.p6_valv["state"] = self._binary_to_valve_state(vst[0] & 4) self.p11_valv["state"] = self._binary_to_valve_state(vst[0] & 8) self.p33_valv["state"] = self._binary_to_valve_state(vst[0] & 16) self.p34_valv["state"] = self._binary_to_valve_state(vst[0] & 32) self.p37_valv["state"] = self._binary_to_valve_state(vst[0] & 64) + self.p39_valv["state"] = self._binary_to_valve_state(vst[0] & 128) + self.p20_valv["state"] = self._binary_to_valve_state(vst[0] & 256) + self.p43_valv["state"] = self._binary_to_valve_state(vst[0] & 512) + start = self.END_POS_VALVES_STATES end = start + 1 for valve_id in self.valves_sensed_states: