Index: tests/test_dg_calibration.py =================================================================== diff -u -ra26b886c2bbe75c1292afa150a63d1d9b8026b3b -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f --- tests/test_dg_calibration.py (.../test_dg_calibration.py) (revision a26b886c2bbe75c1292afa150a63d1d9b8026b3b) +++ tests/test_dg_calibration.py (.../test_dg_calibration.py) (revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f) @@ -12,7 +12,7 @@ if dg.cmd_log_in_to_dg() == 0: exit(1) sleep(2) - cal = dg.calibration + cal = dg.calibration_record f = open("DG_Calibration.log", "w") @@ -21,22 +21,22 @@ status = False - cal.dg_calibration_record['pumps']['concentrate_1']['step_speed_2_flow_ratio'][1] = 34.2 - cal.dg_calibration_record['pumps']['drain']['cal_time'][1] = 96321 - cal.dg_calibration_record['pumps']['ro']['gain_3_ratio'][1] = 45.69 - cal.dg_calibration_record['volumes']['drain_line']['volume'][1] = 125.8 - cal.dg_calibration_record['volumes']['drain_line']['crc'][1] = 78 - cal.dg_calibration_record['volumes']['pre_ro_purge']['volume'][1] = 125.8 - cal.dg_calibration_record['volumes']['reservoir_1']['max_residual_fluid'][1] = 85.36 - cal.dg_calibration_record['bicarb_concentrates']['bicarb_conc_3']['reserved_space'][1] = 85.36 - cal.dg_calibration_record['fans']['fan_2']['reserved_space_2'][1] = 456.25 + cal.hd_calibration_record['pumps']['concentrate_1']['step_speed_2_flow_ratio'][1] = 34.2 + cal.hd_calibration_record['pumps']['drain']['cal_time'][1] = 96321 + cal.hd_calibration_record['pumps']['ro']['gain_3_ratio'][1] = 45.69 + cal.hd_calibration_record['volumes']['drain_line']['volume'][1] = 125.8 + cal.hd_calibration_record['volumes']['drain_line']['crc'][1] = 78 + cal.hd_calibration_record['volumes']['pre_ro_purge']['volume'][1] = 125.8 + cal.hd_calibration_record['volumes']['reservoir_1']['max_residual_fluid'][1] = 85.36 + cal.hd_calibration_record['bicarb_concentrates']['bicarb_conc_3']['reserved_space'][1] = 85.36 + cal.hd_calibration_record['fans']['fan_2']['reserved_space_2'][1] = 456.25 - print(cal.dg_calibration_record) + print(cal.hd_calibration_record) try: if status: dara = [] - cal.get_dg_calibration_record() + cal.get_hd_calibration_record() while True: sleep(0.2) #print(cal.current_message, cal.total_messages, cal.cal_data) @@ -49,9 +49,9 @@ f.close() break else: - cal.set_dg_calibration_data() + cal.set_hd_calibration_record() - print(cal.dg_calibration_record) + print(cal.hd_calibration_record) except KeyboardInterrupt: f.close()