Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -recd89ae316cd2afa695dd4e93ac18b6004975efb -r9466b5c6b5867f392104a42608aa9542a7ff0358 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision ecd89ae316cd2afa695dd4e93ac18b6004975efb) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 9466b5c6b5867f392104a42608aa9542a7ff0358) @@ -27,17 +27,17 @@ @unique class ConductivitySensorsEnum(DialinEnum): - CD1 = 0 - CD2 = 1 - CD3 = 2 - CD4 = 3 + D17_COND = 0 + D27_COND = 1 + D29_COND = 2 + D43_COND = 3 NUM_OF_CONDUCTIVITY_SENSORS = 4 class DDConductivitySensors(AbstractSubSystem): """ ConductivitySensors - Dialysate Generator (DG) Dialin API sub-class for conductivity sensors related commands. + Dialysate Delivery (DD) API sub-class for conductivity sensors related commands. """ def __init__(self, can_interface, logger: Logger): @@ -56,64 +56,43 @@ self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_conductivity_sensors_sync) - self.ro_rejection_ratio = 0.0 - self.conductivity_sensor_cpi = 0.0 - self.conductivity_sensor_cpo = 0.0 - self.conductivity_sensor_cd1 = 0.0 - self.conductivity_sensor_cd2 = 0.0 + self.d17_cond = 0.0 + self.d27_cond = 0.0 + self.d29_cond = 0.0 + self.d43_cond = 0.0 + self.dd_conductivity_timestamp = 0.0 - self.raw_conductivity_sensor_cpi = 0.0 - self.raw_conductivity_sensor_cpo = 0.0 - self.raw_conductivity_sensor_cd1 = 0.0 - self.raw_conductivity_sensor_cd2 = 0.0 - - self.cpi_sensor_status = 0 - self.cpo_sensor_status = 0 - self.cd1_sensor_status = 0 - self.cd2_sensor_status = 0 - - self.dg_conductivity_timestamp = 0.0 - @publish(["dd_conductivity_timestamp", - "conductivity_sensor_cd1", "conductivity_sensor_cd2", - "conductivity_sensor_cd3", "conductivity_sensor_cd4", - "conductivity_sensor_td1", "conductivity_sensor_td2", - "conductivity_sensor_td3", "conductivity_sensor_td4",]) + "d17_cond", + "d27_cond", + "d29_cond", + "d43_cond"]) def _handler_conductivity_sensors_sync(self, message, timestamp=0.0): """ - Handles published conductivity sensor data messages. Conductivity sensor data are captured + Handles published DD conductivity sensor data messages. DD Conductivity sensor data are captured for reference. - @param message: published conductivity sensor data message + @param message: published DD conductivity sensor data message @return: None """ - self.conductivity_sensor_cd1 = struct.unpack('f', bytearray( + self.d17_cond = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] - self.conductivity_sensor_cd2 = struct.unpack('f', bytearray( + self.d27_cond = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.conductivity_sensor_cd3 = struct.unpack('f', bytearray( + self.d29_cond = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.conductivity_sensor_cd4 = struct.unpack('f', bytearray( + self.d43_cond = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.conductivity_sensor_td1 = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.conductivity_sensor_td2 = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.conductivity_sensor_td3 = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.conductivity_sensor_td4 = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.dd_conductivity_timestamp = timestamp def cmd_conductivity_sensor_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the conductivity sensor data broadcast interval override command Constraints: - Must be logged into DG. - Given interval must be non-zero and a multiple of the DG general task interval (50 ms). + Must be logged into DD. + Given interval must be non-zero and a multiple of the DD general task interval (50 ms). @param ms: integer - interval (in ms) to override with @param reset: integer - 1 to reset a previous override, 0 to override @@ -159,11 +138,6 @@ @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - Conductivity sensor IDs: \n - 0 = CPI \n - 1 = CPO \n - 2 = CD1 \n - 3 = CD2 \n """ reset_byte_array = integer_to_bytearray(reset) @@ -194,10 +168,10 @@ def cmd_conductivity_sensor_temperature_override(self, sensor: int, temperature: float, reset: int = NO_RESET) -> int: """ - Constructs and sends the conductivity value override command + Constructs and sends the conductivity temperature override command @param sensor: unsigned int - sensor ID - @param temperature: float - conductivity value to override sensor with + @param temperature: float - temperature value to override sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise @@ -209,14 +183,14 @@ payload = reset_byte_array + temp_byte_array + sensor_byte_array message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST.value, + message_id=MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST.value, payload=payload) if reset == RESET: str_res = "reset back to normal" else: str_res = str(temperature) - self.logger.debug("override conductivity sensor value for sensor " + str(sensor) + ": " + str_res) + self.logger.debug("override temperature value for conductivity sensor " + str(sensor) + ": " + str_res) # Send message received_message = self.can_interface.send(message) @@ -231,10 +205,10 @@ 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 + Constructs and sends the conductivity read counter override command @param sensor: unsigned int - sensor ID - @param counter: float - conductivity value to override sensor with + @param counter: int - rad count value to override sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise @@ -268,10 +242,10 @@ 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 + Constructs and sends the conductivity error count override command @param sensor: unsigned int - sensor ID - @param counter: float - conductivity value to override sensor with + @param counter: int - error count value to override sensor with @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise