Index: leahi_dialin/dd/modules/valves.py =================================================================== diff -u -r6fa8a72c463310fd943270135aebfcb10d7a1210 -ra0e7107b30e4d6fc631784e249f59038aefeb04f --- leahi_dialin/dd/modules/valves.py (.../valves.py) (revision 6fa8a72c463310fd943270135aebfcb10d7a1210) +++ leahi_dialin/dd/modules/valves.py (.../valves.py) (revision a0e7107b30e4d6fc631784e249f59038aefeb04f) @@ -43,8 +43,6 @@ END_POS_VALVES_STATES = START_POS_VALVES_STATES + 2 # Valves States come in as a U16 value (2 bytes) START_POS_BCV_VALVES_STATES = END_POS_VALVES_STATES END_POS_BCV_VALVES_STATES = START_POS_BCV_VALVES_STATES + 1 - START_POS_UFI_VALVES_STATES = END_POS_BCV_VALVES_STATES - END_POS_UFI_VALVES_STATES = START_POS_UFI_VALVES_STATES + 1 END_POS_ALL_VALVES = START_POS_VALVES_STATES + 4 def __init__(self, can_interface, logger: Logger): @@ -70,17 +68,17 @@ self.d8_valv = {"id": DDValveNames.D8_VALV.value, "state": DEENERGIZED} self.d54_valv = {"id": DDValveNames.D54_VALV.value, "state": DEENERGIZED} self.d53_valv = {"id": DDValveNames.D53_VALV.value, "state": DEENERGIZED} - self.d65_valv = {"id": DDValveNames.D65_VALV.value, "state": DEENERGIZED} + self.d34_valv = {"id": DDValveNames.D34_VALV.value, "state": DEENERGIZED} self.d64_valv = {"id": DDValveNames.D64_VALV.value, "state": DEENERGIZED} self.d31_valv = {"id": DDValveNames.D31_VALV.value, "state": DEENERGIZED} - self.d34_valv = {"id": DDValveNames.D34_VALV.value, "state": DEENERGIZED} + self.d65_valv = {"id": DDValveNames.D65_VALV.value, "state": DEENERGIZED} self.d35_valv = {"id": DDValveNames.D35_VALV.value, "state": DEENERGIZED} self.d40_valv = {"id": DDValveNames.D40_VALV.value, "state": DEENERGIZED} self.d47_valv = {"id": DDValveNames.D47_VALV.value, "state": DEENERGIZED} self.d3_valv = {"id": DDValveNames.D3_VALV.value, "state": DEENERGIZED} - self.m4_valv = {"id": DDValveNames.M4_VALV.value, "state": DEENERGIZED} + self.d80_valv = {"id": DDValveNames.D80_VALV.value, "state": DEENERGIZED} + self.d81_valv = {"id": DDValveNames.D81_VALV.value, "state": DEENERGIZED} self.rsvrd1 = {"id": DDValveNames.RSRVD_SPACE1.value, "state": DEENERGIZED} - self.rsvrd2 = {"id": DDValveNames.RSRVD_SPACE2.value, "state": DEENERGIZED} self.d23_valv = {"id": DDValveNames.D23_VALV.value, "state": DEENERGIZED} self.d19_valv = {"id": DDValveNames.D19_VALV.value, "state": DEENERGIZED} @@ -91,12 +89,6 @@ self.d21_valv = {"id": DDValveNames.D21_VALV.value, "state": DEENERGIZED} self.d22_valv = {"id": DDValveNames.D22_VALV.value, "state": DEENERGIZED} - self.d69_valv = {"id": DDValveNames.D69_VALV.value, "state": DEENERGIZED} - self.d71_valv = {"id": DDValveNames.D71_VALV.value, "state": DEENERGIZED} - self.d70_valv = {"id": DDValveNames.D70_VALV.value, "state": DEENERGIZED} - self.d72_valv = {"id": DDValveNames.D72_VALV.value, "state": DEENERGIZED} - - # NOTE: The len function counts the enums with the same number only once. This is not the case in the DD valves # class because each valve must have a unique ID. self.valve_states_enum = [0 for _ in range(len(DDValveNames))] @@ -116,29 +108,26 @@ self.d8_valv.get("state", None), self.d54_valv.get("state", None), self.d53_valv.get("state", None), - self.d65_valv.get("state", None), + self.d34_valv.get("state", None), self.d64_valv.get("state", None), self.d31_valv.get("state", None), - self.d34_valv.get("state", None), + self.d65_valv.get("state", None), self.d35_valv.get("state", None), self.d40_valv.get("state", None), self.d47_valv.get("state", None), self.d3_valv.get("state", None), - self.m4_valv.get("state", None), + self.d80_valv.get("state", None), + self.d81_valv.get("state", None), self.rsvrd1.get("state", None), - self.rsvrd2.get("state", None), + self.d23_valv.get("state", None), self.d19_valv.get("state", None), self.d25_valv.get("state", None), self.d26_valv.get("state", None), self.d24_valv.get("state", None), self.d20_valv.get("state", None), self.d21_valv.get("state", None), - self.d22_valv.get("state", None), - self.d69_valv.get("state", None), - self.d71_valv.get("state", None), - self.d70_valv.get("state", None), - self.d72_valv.get("state", None) + self.d22_valv.get("state", None) ] @staticmethod @@ -179,17 +168,17 @@ "d8_valv", "d54_valv", "d53_valv", - "d65_valv", + "d34_valv", "d64_valv", "d31_valv", - "d34_valv", + "d65_valv", "d35_valv", "d40_valv", "d47_valv", "d3_valv", - "m4_valv", + "d80_valv", + "d81_valv", "rsvrd1", - "rsvrd2", "d23_valv", "d19_valv", "d25_valv", @@ -198,10 +187,6 @@ "d20_valv", "d21_valv", "d22_valv", - "d69_valv", - "d71_valv", - "d70_valv", - "d72_valv", "valve_states_enum" ]) def _handler_valves_sync(self, message, timestamp=0.0): @@ -230,9 +215,9 @@ self.d40_valv["state"] = self._binary_to_valve_state(vst[0] & 1024) self.d47_valv["state"] = self._binary_to_valve_state(vst[0] & 2048) self.d3_valv["state"] = self._binary_to_valve_state(vst[0] & 4096) - self.m4_valv["state"] = self._binary_to_valve_state(vst[0] & 8192) - self.rsvrd1["state"] = self._binary_to_valve_state(vst[0] & 16384) - self.rsvrd2["state"] = self._binary_to_valve_state(vst[0] & 32768) + self.d80_valv["state"] = self._binary_to_valve_state(vst[0] & 8192) + self.d81_valv["state"] = self._binary_to_valve_state(vst[0] & 16384) + self.rsvrd1["state"] = self._binary_to_valve_state(vst[0] & 32768) bcv = struct.unpack('B', bytearray(message['message'][self.START_POS_BCV_VALVES_STATES:self.END_POS_BCV_VALVES_STATES])) self.d23_valv["state"] = self._binary_to_valve_state(bcv[0] & 1) @@ -244,13 +229,7 @@ self.d21_valv["state"] = self._binary_to_valve_state(bcv[0] & 64) self.d22_valv["state"] = self._binary_to_valve_state(bcv[0] & 128) - ufi = struct.unpack('B', bytearray(message['message'][self.START_POS_UFI_VALVES_STATES:self.END_POS_UFI_VALVES_STATES])) - self.d69_valv["state"] = self._binary_to_valve_state(ufi[0] & 1) - self.d69_valv["state"] = self._binary_to_valve_state(ufi[0] & 2) - self.d70_valv["state"] = self._binary_to_valve_state(ufi[0] & 4) - self.d72_valv["state"] = self._binary_to_valve_state(ufi[0] & 8) - - start = self.END_POS_UFI_VALVES_STATES + start = self.END_POS_BCV_VALVES_STATES end = start + 1 for valve_id in self.valves_sensed_states: valve_state_number = struct.unpack('B', bytearray(message['message'][start:end]))[0]