Index: tests/test_dg_calibration.py =================================================================== diff -u -ra2cdbc7e007c6bd73e12344b4c89356a20b53f4f -rab49c2b2e6bd03745f5a910780791d4b18000fd1 --- tests/test_dg_calibration.py (.../test_dg_calibration.py) (revision a2cdbc7e007c6bd73e12344b4c89356a20b53f4f) +++ tests/test_dg_calibration.py (.../test_dg_calibration.py) (revision ab49c2b2e6bd03745f5a910780791d4b18000fd1) @@ -21,37 +21,37 @@ status = False - 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 + cal.hd_system_record['pumps']['concentrate_1']['step_speed_2_flow_ratio'][1] = 34.2 + cal.hd_system_record['pumps']['drain']['cal_time'][1] = 96321 + cal.hd_system_record['pumps']['ro']['gain_3_ratio'][1] = 45.69 + cal.hd_system_record['volumes']['drain_line']['volume'][1] = 125.8 + cal.hd_system_record['volumes']['drain_line']['crc'][1] = 78 + cal.hd_system_record['volumes']['pre_ro_purge']['volume'][1] = 125.8 + cal.hd_system_record['volumes']['reservoir_1']['max_residual_fluid'][1] = 85.36 + cal.hd_system_record['bicarb_concentrates']['bicarb_conc_3']['reserved_space'][1] = 85.36 + cal.hd_system_record['fans']['fan_2']['reserved_space_2'][1] = 456.25 - print(cal.hd_calibration_record) + print(cal.hd_system_record) try: if status: dara = [] - cal.get_hd_calibration_record() + cal.get_hd_system_record() while True: sleep(0.2) - #print(cal.current_message, cal.total_messages, cal.cal_data) + #print(cal.current_message, cal.total_messages, cal.sys_data) - if cal.cal_data != 0: - f.write(str(cal.cal_data) + '\r') - dara.append(cal.cal_data) + if cal.sys_data != 0: + f.write(str(cal.sys_data) + '\r') + dara.append(cal.sys_data) if cal.current_message == cal.total_messages: f.close() break else: - cal.set_hd_calibration_record() + cal.set_hd_system_record() - print(cal.hd_calibration_record) + print(cal.hd_system_record) except KeyboardInterrupt: f.close()