Index: leahi_dialin/dd/modules/concentrate_pump.py =================================================================== diff -u -r6c52c3221833245403fefa88deaeb41c52492936 -r3660c662fceaa81ef9af72f3260276a11710919d --- leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision 6c52c3221833245403fefa88deaeb41c52492936) +++ leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision 3660c662fceaa81ef9af72f3260276a11710919d) @@ -27,8 +27,8 @@ @unique class ConcentratePumpsEnum(DialinEnum): - CP1_ACID = 0 - CP2_BICARB = 1 + D11_CP1_ACID = 0 + D10_CP2_BICARB = 1 @unique @@ -40,9 +40,7 @@ class DDConcentratePumps(AbstractSubSystem): """ - ConcentratePumps - - Dialysate Delivery (DD) Dialin API sub-class for concentrate pumps related commands. + Dialin API sub-class for concentrate pumps related commands. """ def __init__(self, can_interface, logger: Logger): @@ -61,34 +59,34 @@ self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_concentrate_pumps_sync) - self.concentrate_pump_cp1_current_set_speed = 0.0 - self.concentrate_pump_cp1_measured_speed = 0.0 - self.concentrate_pump_cp1_target_speed = 0.0 - self.concentrate_pump_cp2_current_set_speed = 0.0 - self.concentrate_pump_cp2_measured_speed = 0.0 - self.concentrate_pump_cp2_target_speed = 0.0 - self.concentrate_pump_cp1_current_state = 0.0 - self.concentrate_pump_cp2_current_state = 0.0 - self.concentrate_pump_cp1_target_rev_count = 0.0 - self.concentrate_pump_cp2_target_rev_count = 0.0 - self.concentrate_pump_cp1_measured_rev_count = 0.0 - self.concentrate_pump_cp2_measured_rev_count = 0.0 - self.concentrate_pump_cp1_parked = False - self.concentrate_pump_cp2_parked = False - self.concentrate_pump_cp1_park_fault = False - self.concentrate_pump_cp2_park_fault = False - self.concentrate_pump_cp1_pulse_us = 0.0 - self.concentrate_pump_cp2_pulse_us = 0.0 + self.d11_cp1_current_set_speed = 0.0 + self.d11_cp1_measured_speed = 0.0 + self.d11_cp1_target_speed = 0.0 + self.d10_cp2_current_set_speed = 0.0 + self.d10_cp2_measured_speed = 0.0 + self.d10_cp2_target_speed = 0.0 + self.d11_cp1_current_state = 0.0 + self.d10_cp2_current_state = 0.0 + self.d11_cp1_target_rev_count = 0.0 + self.d10_cp2_target_rev_count = 0.0 + self.d11_cp1_measured_rev_count = 0.0 + self.d10_cp2_measured_rev_count = 0.0 + self.d11_cp1_parked = False + self.d10_cp2_parked = False + self.d11_cp1_park_fault = False + self.d10_cp2_park_fault = False + self.d11_cp1_pulse_us = 0.0 + self.d10_cp2_pulse_us = 0.0 self.dd_concentrate_pump_timestamp = 0.0 @publish(["dd_concentrate_pump_timestamp", - "concentrate_pump_cp1_current_set_speed", "concentrate_pump_cp1_measured_speed", "concentrate_pump_cp1_target_speed", - "concentrate_pump_cp2_current_set_speed", "concentrate_pump_cp2_measured_speed", "concentrate_pump_cp2_target_speed", - "concentrate_pump_cp1_current_state", "concentrate_pump_cp2_current_state", - "concentrate_pump_cp1_target_rev_count", "concentrate_pump_cp2_target_rev_count", - "concentrate_pump_cp1_measured_rev_count", "concentrate_pump_cp2_measured_rev_count", - "concentrate_pump_cp1_parked", "concentrate_pump_cp2_parked", - "concentrate_pump_cp1_park_fault", "concentrate_pump_cp2_park_fault"]) + "cp1_current_set_speed", "cp1_measured_speed", "cp1_target_speed", + "cp2_current_set_speed", "cp2_measured_speed", "cp2_target_speed", + "cp1_current_state", "cp2_current_state", + "cp1_target_rev_count", "cp2_target_rev_count", + "cp1_measured_rev_count", "cp2_measured_rev_count", + "cp1_parked", "cp2_parked", + "cp1_park_fault", "cp2_park_fault"]) def _handler_concentrate_pumps_sync(self, message, timestamp=0.0): """ Handles published concentrate pumps' data messages. Concentrate pumps' speed data are captured