Index: leahi_dialin/ro/modules/valves.py =================================================================== diff -u -r2d30541da683c31d280ec600dbce1225b1676223 -r7ae7087e830140ab07b841b2c0ff437269a5fc2f --- leahi_dialin/ro/modules/valves.py (.../valves.py) (revision 2d30541da683c31d280ec600dbce1225b1676223) +++ leahi_dialin/ro/modules/valves.py (.../valves.py) (revision 7ae7087e830140ab07b841b2c0ff437269a5fc2f) @@ -39,20 +39,19 @@ @unique class ROValveNames(DialinEnum): - 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) + M4_VWI = 0 # Valve (M4 VWi) + P39_VROD = 1 # Valve (P39 VROd) + P6_VFF = 2 # Valve (P6 VFF) + P11_VPI = 3 # Valve (P11 VPi) + P33_VCR = 4 # Valve (P33 VCr) + P34_VCB = 5 # Valve (P34 VCb) + P37_VCD = 6 # Valve (P37 VCd) + M7_VFB = 7 # Valve (M7 VFB) + P20_SPP = 8 # Valve (P20 SPP) class ROValves(AbstractSubSystem): """ - Reverse Osmosis (RO) interface for valve related commands. - + Dialin API sub-class for RO valve related commands. """ # Valves states publish message field positions @@ -77,15 +76,15 @@ self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_valves_sync) self.valve_states_all = 0x0000 - self.valve_state_VWI = {"id": ROValveNames.VWI.value, "state": DEENERGIZED} - self.valve_state_VFB = {"id": ROValveNames.VFB.value, "state": DEENERGIZED} - self.valve_state_VFF = {"id": ROValveNames.VFF.value, "state": DEENERGIZED} - self.valve_state_VPI = {"id": ROValveNames.VPI.value, "state": DEENERGIZED} - self.valve_state_VCR = {"id": ROValveNames.VCR.value, "state": DEENERGIZED} - 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} + self.m4_vwi_state= {"id": ROValveNames.M4_VWI.value, "state": DEENERGIZED} + self.p39_vrod_state = {"id": ROValveNames.P39_VROD.value, "state": DEENERGIZED} + self.p6_vff_state = {"id": ROValveNames.P6_VFF.value, "state": DEENERGIZED} + self.p11_vpi_state = {"id": ROValveNames.P11_VPI.value, "state": DEENERGIZED} + self.p33_vcr_state = {"id": ROValveNames.P33_VCR.value, "state": DEENERGIZED} + self.p34_vcb_state = {"id": ROValveNames.P34_VCB.value, "state": DEENERGIZED} + self.p37_vcd_state = {"id": ROValveNames.P37_VCD.value, "state": DEENERGIZED} + self.m7_vfb_state = {"id": ROValveNames.M7_VFB.value, "state": DEENERGIZED} + self.p20_spp_state = {"id": ROValveNames.P20_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. @@ -101,15 +100,15 @@ @return: All valve states """ return [ - self.valve_state_VWI.get("state"), - self.valve_state_VROD.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_SPP.get("state") + self.m4_vwi_state.get("state"), + self.p39_vrod_state.get("state"), + self.p6_vff_state.get("state"), + self.p11_vpi_state.get("state"), + self.p33_vcr_state.get("state"), + self.p34_vcb_state.get("state"), + self.p37_vcd_state.get("state"), + self.m7_vfb_state.get("state"), + self.p20_spp_state.get("state") ] @staticmethod @@ -145,37 +144,37 @@ @publish([ "ro_valves_states_timestamp", "valve_states_all", - "valve_state_VWI", - "valve_state_VFB", - "valve_state_VFF", - "valve_state_VPI", - "valve_state_VCR", - "valve_state_VCB", - "valve_state_VCD", - "valve_state_VROD", - "valve_state_SPP", + "m4_vwi_state", + "p39_vrod_state", + "p6_vff_state", + "p11_vpi_state", + "p33_vcr_state", + "p34_vcb_state", + "p37_vcd_state", + "m7_vfb_state", + "p20_spp_state", "valve_states_enum" ]) def _handler_valves_sync(self, message, timestamp=0.0): """ - Handles published valves states message. + Handles published RO valves states message. - @param message: published valves states message + @param message: published RO valves states message @return: none """ vst = struct.unpack('H', bytearray(message['message'][self.START_POS_VALVES_STATES:self.END_POS_VALVES_STATES])) 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_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_SPP["state"] = self._binary_to_valve_state(vst[0] & 256) + self.m4_vwi_state["state"] = self._binary_to_valve_state(vst[0] & 1) + self.p39_vrod_state["state"] = self._binary_to_valve_state(vst[0] & 2) + self.p6_vff_state["state"] = self._binary_to_valve_state(vst[0] & 4) + self.p11_vpi_state["state"] = self._binary_to_valve_state(vst[0] & 8) + self.p33_vcr_state["state"] = self._binary_to_valve_state(vst[0] & 16) + self.p34_vcb_state["state"] = self._binary_to_valve_state(vst[0] & 32) + self.p37_vcd_state["state"] = self._binary_to_valve_state(vst[0] & 64) + self.m7_vfb_state["state"] = self._binary_to_valve_state(vst[0] & 128) + self.p20_spp_state["state"] = self._binary_to_valve_state(vst[0] & 256) start = self.END_POS_VALVES_STATES end = start + 1 @@ -191,7 +190,7 @@ """ Constructs and sends the valve sensed state override command. Constraints: - Must be logged into DG. + Must be logged into RO. Given valve ID must be one of the valve IDs listed below. @param valve: unsigned int - valve ID @@ -224,7 +223,7 @@ def cmd_valve_override(self, valve: int, state: int, reset: int = NO_RESET) -> int: """ - Constructs and sends the valve state override command. + Constructs and sends the RO valve state override command. Constraints: Must be logged into RO. Given valve ID must be one of the valve IDs listed below. @@ -261,8 +260,8 @@ """ Constructs and sends the valve state override command. Constraints: - Must be logged into DG. - Given interval must be non-zero and a multiple of the DG general task interval (50 ms). + Must be logged into RO. + Given interval must be non-zero and a multiple of the RO general task interval (50 ms). @param ms: unsigned int - broadcast interval (in ms) @param reset: integer - 1 to reset a previous override, 0 to override @@ -281,7 +280,7 @@ message_id=MsgIds.MSG_ID_RO_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, payload=payload) - self.logger.debug("override valves states publish interval") + self.logger.debug("override RO valves states publish interval") # Send message received_message = self.can_interface.send(message)