Index: leahi_dialin/dd/modules/dialysate_pump.py =================================================================== diff -u -reff35c7c93f5a6f24510f54bcaa7e32011ecd92e -r9466b5c6b5867f392104a42608aa9542a7ff0358 --- leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision eff35c7c93f5a6f24510f54bcaa7e32011ecd92e) +++ leahi_dialin/dd/modules/dialysate_pump.py (.../dialysate_pump.py) (revision 9466b5c6b5867f392104a42608aa9542a7ff0358) @@ -5,7 +5,7 @@ # THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN # WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. # -# @file concentrate_pumps.py +# @file dialysate_pump.py # # @author (last) Micahel Garthwaite # @date (last) 07-Mar-2023 @@ -27,8 +27,8 @@ @unique class DialysatePumpsEnum(DialinEnum): - FRESH_DIALYSATE_PUMP = 0 - SPENT_DIALYSATE_PUMP = 1 + D12_PUMP = 0 + D48_PUMP = 1 @unique @@ -59,49 +59,49 @@ channel_id = DenaliChannels.dd_sync_broadcast_ch_id msg_id = MsgIds.MSG_ID_DIALYSATE_PUMPS_DATA.value self.can_interface.register_receiving_publication_function(channel_id, msg_id, - self._handler_concentrate_pumps_sync) + self._handler_dialysate_pumps_sync) - self.dial_pump_target_rpm_fresh = 0.0 - self.dial_pump_target_rpm_spent = 0.0 - self.dial_pump_measured_spd_fresh = 0.0 - self.dial_pump_measured_spd_spent = 0.0 - self.dial_pump_current_spd_fresh = 0.0 - self.dial_pump_current_spd_spent = 0.0 - self.dial_pump_state_fresh = 0 - self.dial_pump_state_spent = 0 - self.dial_pump_tgt_pressure_fresh = 0.0 - self.dial_pump_tgt_pressure_spent = 0.0 - self.dial_pump_measured_pressure_fresh = 0.0 - self.dial_pump_measured_pressure_spent = 0.0 - self.dial_pump_measured_current_fresh = 0.0 - self.dial_pump_measured_current_spent = 0.0 - self.dial_pump_control_fresh = 0 - self.dial_pump_control_spent = 0 - self.dial_pump_dir_err_cnt_fresh = 0 - self.dial_pump_dir_err_cnt_spent = 0 - self.dial_pump_measured_dir_fresh = 0 - self.dial_pump_measured_dir_spent = 0 + self.d12_pump_target_rpm_fresh = 0.0 + self.d48_pump_target_rpm_spent = 0.0 + self.d12_pump_measured_spd_fresh = 0.0 + self.d48_pump_measured_spd_spent = 0.0 + self.d12_pump_current_spd_fresh = 0.0 + self.d48_pump_current_spd_spent = 0.0 + self.d12_pump_state_fresh = 0 + self.d48_pump_state_spent = 0 + self.d12_pump_tgt_pressure_fresh = 0.0 + self.d48_pump_tgt_pressure_spent = 0.0 + self.d12_pump_measured_pressure_fresh = 0.0 + self.d48_pump_measured_pressure_spent = 0.0 + self.d12_pump_measured_current_fresh = 0.0 + self.d48_pump_measured_current_spent = 0.0 + self.d12_pump_control_fresh = 0 + self.d48_pump_control_spent = 0 + self.d12_pump_dir_err_cnt_fresh = 0 + self.d48_pump_dir_err_cnt_spent = 0 + self.d12_pump_measured_dir_fresh = 0 + self.d48_pump_measured_dir_spent = 0 self.dd_dialysate_pump_timestamp = 0 @publish(["dd_dialysate_pump_timestamp", - "dial_pump_target_rpm_fresh","dial_pump_target_rpm_spent", - "dial_pump_measured_spd_fresh","dial_pump_measured_spd_spent", - "dial_pump_current_spd_fresh","dial_pump_current_spd_spent", - "dial_pump_state_fresh","dial_pump_state_spent", - "dial_pump_tgt_pressure_fresh","dial_pump_tgt_pressure_spent", - "dial_pump_measured_pressure_fresh","dial_pump_measured_pressure_spent", - "dial_pump_measured_current_fresh","dial_pump_measured_current_spent", - "dial_pump_control_fresh","dial_pump_control_spent", - "dial_pump_dir_err_cnt_fresh","dial_pump_dir_err_cnt_spent", - "dial_pump_measured_dir_fresh","dial_pump_measured_dir_spent", + "d12_pump_target_rpm_fresh","d48_pump_target_rpm_spent", + "d12_pump_measured_spd_fresh","d48_pump_measured_spd_spent", + "d12_pump_current_spd_fresh","d48_pump_current_spd_spent", + "d12_pump_state_fresh","d48_pump_state_spent", + "d12_pump_tgt_pressure_fresh","d48_pump_tgt_pressure_spent", + "d12_pump_measured_pressure_fresh","d48_pump_measured_pressure_spent", + "d12_pump_measured_current_fresh","d48_pump_measured_current_spent", + "d12_pump_control_fresh","d48_pump_control_spent", + "d12_pump_dir_err_cnt_fresh","d48_pump_dir_err_cnt_spent", + "d12_pump_measured_dir_fresh","d48_pump_measured_dir_spent", ]) - def _handler_concentrate_pumps_sync(self, message, timestamp=0.0): + def _handler_dialysate_pumps_sync(self, message, timestamp=0.0): """ - Handles published concentrate pumps' data messages. Concentrate pumps' speed data are captured + Handles published dialysate pumps' data messages. Dialysate pumps' speed data are captured for reference. - @param message: published concentrate pumps' data message + @param message: published dialysate pumps' data message @return: None """ @@ -150,10 +150,10 @@ def cmd_dialysate_pump_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ - Constructs and sends the concentrate pump data broadcast interval override command + Constructs and sends the dialysate pump data broadcast interval override command Constraints: - Must be logged into DG. - Given interval must be non-zero and a multiple of the DG general task interval (50 ms). + Must be logged into DD. + Given interval must be non-zero and a multiple of the DD general task interval (50 ms). @param ms: integer - interval (in ms) to override with @param reset: integer - 1 to reset a previous override, 0 to override