Index: HD/HD_TestScript.py =================================================================== diff -u -r082ea4c8b0c6a3c804453308990d0bb98a0a2156 -r0da0106eca868b9144298c60911710b3414a5837 --- HD/HD_TestScript.py (.../HD_TestScript.py) (revision 082ea4c8b0c6a3c804453308990d0bb98a0a2156) +++ HD/HD_TestScript.py (.../HD_TestScript.py) (revision 0da0106eca868b9144298c60911710b3414a5837) @@ -16,46 +16,46 @@ # TODO: Use .format or f" {varname}" instead of casting to string. # TODO: Break while loops on some condition, shouldn't rely on Ctrl-C. -from .HemodialysisDevice import HD +from HemodialysisDevice import HD from time import sleep if __name__ == "__main__": - hd = HD() + hd = HD(can_interface_name="vcan0") sleep(2) - if hd.Basics.cmd_log_in_to_hd() == 0: + if hd.basics.cmd_log_in_to_hd() == 0: exit(1) - hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.RESET, 0) + hd.bloodflow.cmd_blood_flow_broadcast_interval_override(hd.RESET, 0) sleep(2) - print("Blood Flow Target = " + str(hd.BloodFlow.TargetBloodFlowRate)) - print("Blood Pump Current= " + str(hd.BloodFlow.MeasuredBloodPumpMCCurrent)) + print("Blood Flow Target = " + str(hd.bloodflow.TargetBloodFlowRate)) + print("Blood Pump Current= " + str(hd.bloodflow.MeasuredBloodPumpMCCurrent)) sleep(5) - print("Blood Pump Current= " + str(hd.BloodFlow.MeasuredBloodPumpMCCurrent)) + print("Blood Pump Current= " + str(hd.bloodflow.MeasuredBloodPumpMCCurrent)) - hd.BloodFlow.CmdBloodPumpMeasuredCurrentOverride(hd.NO_RESET, 140) + hd.bloodflow.cmd_blood_pump_measured_current_override(hd.NO_RESET, 140) sleep(1) - print("Blood Pump Current= " + str(hd.BloodFlow.MeasuredBloodPumpMCCurrent)) + print("Blood Pump Current= " + str(hd.bloodflow.MeasuredBloodPumpMCCurrent)) sleep(5) - hd.BloodFlow.CmdBloodPumpMeasuredCurrentOverride(hd.RESET, 0) + hd.bloodflow.cmd_blood_pump_measured_current_override(hd.RESET, 0) while True: sleep(0.5) - print("Measured Flow = " + str(hd.BloodFlow.MeasuredBloodFlowRate) + " mL/min") + print("Measured Flow = " + str(hd.bloodflow.MeasuredBloodFlowRate) + " mL/min") tgtRate = 0 - hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.NO_RESET, 2000) + hd.BloodFlow.cmd_blood_flow_broadcast_interval_override(hd.NO_RESET, 2000) while True: if hd.BloodFlow.TargetBloodFlowRate == 0: if tgtRate != 0: - hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.NO_RESET, 2000) + hd.BloodFlow.cmd_blood_flow_broadcast_interval_override(hd.NO_RESET, 2000) tgtRate = 0 else: if tgtRate == 0: - hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.NO_RESET, 200) + hd.BloodFlow.cmd_blood_flow_broadcast_interval_override(hd.NO_RESET, 200) tgtRate = hd.BloodFlow.TargetBloodFlowRate -# hd.BloodFlow.CmdBloodFlowBroadcastIntervalOverride(hd.RESET,0) +# hd.bloodflow.cmd_blood_flow_broadcast_interval_override(hd.RESET,0)