Index: leahi_dialin/common/dd_defs.py =================================================================== diff -u -rd2697fb12fc381fed6e7fb0820ec6486513243f6 -re9a1b8796610fd165c45a0a2c9c2034e00a77546 --- leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision d2697fb12fc381fed6e7fb0820ec6486513243f6) +++ leahi_dialin/common/dd_defs.py (.../dd_defs.py) (revision e9a1b8796610fd165c45a0a2c9c2034e00a77546) @@ -190,8 +190,7 @@ D29_COND = 2 # Water, Bicarbonate, and Acid Collective Conductivity Sensor D43_COND = 3 # Self Test Conductivity Sensor (not used for dialysate conductivity) D74_COND = 4 # Water and Bicarbonate Collective Conductivity Sensor - D98_COND = 5 # D98 Conductivity Sensor - NUM_OF_CONDUCTIVITY_SENSORS = 6 # Number of Conductivity Sensors + NUM_OF_CONDUCTIVITY_SENSORS = 5 # Number of Conductivity Sensors @unique class DDDialysatePumpsEnum(DialinEnum): @@ -265,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): Index: leahi_dialin/dd/modules/conductivity_sensors.py =================================================================== diff -u -rd2697fb12fc381fed6e7fb0820ec6486513243f6 -re9a1b8796610fd165c45a0a2c9c2034e00a77546 --- leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision d2697fb12fc381fed6e7fb0820ec6486513243f6) +++ leahi_dialin/dd/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision e9a1b8796610fd165c45a0a2c9c2034e00a77546) @@ -54,8 +54,7 @@ DDConductivitySensorsEnum.D27_COND.name: 0.0, DDConductivitySensorsEnum.D29_COND.name: 0.0, DDConductivitySensorsEnum.D43_COND.name: 0.0, - DDConductivitySensorsEnum.D74_COND.name: 0.0, - DDConductivitySensorsEnum.D98_COND.name: 0.0 + DDConductivitySensorsEnum.D74_COND.name: 0.0 } self.dd_conductivity_timestamp = 0.0 @@ -85,9 +84,6 @@ self.dd_conductivity[DDConductivitySensorsEnum.D74_COND.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.dd_conductivity[DDConductivitySensorsEnum.D98_COND.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.dd_conductivity_timestamp = timestamp def cmd_conductivity_sensor_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: Index: leahi_dialin/dd/modules/levels.py =================================================================== diff -u -rd2697fb12fc381fed6e7fb0820ec6486513243f6 -re9a1b8796610fd165c45a0a2c9c2034e00a77546 --- leahi_dialin/dd/modules/levels.py (.../levels.py) (revision d2697fb12fc381fed6e7fb0820ec6486513243f6) +++ leahi_dialin/dd/modules/levels.py (.../levels.py) (revision e9a1b8796610fd165c45a0a2c9c2034e00a77546) @@ -52,7 +52,8 @@ self.dd_level_sensors = { DDLevelSensorEnum.D6_LEVEL.name: 0, DDLevelSensorEnum.D63_LEVEL.name: 0, - DDLevelSensorEnum.D46_LEVEL.name: 0 + DDLevelSensorEnum.D46_LEVEL.name: 0, + DDLevelSensorEnum.D98_LEVEL.name: 0 } self.dd_levels_timestamp = 0 @@ -72,6 +73,8 @@ message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] self.dd_level_sensors[DDLevelSensorEnum.D46_LEVEL.name] = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] + self.dd_level_sensors[DDLevelSensorEnum.D98_LEVEL.name] = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] self.dd_levels_timestamp = timestamp @@ -123,12 +126,11 @@ self.logger.debug("Timeout!!!!") return False - def get_level_sensor_values(self): + def get_chamber_f_sensor_values(self): """ - Docstring for get_level_sensor_values + Gets the level sensor values for chamber F. + + @returns (dict) Returns all sensor values from Chamber F """ - D64_sensor_value = self.dd_level_sensors[DDLevelSensorEnum.D63_LEVEL.name] - D98_sensor_value = DDConductivitySensors(self.can_interface, self.logger).dd_conductivity[DDConductivitySensorsEnum.D98_COND.name] - - return { 'D64': D64_sensor_value, 'D98': D98_sensor_value } + return { 'D64': self.dd_level_sensors[DDLevelSensorEnum.D63_LEVEL.name], 'D98': self.dd_level_sensors[DDLevelSensorEnum.D98_LEVEL.name] }