Index: leahi_dialin/ro/modules/boost_pump.py =================================================================== diff -u -r3c967e5acc6286c6334d2708600e3317988f87f1 -rbfb64f60f01b65c3acbead5608acba277bab7d0e --- leahi_dialin/ro/modules/boost_pump.py (.../boost_pump.py) (revision 3c967e5acc6286c6334d2708600e3317988f87f1) +++ leahi_dialin/ro/modules/boost_pump.py (.../boost_pump.py) (revision bfb64f60f01b65c3acbead5608acba277bab7d0e) @@ -16,7 +16,9 @@ import struct from enum import unique from logging import Logger +from enum import unique +from leahi_dialin.utils.base import DialinEnum from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels @@ -29,6 +31,7 @@ PUMP_RO = 0 PUMP_BOOSTER = 1 + class ROPumps(AbstractSubSystem): """ TReverse Osmosis (RO) Dialin API sub-class for blood-flow related commands. @@ -157,7 +160,7 @@ message_id=MsgIds.MSG_ID_RO_BOOST_PUMP_SET_PWM_REQUEST.value, payload=payload) - self.logger.debug("override measured blood pump speed") + self.logger.debug("override measured boost pump speed") # Send message received_message = self.can_interface.send(message) Index: leahi_dialin/ro/modules/pressure_sensors.py =================================================================== diff -u -r3c967e5acc6286c6334d2708600e3317988f87f1 -rbfb64f60f01b65c3acbead5608acba277bab7d0e --- leahi_dialin/ro/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 3c967e5acc6286c6334d2708600e3317988f87f1) +++ leahi_dialin/ro/modules/pressure_sensors.py (.../pressure_sensors.py) (revision bfb64f60f01b65c3acbead5608acba277bab7d0e) @@ -61,6 +61,7 @@ self.pressure_sensor_water_inlet_pre_cond = 0.0 self.pressure_sensor_pre_ro_filter = 0.0 self.pressure_sensor_post_ro_filter = 0.0 + self.pressure_sensor_pre_ro_pump = 0.0 @publish([ @@ -70,6 +71,7 @@ "pressure_sensor_water_inlet_pre_cond", "pressure_sensor_pre_ro_filter", "pressure_sensor_post_ro_filter", + "pressure_sensor_pre_ro_pump", ]) def _handler_pressure_sync(self, message, timestamp=0.0): """ @@ -90,12 +92,15 @@ message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) post_ro = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) + pre_rop = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) self.pressure_sensor_water_inlet_pre_reg = pre_reg_wi[0] self.pressure_sensor_water_inlet_post_reg = post_reg_wi[0] self.pressure_sensor_water_inlet_pre_cond = pre_cond_wi[0] self.pressure_sensor_pre_ro_filter = pre_ro[0] self.pressure_sensor_post_ro_filter = post_ro[0] + self.pressure_sensor_pre_ro_pump = pre_rop[0] self.ro_pressure_timestamp = timestamp def cmd_pressure_sensor_override(self, pressure: float, sensor: int, reset: int = NO_RESET) -> int: