Index: leahi_dialin/fp/modules/valves.py =================================================================== diff -u -rfe37f0a0f2c683696f41f6a349cf2756ed09d5d7 -rd1bbff05fad252fc401b1389d53f8d1f515f882a --- leahi_dialin/fp/modules/valves.py (.../valves.py) (revision fe37f0a0f2c683696f41f6a349cf2756ed09d5d7) +++ leahi_dialin/fp/modules/valves.py (.../valves.py) (revision d1bbff05fad252fc401b1389d53f8d1f515f882a) @@ -46,8 +46,6 @@ P33_VALV = 4 # Valve (P33 VCr) P34_VALV = 5 # Valve (P34 VCb) P37_VALV = 6 # Valve (P37 VCd) - M7_VALV = 7 # Valve (M7 VFB) - P20_VALV = 8 # Valve (P20 SPP) class FPValves(AbstractSubSystem): """ @@ -83,8 +81,6 @@ 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.m7_valv = {"id": FPValveNames.M7_VALV.value, "state": DEENERGIZED} - self.p20_valv = {"id": FPValveNames.P20_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. @@ -107,8 +103,6 @@ self.p33_valv.get("state"), self.p34_valv.get("state"), self.p37_valv.get("state"), - self.m7_valv.get("state"), - self.p20_valv.get("state") ] @staticmethod @@ -151,8 +145,6 @@ "p33_valv", "p34_valv", "p37_valv", - "m7_valv", - "p20_valv", "valve_states_enum" ]) def _handler_valves_sync(self, message, timestamp=0.0): @@ -173,8 +165,6 @@ 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.m7_valv["state"] = self._binary_to_valve_state(vst[0] & 128) - self.p20_valv["state"] = self._binary_to_valve_state(vst[0] & 256) start = self.END_POS_VALVES_STATES end = start + 1