Index: dialin/dg/valves.py =================================================================== diff -u -r8be7632468ade06a758d5ec8c6bd43ad49c4fd0c -r0ddc890d792da89bcea0237f349d3a9185b411a3 --- dialin/dg/valves.py (.../valves.py) (revision 8be7632468ade06a758d5ec8c6bd43ad49c4fd0c) +++ dialin/dg/valves.py (.../valves.py) (revision 0ddc890d792da89bcea0237f349d3a9185b411a3) @@ -70,6 +70,7 @@ msg_id = self.MSG_ID_DG_VALVES_STATES self.can_interface.register_receiving_publication_function(channel_id, msg_id, self.handler_valves_sync) + self.valve_states_all = 0x0000 self.valve_state_VRF = DEENERGIZED self.valve_state_VRI = DEENERGIZED self.valve_state_VRD = DEENERGIZED @@ -99,7 +100,7 @@ """ 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_VRF = self.binary_to_valve_state(vst[0] & 0x0001) self.valve_state_VRI = self.binary_to_valve_state(vst[0] & 0x0002) Index: tests/uf_test.py =================================================================== diff -u -r55fd0b9d7fffc7f915da25c2a3e274e426739aa5 -r0ddc890d792da89bcea0237f349d3a9185b411a3 --- tests/uf_test.py (.../uf_test.py) (revision 55fd0b9d7fffc7f915da25c2a3e274e426739aa5) +++ tests/uf_test.py (.../uf_test.py) (revision 0ddc890d792da89bcea0237f349d3a9185b411a3) @@ -73,6 +73,7 @@ ", ROo, " + '{:8.1f}'.format(dg.pressures.ro_pump_outlet_pressure) + \ ", DRi, " + '{:8.1f}'.format(dg.pressures.drain_pump_inlet_pressure) + \ ", DRo, " + '{:8.1f}'.format(dg.pressures.drain_pump_outlet_pressure) + valves = ", Vlv, " + '{:4X}'.format(dg.valves.valve_states_all) alarms = ", AL.s, " + hd.alarms.getCurrentAlarmsState() + \ ", AL.t, " + '{:4d}'.format(hd.alarms.alarm_top) @@ -84,6 +85,8 @@ f.write(loadCells) f.write(ultraFilt) f.write(dgPres) + f.write(valves) + f.write(alarms) f.write("\n") # print to console @@ -94,7 +97,7 @@ print(" Load Cells: "+loadCells) print("Ultrafiltration: "+ultraFilt) print(" DG Pressures: "+dgPres) + print(" DG Valves: "+valves) + print(" Alarms: "+alarms) -# exit(1) -