Index: tests/dg_tests.py
===================================================================
diff -u -reb7bd89610aaeb4b91ecae03e276ca176d8ff808 -r63b4319afbaac8d4e6df4eb62978d201d81bd6e8
--- tests/dg_tests.py	(.../dg_tests.py)	(revision eb7bd89610aaeb4b91ecae03e276ca176d8ff808)
+++ tests/dg_tests.py	(.../dg_tests.py)	(revision 63b4319afbaac8d4e6df4eb62978d201d81bd6e8)
@@ -133,11 +133,6 @@
 
 
 def get_dg_run_info():
-    # info = ('DG_op_mode, {}, DG_sub_mode, {}, Op, {}, Sub, {}, '.format(DGOperationModes(dg.dg_operation_mode).name,
-    #                                                                 dg.dg_operation_sub_mode,
-    #                                                                 dg.events.get_dg_events(DGEventList(1).value, 3),
-    #                                                                 dg.events.get_dg_events(DGEventList(2).value, 3)))
-
     info = ('DG_op_mode, {}, DG_op_mode_num, {}, DG_sub_mode, {}, '.format(DGOperationModes(dg.dg_operation_mode).name,
                                                                            dg.dg_operation_mode,
                                                                            dg.dg_operation_sub_mode))
@@ -146,7 +141,7 @@
 
 def get_dg_valves_states():
     info = ('VPi, {}, VSP, {}, VPd, {}, VBf, {}, VPo, {}, VDr, {}, VRc, {}, VRo, {}, VRd, {}, VRi, {}, VRf, {}, '
-            'VRD1, {}, VRD2, {}, '
+            'VRD1, {}, VRD2, {}, All, {}, '
             .format(dg.valves.valve_states_enum[dg.valves.VALVE_PRESSURE_INLET],
                     dg.valves.valve_states_enum[dg.valves.VALVE_SAMPLING_PORT],
                     dg.valves.valve_states_enum[dg.valves.VALVE_PRODUCTION_DRAIN],
@@ -159,17 +154,19 @@
                     dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_INLET],
                     dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_FILL],
                     dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_1],
-                    dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_2]))
+                    dg.valves.valve_states_enum[dg.valves.VALVE_RESERVOIR_DRAIN_2],
+                    dg.valves.valves_sensed_states))
     return info
 
 
 def get_drain_states_info():
-    info = ('Drain, {}, DAC, {}, Tgt_RPM, {}, Curr_RPM, {}, PRd, {:5.3f}, PDr, {:5.3f}, Drain_curr_A, {:5.3f}, '
-            'Drain_dir, {}, '
+    info = ('Drain, {}, DAC, {}, Tgt_RPM, {}, Curr_RPM, {}, PRd, {:5.3f}, PDr, {:5.3f}, Baro, {:5.3f}, '
+            'Drain_curr_A, {:5.3f}, Drain_dir, {}, '
             .format(DrainPumpStates(dg.drain_pump.drain_pump_state).name, dg.drain_pump.dac_value,
                     dg.drain_pump.target_drain_pump_rpm, dg.drain_pump.current_drain_pump_rpm,
                     dg.pressures.drain_pump_inlet_pressure, dg.pressures.drain_pump_outlet_pressure,
-                    dg.drain_pump.drain_pump_current_A, dg.drain_pump.drain_pump_direction))
+                    dg.pressures.barometric_pressure, dg.drain_pump.drain_pump_current_A,
+                    dg.drain_pump.drain_pump_direction))
     return info
 
 
@@ -220,13 +217,15 @@
 
 def get_temperature_sensors_info():
     info = ('TPi, {:5.3f}, THd, {:5.3f}, TPo, {:5.3f}, TD1, {:5.3f}, TD2, {:5.3f}, TRo, {:5.3f}, TDi, {:5.3f}, '
+            'Baro_temp, {:5.3f}, '
             .format(dg.temperatures.temperatures[DGTemperaturesNames.INLET_PRIMARY_HEATER.name],
                     dg.temperatures.temperatures[DGTemperaturesNames.HEAT_DISINFECT.name],
                     dg.temperatures.temperatures[DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name],
                     dg.temperatures.temperatures[DGTemperaturesNames.CONDUCTIVITY_SENSOR_1.name],
                     dg.temperatures.temperatures[DGTemperaturesNames.CONDUCTIVITY_SENSOR_2.name],
                     dg.temperatures.temperatures[DGTemperaturesNames.OUTLET_DIALYSATE_REDUNDANT.name],
-                    dg.temperatures.temperatures[DGTemperaturesNames.INLET_DIALYSATE.name]))
+                    dg.temperatures.temperatures[DGTemperaturesNames.INLET_DIALYSATE.name],
+                    dg.temperatures.temperatures[DGTemperaturesNames.BARO_TEMP_SENSOR.name]))
     return info
 
 
@@ -730,16 +729,16 @@
     #    print(get_heaters_info())
     #    sleep(1)
 
-    #dg.ro_pump.cmd_set_ro_flow_rate(0.6)
-
     #dg.flow_sensors.cmd_measured_flow_sensor_value_lpm_override(1, 0.8, reset=1)
 
-    #while True:
+    #dg.heaters.cmd_set_primary_and_trimmer_heaters_target_temperature(primary_target_temp=40, trimmer_target_temp=52)
+    #sleep(1)
+    #dg.heaters.cmd_start_stop_trimmer_heater(0)
 
-    #    print(get_ro_info())
-    #    sleep(1)
+    dg.valves.cmd_valve_sensed_state_override(4, 1, reset=0)
 
-    dg.heaters.cmd_set_primary_and_trimmer_heaters_target_temperature(primary_target_temp=40, trimmer_target_temp=52)
-    sleep(1)
-    dg.heaters.cmd_start_stop_trimmer_heater(0)
+    while True:
+        print(get_dg_valves_states())
+        sleep(1)
 
+