Index: tests/peter/test_dg_records.py =================================================================== diff -u -rdc3b97933c58b8854781f2984083a2f8eccd3217 -r4ec12397809c5820ee654aaffe5924e67a79a072 --- tests/peter/test_dg_records.py (.../test_dg_records.py) (revision dc3b97933c58b8854781f2984083a2f8eccd3217) +++ tests/peter/test_dg_records.py (.../test_dg_records.py) (revision 4ec12397809c5820ee654aaffe5924e67a79a072) @@ -208,14 +208,14 @@ sleep(0.2) print(dg.calibration_record.dg_calibration_record) - + """ dg.calibration_record.dg_calibration_record['flow_sensors']['dialysate_flow_sensor']['offset'][1] = 0.885 dg.calibration_record.dg_calibration_record['flow_sensors']['dialysate_flow_sensor']["cal_time"][1] = \ NVOpsUtils.get_current_time_in_epoch() dg.calibration_record.dg_calibration_record['flow_sensors']['dialysate_flow_sensor']["crc"][1] = \ NVOpsUtils.get_group_record_crc(dg.calibration_record.dg_calibration_record['flow_sensors']['dialysate_flow_sensor']) - """ + # Change the value(s) you are planning to change directly to the dictionary dg.calibration_record.dg_calibration_record["pressure_sensors"]["ppi"]["fourth_order"][1] = 0.0 dg.calibration_record.dg_calibration_record["pressure_sensors"]["ppi"]["gain"][1] = 1.0 @@ -228,34 +228,65 @@ dg.calibration_record.dg_calibration_record["pressure_sensors"]["ppo"]["cal_time"][1] = \ NVOpsUtils.get_current_time_in_epoch() dg.calibration_record.dg_calibration_record["pressure_sensors"]["ppo"]["crc"][1] = \ - NVOpsUtils.get_group_record_crc(dg.calibration_record.dg_calibration_record["pressure_sensors"]["ppo"]) + NVOpsUtils.get_group_record_crc(dg.calibration_record.dg_calibration_record["pressure_sensors"]["ppo"]) + """ - dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a1"]["gain"][1] = 1.0 + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a1"]["gain"][1] = 1.058527274 + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a1"]["offset"][1] = -127.3129791 dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a1"]["cal_time"][1] = \ NVOpsUtils.get_current_time_in_epoch() dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a1"]["crc"][1] = \ NVOpsUtils.get_group_record_crc(dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a1"]) - """ - dg.calibration_record.cmd_set_dg_calibration_record(dg.calibration_record.dg_calibration_record) + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a2"]["gain"][1] = 0.988036262 + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a2"]["offset"][1] = -116.6615859 + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a2"]["cal_time"][1] = \ + NVOpsUtils.get_current_time_in_epoch() + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a2"]["crc"][1] = \ + NVOpsUtils.get_group_record_crc(dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_a2"]) + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b1"]["gain"][1] = 0.992981302 + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b1"]["offset"][1] = -49.84277209 + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b1"]["cal_time"][1] = \ + NVOpsUtils.get_current_time_in_epoch() + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b1"]["crc"][1] = \ + NVOpsUtils.get_group_record_crc(dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b1"]) + + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b2"]["gain"][1] = 0.988057943 + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b2"]["offset"][1] = -1.127196988 + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b2"]["cal_time"][1] = \ + NVOpsUtils.get_current_time_in_epoch() + dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b2"]["crc"][1] = \ + NVOpsUtils.get_group_record_crc(dg.calibration_record.dg_calibration_record["load_cells"]["load_cell_b2"]) + print(dg.calibration_record.dg_calibration_record) - record_old_formatted = pprint.pformat(dg.calibration_record.dg_calibration_record, indent=4) - with open("/home/fw/projects/dialin/tests/peter/dg_cal_record.log", 'w') as f: - f.write(record_old_formatted) + dg.calibration_record.cmd_set_dg_calibration_record(dg.calibration_record.dg_calibration_record) + #print(dg.calibration_record.dg_calibration_record) + + #record_old_formatted = pprint.pformat(dg.calibration_record.dg_calibration_record, indent=4) + #with open("/home/fw/projects/dialin/tests/peter/dg_cal_record.log", 'w') as f: + # f.write(record_old_formatted) + #subprocess.call("meld /home/fw/projects/dialin/tests/peter/dialin_test_record_old.log" # " /home/fw/projects/dialin/tests/peter/dialin_test_record_new.log", shell=True) def test_dg_reset_record(): dg = DG(log_level="DEBUG") if dg.cmd_log_in_to_dg(): + dg.calibration_record.cmd_request_dg_calibration_record() + observer = Observer("dg_calibration_record") + dg.calibration_record.attach(observer) + while not observer.received: + sleep(0.2) + print(dg.calibration_record.dg_calibration_record) + dg.calibration_record.cmd_reset_dg_calibration_record() - #sleep(0.25) - #print(dg.calibration_record.dg_calibration_record) + sleep(0.25) + print(dg.calibration_record.dg_calibration_record) #dg.calibration_record.cmd_reset_dg_calibration_record() #sleep(0.25) @@ -267,8 +298,8 @@ #print(dg.service_record.dg_service_record) - def test_dg_service_record(): + dg = DG(log_level="DEBUG") if dg.cmd_log_in_to_dg(): @@ -319,9 +350,9 @@ if __name__ == "__main__": - test_dg_reset_record() + #test_dg_reset_record() # test_dg_sw_config_record() - #test_dg_calibration_record() + test_dg_calibration_record() # test_dg_service_record() #test_dg_system_record() # test_dg_scheduled_runs_record()