Index: tests/dg_heaters_test.py =================================================================== diff -u -r4bdb012848d1b59be5edc31d677b77b9d95f6190 -rdd42e4d9cfe821b0a755ccc86cc1a4a2a3dd2f37 --- tests/dg_heaters_test.py (.../dg_heaters_test.py) (revision 4bdb012848d1b59be5edc31d677b77b9d95f6190) +++ tests/dg_heaters_test.py (.../dg_heaters_test.py) (revision dd42e4d9cfe821b0a755ccc86cc1a4a2a3dd2f37) @@ -30,48 +30,48 @@ """ - dg.ro_pump.cmd_ro_pump_set_point_override(120) + hd.ro_pump.cmd_ro_pump_set_point_override(120) - dg.heaters.cmd_set_dialysate_target_temperature() + hd.heaters.cmd_set_dialysate_target_temperature() sleep(1) - #dg.heaters.cmd_start_primary_heater() + #hd.heaters.cmd_start_primary_heater() #sleep(1) - dg.heaters.cmd_start_trimmer_heater() + hd.heaters.cmd_start_trimmer_heater() sleep(1) - #dg.heaters.cmd_heaters_broadcast_interval_override(200) - #dg.temperature_sensors.cmd_temperature_sensors_override_value(0, 125.0, reset=1) - #dg.temperature_sensors.cmd_temperature_sensors_broadcast_interval_override(200, reset=1) + #hd.heaters.cmd_heaters_broadcast_interval_override(200) + #hd.temperature_sensors.cmd_temperature_sensors_override_value(0, 125.0, reset=1) + #hd.temperature_sensors.cmd_temperature_sensors_broadcast_interval_override(200, reset=1) - #dg.ro_pump.cmd_ro_flow_rate_override(0.46) + #hd.ro_pump.cmd_ro_flow_rate_override(0.46) while True: - print("TPi: {}, TPo: {}, TD1: {}, TD2: {}, TRo: {}, TDi: {}".format(dg.temperature_sensors.inlet_primary, - dg.temperature_sensors.outlet_primary, - dg.temperature_sensors.cd1, - dg.temperature_sensors.cd2, - dg.temperature_sensors.outlet_redundancy, - dg.temperature_sensors.inlet_dialysate)) - #print("Main Primary Heater DC: {}".format(dg.heaters.mainPrimaryHeaterPWM)) - #print("Small Primary Heater DC: {}".format(dg.heaters.smallPrimaryHeaterPWM)) - #print("Trimmer Heater DC: {}".format(dg.heaters.trimmerHeaterPWM)) + print("TPi: {}, TPo: {}, TD1: {}, TD2: {}, TRo: {}, TDi: {}".format(hd.temperature_sensors.inlet_primary, + hd.temperature_sensors.outlet_primary, + hd.temperature_sensors.cd1, + hd.temperature_sensors.cd2, + hd.temperature_sensors.outlet_redundancy, + hd.temperature_sensors.inlet_dialysate)) + #print("Main Primary Heater DC: {}".format(hd.heaters.mainPrimaryHeaterPWM)) + #print("Small Primary Heater DC: {}".format(hd.heaters.smallPrimaryHeaterPWM)) + #print("Trimmer Heater DC: {}".format(hd.heaters.trimmerHeaterPWM)) sleep(1) counter = counter + 1 if counter > 60: #print(counter) break - dg.heaters.cmd_stop_trimmer_heater() - #dg.heaters.cmd_stop_primary_heater() + hd.heaters.cmd_stop_trimmer_heater() + #hd.heaters.cmd_stop_primary_heater() sleep(1) while True: - print("Main Primary Heater DC: {}".format(dg.heaters.mainPrimaryHeaterPWM)) - print("Small Primary Heater DC: {}".format(dg.heaters.smallPrimaryHeaterPWM)) - print("Trimmer Heater DC: {}".format(dg.heaters.trimmerHeaterPWM)) + print("Main Primary Heater DC: {}".format(hd.heaters.mainPrimaryHeaterPWM)) + print("Small Primary Heater DC: {}".format(hd.heaters.smallPrimaryHeaterPWM)) + print("Trimmer Heater DC: {}".format(hd.heaters.trimmerHeaterPWM)) sleep(0.7) """