Index: leahi_dialin/ro/modules/boost_pump.py =================================================================== diff -u -r249bfa9ec36c4a35604cc6466c33eaf60c3ff6d8 -r37d3d9bd8c3ccfdb1597aacebaa06ffef7633359 --- leahi_dialin/ro/modules/boost_pump.py (.../boost_pump.py) (revision 249bfa9ec36c4a35604cc6466c33eaf60c3ff6d8) +++ leahi_dialin/ro/modules/boost_pump.py (.../boost_pump.py) (revision 37d3d9bd8c3ccfdb1597aacebaa06ffef7633359) @@ -94,7 +94,7 @@ - def cmd_boost_pump_set_speed_rate_override(self, rpm: int, reset: int = NO_RESET) -> int: + def cmd_boost_pump_set_speed_rate_override(self, pump: int, rpm: int, reset: int = NO_RESET) -> int: """ Constructs and sends the boost pump set point command Constraints: @@ -105,7 +105,8 @@ """ rst = integer_to_bytearray(reset) rpm = integer_to_bytearray(rpm) - payload = rst + rpm + pmp = integer_to_bytearray(pmp) + payload = rst + rpm + pmp message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_ro_ch_id, message_id=MsgIds.MSG_ID_RO_BOOST_PUMP_SPEED_OVERRIDE_REQUEST.value, @@ -131,7 +132,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_boost_pump_set_pwm_request(self, pwm: int, reset: int = NO_RESET) -> int: + def cmd_boost_pump_set_pwm_request(self, pump: int, pwm: int, reset: int = NO_RESET) -> int: """ Constructs and sends the measured blood pump motor speed override \n command. @@ -145,10 +146,11 @@ rst = integer_to_bytearray(reset) spd = float_to_bytearray(pwm) - payload = rst + spd + pmp = integer_to_bytearray(pump) + payload = rst + spd + pmp message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_ro_ch_id, - message_id=MsgIds.MSG_ID_RO_BLOOD_PUMP_MEASURED_MOTOR_SPEED_OVERRIDE_REQUEST.value, + message_id=MsgIds.MSG_ID_RO_BOOST_PUMP_SET_PWM_REQUEST.value, payload=payload) self.logger.debug("override measured blood pump speed") @@ -171,7 +173,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_boost_pump_read_pwm_override(self, pwm: float, reset: int = NO_RESET) -> int: + def cmd_boost_pump_read_pwm_override(self, pump: int, pwm: float, reset: int = NO_RESET) -> int: """ Constructs and sends the measured blood pump rotor speed override \n command. @@ -185,7 +187,8 @@ rst = integer_to_bytearray(reset) rpwm = float_to_bytearray(pwm) - payload = rst + rpwm + pmp = integer_to_bytearray(pump) + payload = rst + rpwm + pmp message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_ro_ch_id, message_id=MsgIds.MSG_ID_RO_BOOST_PUMP_READ_PWM_OVERRIDE_REQUEST.value,