Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -ra989d56abe60b07fc769bb3fdba2e6fdce8c3576 -r8904c1479bf0a313a83a6abdb717d1d1f2f5874f --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision a989d56abe60b07fc769bb3fdba2e6fdce8c3576) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 8904c1479bf0a313a83a6abdb717d1d1f2f5874f) @@ -7,8 +7,8 @@ # # @file hemodialysis_device.py # -# @author (last) Micahel Garthwaite -# @date (last) 22-Feb-2022 +# @author (last) Dara Navaei +# @date (last) 01-Mar-2022 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # @@ -44,6 +44,7 @@ from ..common.hd_defs import HDOpModes from .hd_events import HDEvents from .reservoirs import HDReservoirs +from .sw_configs import HDSoftwareConfigs from .post_treatment import HDPostTreatment from ..common.msg_defs import MsgIds, MsgFieldPositions from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels @@ -73,8 +74,6 @@ START_POS_COMPATIBILITY_REV = END_POS_BUILD END_POS_COMPATIBILITY_REV = START_POS_COMPATIBILITY_REV + 4 - - def __init__(self, can_interface="can0", log_level=None): """ HD object provides test/service commands for the HD sub-system. @@ -151,6 +150,7 @@ self.watchdog = HDWatchdog(self.can_interface, self.logger) self.hd_events = HDEvents(self.can_interface, self.logger) self.hd_reservoirs = HDReservoirs(self.can_interface, self.logger) + self.sw_configs = HDSoftwareConfigs(self.can_interface, self.logger) self.post_treatment = HDPostTreatment(self.can_interface, self.logger) def get_operation_mode(self): Index: dialin/hd/treatment.py =================================================================== diff -u -r88b4967ce6b9ac816ac21b26326450de4b540887 -r8904c1479bf0a313a83a6abdb717d1d1f2f5874f --- dialin/hd/treatment.py (.../treatment.py) (revision 88b4967ce6b9ac816ac21b26326450de4b540887) +++ dialin/hd/treatment.py (.../treatment.py) (revision 8904c1479bf0a313a83a6abdb717d1d1f2f5874f) @@ -705,8 +705,8 @@ self.current_arterial_high = arthigh[0] self.current_venous_low = venouslow[0] self.current_venous_high = venoushigh[0] - self.current_heparin_bolus = hepdispense[0] - self.current_heparin_dispense = hepbolus[0] + self.current_heparin_bolus = hepbolus[0] + self.current_heparin_dispense = hepdispense[0] self.current_dialysate_temp = dialtemp[0] self.current_uf_volume = ufvol[0]