Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -r4624fb54ac9685092a25a11ab417e363b46fa0cd -r71e513edcb6c315f0b890c23200289e17fd04efe --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 4624fb54ac9685092a25a11ab417e363b46fa0cd) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision 71e513edcb6c315f0b890c23200289e17fd04efe) @@ -264,7 +264,8 @@ D6_LEVEL = 0 # floater switch low, medium and high status D63_LEVEL = 1 # bicarb level low or high status D46_LEVEL = 2 # Spent dialysate air separation chamber level low or high status - NUM_OF_LEVELS = 3 # Number of Level Sensors + D98_LEVEL = 3 # D98 Conductive Level Sensor + NUM_OF_LEVELS = 4 # Number of Level Sensors @unique class DDPistonPumpsEnum(DialinEnum): @@ -288,7 +289,8 @@ D51_PRES = 2 # Spent Dialysate pressure (PDs) D18_PRES = 3 # Fresh Dialysate pressure (PDf) D41_PRES = 4 # Transmembrane pressure (Ptm) - NUM_OF_PRESSURE_SENSORS = 5 # Number of pressure sensors + D87_PRES = 5 # D87 Pressure sensor + NUM_OF_PRESSURE_SENSORS = 6 # Number of pressure sensors COND_SENSOR_INDEX_OFFSET = 6 # Conductivity Sensor Index Offset for the Temperature Readings PRES_SENSOR_INDEX_OFFSET = 15 # Pressure Sensors Offset for Temperature Readings @@ -304,21 +306,24 @@ D4_TEMP = 2 # Hydraulics primary heater temperature sensor D50_TEMP = 3 # Trimmer heater temperature sensor BRD_TEMP = 4 # Barometric temperature sensor - D16_TEMP = 5 # D16 Conductivity sensor temperature value - D28_TEMP = 6 # D28 Conductivity sensor temperature value - D30_TEMP = 7 # D30 Conductivity sensor temperature value - D44_TEMP = 8 # D44 Conductivity sensor temperature value - D75_TEMP = 9 # D75 Conductivity sensor temperature value - D4_AVG_TEMP = 10 # D4 Filtered value - D50_AVG_TEMP = 11 # D50 Filtered value - D28_AVG_TEMP = 12 # D28 Filtered value - D30_AVG_TEMP = 13 # D30 Filtered value - D9_TEMP = 14 # D9 Pressure sensor temperature value - D66_TEMP = 15 # D66 Pressure sensor temperature value - D51_TEMP = 16 # D51 Pressure sensor temperature value - D18_TEMP = 17 # D18 Pressure sensor temperature value - D41_TEMP = 18 # D41 Pressure sensor temperature value - NUM_OF_TEMP_SENSORS = 19 # Number of Temperature Sensors + D16_TEMP = 5 # D16(D17) Conductivity sensor temperature value + D28_TEMP = 6 # D28(D27) Conductivity sensor temperature value + D30_TEMP = 7 # D30(D29) Conductivity sensor temperature value + D44_TEMP = 8 # D44(D43) Conductivity sensor temperature value + D75_TEMP = 9 # D75(D74) Conductivity sensor temperature value + D99_TEMP = 10 # D99(D98) Conductivity sensor temperature value + D4_AVG_TEMP = 11 # D4 Filtered value + D50_AVG_TEMP = 12 # D50 Filtered value + D28_AVG_TEMP = 13 # D28 Filtered value + D30_AVG_TEMP = 14 # D30 Filtered value + D99_AVG_TEMP = 15 # D99 Filtered value + D9_TEMP = 16 # D9 Pressure sensor temperature value + D66_TEMP = 17 # D66 Pressure sensor temperature value + D51_TEMP = 18 # D51 Pressure sensor temperature value + D18_TEMP = 19 # D18 Pressure sensor temperature value + D41_TEMP = 20 # D41 Pressure sensor temperature value + D87_TEMP = 21 # D87 Pressure sensor temperature value + NUM_OF_TEMP_SENSORS = 22 # Number of Temperature Sensors @unique class DDValveStates(DialinEnum): @@ -352,12 +357,12 @@ D26_VALV = 22 # Balancing chamber Valve 7 (D26) D22_VALV = 23 # Balancing chamber Valve 8 (D22) D79_PMP_VALV = 24 # D79 pump mapped to spare valve 0 - SPARE1_VALV = 25 # Spare Valve 1 - SPARE2_VALV = 26 # Spare Valve 2 + D83_VALV = 25 # Valve De-scaler (D83) + D91_VALV = 26 # Valve De-scaler (D91) SPARE3_VALV = 27 # Spare Valve 3 SPARE4_VALV = 28 # Spare Valve 4 SPARE5_VALV = 29 # Spare Valve 5 - SPARE6_VALV = 30 # Spare Valve 6 + D100_VALV = 30 # Valve De-scaler (D100) SPARE7_VALV = 31 # Spare Valve 7 M4_VALV = 32 # First IO valve (M4) M12_VALV = 33 # Last IO valve IO valve (M12) Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -rebfcd2d736085a36fdcb408a8c544c8bf140d574 -r71e513edcb6c315f0b890c23200289e17fd04efe --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision ebfcd2d736085a36fdcb408a8c544c8bf140d574) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 71e513edcb6c315f0b890c23200289e17fd04efe) @@ -135,7 +135,7 @@ MSG_ID_TD_HEPARIN_REQUEST = 0x8A MSG_ID_TD_HEPARIN_RESPONSE = 0x8B MSG_ID_TD_HEPARIN_DATA = 0x8C - MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 + MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0 MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000 MSG_ID_TD_SOFTWARE_RESET_REQUEST = 0x8001 @@ -292,6 +292,8 @@ MSG_ID_DD_VOLTAGE_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA051 MSG_ID_DD_MONITORED_VOLTAGE_OVERRIDE_REQUEST = 0xA052 MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xA053 + MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST = 0xA054 + MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST = 0xA055 # Placeholder messages MSG_ID_DD_ALARM_STATE_OVERRIDE_REQUEST = 0xAF03 Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -r4ccd1187d3e44e772e16edac733aae5994f57424 -r71e513edcb6c315f0b890c23200289e17fd04efe --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 4ccd1187d3e44e772e16edac733aae5994f57424) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 71e513edcb6c315f0b890c23200289e17fd04efe) @@ -13,16 +13,16 @@ # @date (original) 14-Apr-2020 # ############################################################################ + import struct -from enum import unique from logging import Logger -from .constants import NO_RESET, RESET +from leahi_dialin.common.constants import NO_RESET, RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.dd_defs import DDPressureNames +from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels -from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum -from leahi_dialin.utils.checks import check_broadcast_interval_override_ms +from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -53,7 +53,8 @@ DDPressureNames.D66_PRES.name: 0.0, DDPressureNames.D51_PRES.name: 0.0, DDPressureNames.D18_PRES.name: 0.0, - DDPressureNames.D41_PRES.name: 0.0 + DDPressureNames.D41_PRES.name: 0.0, + DDPressureNames.D87_PRES.name: 0.0 } self.dd_pressures_timestamp = 0 @@ -77,6 +78,8 @@ message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] self.dd_pressures[DDPressureNames.D41_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] + self.dd_pressures[DDPressureNames.D87_PRES.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] self.dd_pressures_timestamp = timestamp @@ -93,30 +96,15 @@ """ - if not check_broadcast_interval_override_ms(ms): - return False + cmd_generic_broadcast_interval_override( + ms = ms, + reset = reset, + channel_id = DenaliChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + module_name = 'DD pressure sensors', + logger = self.logger, + can_interface = self.can_interface) - rst = integer_to_bytearray(reset) - ivl = integer_to_bytearray(ms) - payload = rst + ivl - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("override pressure data broadcast interval") - - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False - def cmd_pressure_readings_override(self, sensor: int, pressure: float, reset: int = NO_RESET) -> int: """ Constructs and sends the pressure readings override command.