Index: leahi_dialin/dd/modules/levels.py =================================================================== diff -u -rfd7a25d8f068bcba594c01410a02a03f6afbcd59 -r6edd833759b929135e2a39f00eff1f814796329d --- leahi_dialin/dd/modules/levels.py (.../levels.py) (revision fd7a25d8f068bcba594c01410a02a03f6afbcd59) +++ leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 6edd833759b929135e2a39f00eff1f814796329d) @@ -54,7 +54,10 @@ self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_heaters_sync) @publish(["dd_levels_timestamp", - "",]) + "floater1", + "floater2", + "bicarb_level", + "spent_dialysate_level"]) def _handler_heaters_sync(self, message, timestamp=0.0): """ Handles published heaters message @@ -68,7 +71,7 @@ message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] self.bicarb_level = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.dd_levels_timestamp = struct.unpack('i', bytearray( + self.spent_dialysate_level = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] self.dd_levels_timestamp = timestamp @@ -119,15 +122,13 @@ @returns 1 if successful, zero otherwise """ reset_value = integer_to_bytearray(reset) - level_sensor = integer_to_bytearray(heater) + level_sensor = integer_to_bytearray(level_sensor) sts = integer_to_bytearray(status) payload = reset_value + sts + level_sensor message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, message_id=MsgIds.MSG_ID_DD_LEVELS_STATUS_OVERRIDE_REQUEST.value, payload=payload) - self.logger.debug("Overriding {} heater's duty cycle to {:5.3f} %".format(HeatersNames(heater).name, duty_cycle)) - # Send message received_message = self.can_interface.send(message) # If there is content in message Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -rfd7a25d8f068bcba594c01410a02a03f6afbcd59 -r6edd833759b929135e2a39f00eff1f814796329d --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision fd7a25d8f068bcba594c01410a02a03f6afbcd59) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 6edd833759b929135e2a39f00eff1f814796329d) @@ -17,7 +17,7 @@ from enum import unique from logging import Logger -from .constants import NO_RESET +from .constants import NO_RESET, RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum @@ -179,13 +179,6 @@ Must be logged into DG. Given sensor must be one of the sensors listed below. - pressure sensor IDs: \n - 0 = RO Pump Inlet \n - 1 = RO Pump Outlet \n - 2 = Drain Pump Inlet \n - 3 = Drain Pump Outlet \n - 4 = Barometric pressure \n - @param sensor: unsigned int - sensor ID @param pressure: unsigned int - pressure (in PSI) @param reset: integer - 1 to reset a previous override, 0 to override @@ -221,13 +214,6 @@ Must be logged into DG. Given sensor must be one of the sensors listed below. - pressure sensor IDs: \n - 0 = RO Pump Inlet \n - 1 = RO Pump Outlet \n - 2 = Drain Pump Inlet \n - 3 = Drain Pump Outlet \n - 4 = Barometric pressure \n - @param sensor: unsigned int - sensor ID @param temperature: unsigned int - pressure (in PSI) @param reset: integer - 1 to reset a previous override, 0 to override @@ -279,7 +265,7 @@ if reset == RESET: str_res = "reset back to normal" else: - str_res = str(conductivity) + " microsiemens/cm" + str_res = str(sensor) + " psi" self.logger.debug("override conductivity sensor value for sensor " + str(sensor) + ": " + str_res) # Send message @@ -316,7 +302,7 @@ if reset == RESET: str_res = "reset back to normal" else: - str_res = str(conductivity) + " microsiemens/cm" + str_res = str(sensor) + " psi" self.logger.debug("override conductivity sensor value for sensor " + str(sensor) + ": " + str_res) # Send message @@ -337,13 +323,6 @@ Must be logged into DG. Given sensor must be one of the sensors listed below. - pressure sensor IDs: \n - 0 = RO Pump Inlet \n - 1 = RO Pump Outlet \n - 2 = Drain Pump Inlet \n - 3 = Drain Pump Outlet \n - 4 = Barometric pressure \n - @param sensor: unsigned int - sensor ID @param pressure: unsigned int - pressure (in PSI) @param reset: integer - 1 to reset a previous override, 0 to override @@ -379,13 +358,6 @@ Must be logged into DG. Given sensor must be one of the sensors listed below. - pressure sensor IDs: \n - 0 = RO Pump Inlet \n - 1 = RO Pump Outlet \n - 2 = Drain Pump Inlet \n - 3 = Drain Pump Outlet \n - 4 = Barometric pressure \n - @param sensor: unsigned int - sensor ID @param temperature: unsigned int - pressure (in PSI) @param reset: integer - 1 to reset a previous override, 0 to override