Index: tests/dg_valves_test.py =================================================================== diff -u -r49f99c3f4a045652f1a32ad24a47fc1710ebc352 -re7bfc1b61892db0518f21a1bfde98e0400e83ab3 --- tests/dg_valves_test.py (.../dg_valves_test.py) (revision 49f99c3f4a045652f1a32ad24a47fc1710ebc352) +++ tests/dg_valves_test.py (.../dg_valves_test.py) (revision e7bfc1b61892db0518f21a1bfde98e0400e83ab3) @@ -36,19 +36,19 @@ # Collect DG valves states while True: sleep(1) - valvesStates = "DGValves.VBF," + str(dg.valves.valve_state_VRF) + \ - ",DGValves.VDR," + str(dg.valves.valve_state_VRI) + \ - ",DGValves.VDR," + str(dg.valves.valve_state_VRD) + \ - ",DGValves.VDR," + str(dg.valves.valve_state_VRO) + \ - ",DGValves.VDR," + str(dg.valves.valve_state_VPO) + \ - ",DGValves.VDR," + str(dg.valves.valve_state_VBF) + \ - ",DGValves.VDR," + str(dg.valves.valve_state_VRC) + \ - ",DGValves.VDR," + str(dg.valves.valve_state_VDR) + \ - ",DGValves.VDR," + str(dg.valves.valve_state_VPI) + \ - ",DGValves.VDR," + str(dg.valves.valve_state_VSP) + \ - ",DGValves.VDR," + str(dg.valves.valve_state_VR1) + \ - ",DGValves.VDR," + str(dg.valves.valve_state_VR2) + \ - ",DGValves.VDR," + str(dg.valves.valve_state_VPD) + valvesStates = "DGValves.VBF," + str(dg.valves.valve_state_VRF.get("state", None)) + \ + ",DGValves.VRI," + str(dg.valves.valve_state_VRI.get("state", None)) + \ + ",DGValves.VRD," + str(dg.valves.valve_state_VRD.get("state", None)) + \ + ",DGValves.VRO," + str(dg.valves.valve_state_VRO.get("state", None)) + \ + ",DGValves.VPO," + str(dg.valves.valve_state_VPO.get("state", None)) + \ + ",DGValves.VBF," + str(dg.valves.valve_state_VBF.get("state", None)) + \ + ",DGValves.VRC," + str(dg.valves.valve_state_VRC.get("state", None)) + \ + ",DGValves.VDR," + str(dg.valves.valve_state_VDR.get("state", None)) + \ + ",DGValves.VPI," + str(dg.valves.valve_state_VPI.get("state", None)) + \ + ",DGValves.VSP," + str(dg.valves.valve_state_VSP.get("state", None)) + \ + ",DGValves.VR1," + str(dg.valves.valve_state_VR1.get("state", None)) + \ + ",DGValves.VR2," + str(dg.valves.valve_state_VR2.get("state", None)) + \ + ",DGValves.VPD," + str(dg.valves.valve_state_VPD.get("state", None)) # Log data f.write(valvesStates)