Index: leahi_dialin/dd/modules/concentrate_pump.py =================================================================== diff -u -rfd7a25d8f068bcba594c01410a02a03f6afbcd59 -recd89ae316cd2afa695dd4e93ac18b6004975efb --- leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision fd7a25d8f068bcba594c01410a02a03f6afbcd59) +++ leahi_dialin/dd/modules/concentrate_pump.py (.../concentrate_pump.py) (revision ecd89ae316cd2afa695dd4e93ac18b6004975efb) @@ -75,9 +75,6 @@ self.concentrate_pump_cp2_park_fault = False self.dd_concentrate_pump_timestamp = 0.0 - self.cp1_pulse_us = 0.0 - self.cp2_pulse_us = 0.0 - @publish(["dd_concentrate_pump_timestamp", "concentrate_pump_cp1_current_set_speed", "concentrate_pump_cp1_measured_speed", "concentrate_pump_cp1_target_speed", "concentrate_pump_cp2_current_set_speed", "concentrate_pump_cp2_measured_speed", "concentrate_pump_cp2_target_speed", @@ -149,7 +146,7 @@ ms_byte_array = integer_to_bytearray(ms) payload = reset_byte_array + ms_byte_array - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, message_id=MsgIds.MSG_ID_DD_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, payload=payload) Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -rfd7a25d8f068bcba594c01410a02a03f6afbcd59 -recd89ae316cd2afa695dd4e93ac18b6004975efb --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision fd7a25d8f068bcba594c01410a02a03f6afbcd59) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision ecd89ae316cd2afa695dd4e93ac18b6004975efb) @@ -215,7 +215,7 @@ if reset == RESET: str_res = "reset back to normal" else: - str_res = str(conductivity) + " microsiemens/cm" + str_res = str(temperature) self.logger.debug("override conductivity sensor value for sensor " + str(sensor) + ": " + str_res) # Send message @@ -229,7 +229,7 @@ self.logger.error("Timeout!!!!") return False - def cmd_conductivity_sensor_read_counter_override(self, sensor: int, counter: float, reset: int = NO_RESET) -> int: + def cmd_conductivity_sensor_read_counter_override(self, sensor: int, counter: int, reset: int = NO_RESET) -> int: """ Constructs and sends the conductivity value override command @@ -241,7 +241,7 @@ """ reset_byte_array = integer_to_bytearray(reset) - read_byte_array = float_to_bytearray(counter) + read_byte_array = integer_to_bytearray(counter) sensor_byte_array = integer_to_bytearray(sensor) payload = reset_byte_array + read_byte_array + sensor_byte_array @@ -252,7 +252,7 @@ if reset == RESET: str_res = "reset back to normal" else: - str_res = str(conductivity) + " microsiemens/cm" + str_res = str(counter) self.logger.debug("override conductivity sensor value for sensor " + str(sensor) + ": " + str_res) # Send message @@ -266,7 +266,7 @@ self.logger.error("Timeout!!!!") return False - def cmd_conductivity_sensor_error_counter_override(self, sensor: int, counter: float, reset: int = NO_RESET) -> int: + def cmd_conductivity_sensor_error_counter_override(self, sensor: int, counter: int, reset: int = NO_RESET) -> int: """ Constructs and sends the conductivity value override command @@ -278,7 +278,7 @@ """ reset_byte_array = integer_to_bytearray(reset) - error_byte_array = float_to_bytearray(counter) + error_byte_array = integer_to_bytearray(counter) sensor_byte_array = integer_to_bytearray(sensor) payload = reset_byte_array + error_byte_array + sensor_byte_array @@ -289,7 +289,7 @@ if reset == RESET: str_res = "reset back to normal" else: - str_res = str(conductivity) + " microsiemens/cm" + str_res = str(counter) self.logger.debug("override conductivity sensor value for sensor " + str(sensor) + ": " + str_res) # Send message Index: leahi_dialin/dd/modules/heaters.py =================================================================== diff -u -rfd7a25d8f068bcba594c01410a02a03f6afbcd59 -recd89ae316cd2afa695dd4e93ac18b6004975efb --- leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision fd7a25d8f068bcba594c01410a02a03f6afbcd59) +++ leahi_dialin/dd/modules/heaters.py (.../heaters.py) (revision ecd89ae316cd2afa695dd4e93ac18b6004975efb) @@ -197,7 +197,6 @@ message_id=MsgIds.MSG_ID_DD_HEATERS_START_STOP_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) Index: leahi_dialin/dd/modules/levels.py =================================================================== diff -u -r29ad0ac04795b6500f44acde49317c61b380f3dc -recd89ae316cd2afa695dd4e93ac18b6004975efb --- leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 29ad0ac04795b6500f44acde49317c61b380f3dc) +++ leahi_dialin/dd/modules/levels.py (.../levels.py) (revision ecd89ae316cd2afa695dd4e93ac18b6004975efb) @@ -43,7 +43,6 @@ self.logger = logger self.floater1 = 0 - self.floater2 = 0 self.bicarb_level = 0 self.spent_dialysate_level = 0 self.dd_levels_timestamp = 0 @@ -55,7 +54,7 @@ @publish(["dd_levels_timestamp", "floater1", - "floater2", + "bicarb_level", "spent_dialysate_level"]) def _handler_heaters_sync(self, message, timestamp=0.0): """ @@ -66,7 +65,7 @@ """ self.floater1 = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.floater2 = struct.unpack('i', bytearray( + self.bicarb_level = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] self.spent_dialysate_level = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -rfd7a25d8f068bcba594c01410a02a03f6afbcd59 -recd89ae316cd2afa695dd4e93ac18b6004975efb --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision fd7a25d8f068bcba594c01410a02a03f6afbcd59) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision ecd89ae316cd2afa695dd4e93ac18b6004975efb) @@ -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 @@ -66,22 +66,22 @@ @param message: published temperature sensors data message @returns none """ - self.temperatures[DGTemperaturesNames.INLET_HEAT_EXCHANGER.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.INLET_HEAT_EXCHANGER.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.temperatures[DGTemperaturesNames.OUTLET_HEAT_EXCHANGER.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.OUTLET_HEAT_EXCHANGER.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.temperatures[DGTemperaturesNames.HYDRAULICS_PRIMARY_HEATER.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.HYDRAULICS_PRIMARY_HEATER.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.temperatures[DGTemperaturesNames.TRIMMER_HEATER.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.TRIMMER_HEATER.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.temperatures[DGTemperaturesNames.BOARD_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.BOARD_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.temperatures[DGTemperaturesNames.BARO_TEMP_SENSOR.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.BARO_TEMP_SENSOR.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] self.dg_temperatures_timestamp = timestamp @@ -157,7 +157,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_temperature_sensor_read_counter_override(self, sensor: int, counter: float, reset: int = NO_RESET) -> int: + def cmd_temperature_sensor_read_counter_override(self, sensor: int, counter: int, reset: int = NO_RESET) -> int: """ Constructs and sends the temperature value override command @@ -169,7 +169,7 @@ """ reset_byte_array = integer_to_bytearray(reset) - read_byte_array = float_to_bytearray(counter) + read_byte_array = integer_to_bytearray(counter) sensor_byte_array = integer_to_bytearray(sensor) payload = reset_byte_array + read_byte_array + sensor_byte_array @@ -180,7 +180,7 @@ if reset == RESET: str_res = "reset back to normal" else: - str_res = str(conductivity) + " celsius" + str_res = str(counter) + " celsius" self.logger.debug("override conductivity sensor value for sensor " + str(sensor) + ": " + str_res) # Send message @@ -194,7 +194,7 @@ self.logger.error("Timeout!!!!") return False - def cmd_baro_sensor_read_counter_override(self, counter: float, reset: int = NO_RESET) -> int: + def cmd_baro_sensor_read_counter_override(self, counter: int, reset: int = NO_RESET) -> int: """ Constructs and sends the temperature value override command @@ -206,7 +206,7 @@ """ reset_byte_array = integer_to_bytearray(reset) - read_byte_array = float_to_bytearray(counter) + read_byte_array = integer_to_bytearray(counter) payload = reset_byte_array + read_byte_array message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, @@ -216,8 +216,8 @@ if reset == RESET: str_res = "reset back to normal" else: - str_res = str(conductivity) + " celsius" - self.logger.debug("override conductivity sensor value for sensor " + str(sensor) + ": " + str_res) + str_res = str(counter) + self.logger.debug("override baro sensor value for sensor " + ": " + str_res) # Send message received_message = self.can_interface.send(message) @@ -230,7 +230,7 @@ self.logger.error("Timeout!!!!") return False - def cmd_baro_sensor_crc_override(self, counter: float, reset: int = NO_RESET) -> int: + def cmd_baro_sensor_crc_override(self, crc: int, reset: int = NO_RESET) -> int: """ Constructs and sends the temperature value override command @@ -242,19 +242,13 @@ """ reset_byte_array = integer_to_bytearray(reset) - read_byte_array = float_to_bytearray(counter) + read_byte_array = integer_to_bytearray(crc) payload = reset_byte_array + read_byte_array message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, message_id=MsgIds.MSG_ID_DD_TEMPERATURE_SENSOR_BARO_CRC_OVERRIDE_REQUEST.value, payload=payload) - if reset == RESET: - str_res = "reset back to normal" - else: - str_res = str(conductivity) + " celsius" - self.logger.debug("override conductivity sensor value for sensor " + str(sensor) + ": " + str_res) - # Send message received_message = self.can_interface.send(message)