Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -r7ce778dc51b7dba5a7a7ca14244ed7eea7bf029d -r5681154cdaaf629c997dc05472657bf40c94d6e1 --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 7ce778dc51b7dba5a7a7ca14244ed7eea7bf029d) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 5681154cdaaf629c997dc05472657bf40c94d6e1) @@ -143,11 +143,12 @@ @unique class FPFloaterLevels(DialinEnum): - LEVEL_STATE_LOW = 0 # Low level for the FP Floater Level Sensors - LEVEL_STATE_MEDIUM = 1 # Medium level for the FP Floater Level Sensors - LEVEL_STATE_HIGH = 2 # High level for the FP Floater Level Sensors - LEVEL_STATE_ILLEGAL = 3 # Illegal level for FP Floater Level Sensor (indicates investigation) - NUM_OF_LEVEL_STATES = 4 # Number of Level States + LEVEL_STATE_EMPTY = 0 # Empty level for the FP Floater Level Sensors + LEVEL_STATE_LOW = 1 # Low level for the FP Floater Level Sensors + LEVEL_STATE_MEDIUM = 2 # Medium level for the FP Floater Level Sensors + LEVEL_STATE_HIGH = 3 # High level for the FP Floater Level Sensors + LEVEL_STATE_ILLEGAL = 4 # Illegal level for FP Floater Level Sensor (indicates investigation) + NUM_OF_LEVEL_STATES = 5 # Number of Level States @unique class FPFloaterLevelSensorNames(DialinEnum): Index: leahi_dialin/dd/modules/gen_dialysate.py =================================================================== diff -u -r0d41ec2fd13ad36c344b6a8a7c2b88ef18e057b7 -r5681154cdaaf629c997dc05472657bf40c94d6e1 --- leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 0d41ec2fd13ad36c344b6a8a7c2b88ef18e057b7) +++ leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 5681154cdaaf629c997dc05472657bf40c94d6e1) @@ -49,12 +49,6 @@ self.execution_state = 0 self.dialysate_delivery_in_progress = 0 - self.d6_level = 0 - self.d63_level = 0 - self.d46_level = 0 - self.d9_pressure = 0.0 - self.d18_pressure = 0.0 - self.d51_pressure = 0.0 self.dialysate_good_to_deliver = 0 self.targetQd = 0.0 self.dd_gen_dialysate_timestamp = 0 @@ -80,18 +74,6 @@ message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] self.dialysate_delivery_in_progress = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] - self.d6_level = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.d63_level = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.d46_level = struct.unpack('I', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.d9_pressure = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.d18_pressure = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.d51_pressure = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] self.dialysate_good_to_deliver = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] self.targetQd = struct.unpack('f', bytearray( Index: leahi_dialin/dd/modules/levels.py =================================================================== diff -u -r7546656fb0fdcdbf3db79c69a891ed3b085f95e4 -r5681154cdaaf629c997dc05472657bf40c94d6e1 --- leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 7546656fb0fdcdbf3db79c69a891ed3b085f95e4) +++ leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 5681154cdaaf629c997dc05472657bf40c94d6e1) @@ -54,11 +54,11 @@ DDLevelSensorEnum.D46_LEVEL.name: 0, DDLevelSensorEnum.D98_LEVEL.name: 0 } - + self.dd_bicarb_level = 0 self.dd_levels_timestamp = 0 - @publish(["msg_id_dd_level_data", "dd_level_sensors", "dd_levels_timestamp"]) + @publish(["msg_id_dd_level_data", "dd_level_sensors", "dd_bicarb_level", "dd_levels_timestamp"]) def _handler_levels_sync(self, message, timestamp=0.0): """ Handles published levels message @@ -70,10 +70,12 @@ message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] self.dd_level_sensors[DDLevelSensorEnum.D63_LEVEL.name] = struct.unpack('i', bytearray( 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_3:MsgFieldPositions.END_POS_FIELD_3]))[0] + self.dd_bicarb_level = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] + self.dd_level_sensors[DDLevelSensorEnum.D46_LEVEL.name] = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] self.dd_levels_timestamp = timestamp @@ -124,12 +126,3 @@ else: self.logger.debug("Timeout!!!!") return False - - def get_chamber_f_sensor_values(self): - """ - Gets the level sensor values for chamber F. - - @returns (dict) Returns all sensor values from Chamber F - """ - - return { 'D64': self.dd_level_sensors[DDLevelSensorEnum.D63_LEVEL.name], 'D98': self.dd_level_sensors[DDLevelSensorEnum.D98_LEVEL.name] } Index: leahi_dialin/dd/modules/temperature_sensors.py =================================================================== diff -u -r7546656fb0fdcdbf3db79c69a891ed3b085f95e4 -r5681154cdaaf629c997dc05472657bf40c94d6e1 --- leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 7546656fb0fdcdbf3db79c69a891ed3b085f95e4) +++ leahi_dialin/dd/modules/temperature_sensors.py (.../temperature_sensors.py) (revision 5681154cdaaf629c997dc05472657bf40c94d6e1) @@ -42,6 +42,7 @@ DDTemperaturesNames.D78_TEMP.name: 0.0, DDTemperaturesNames.D4_TEMP.name: 0.0, DDTemperaturesNames.D50_TEMP.name: 0.0, + DDTemperaturesNames.D99_TEMP.name: 0.0, DDTemperaturesNames.BRD_TEMP.name: 0.0, DDTemperaturesNames.D16_TEMP.name: 0.0, DDTemperaturesNames.D28_TEMP.name: 0.0, @@ -50,15 +51,15 @@ DDTemperaturesNames.D75_TEMP.name: 0.0, DDTemperaturesNames.D4_AVG_TEMP.name: 0.0, DDTemperaturesNames.D50_AVG_TEMP.name: 0.0, + DDTemperaturesNames.D99_AVG_TEMP.name: 0.0, DDTemperaturesNames.D28_AVG_TEMP.name: 0.0, DDTemperaturesNames.D30_AVG_TEMP.name: 0.0, DDTemperaturesNames.D66_TEMP.name: 0.0, DDTemperaturesNames.D51_TEMP.name: 0.0, DDTemperaturesNames.D18_TEMP.name: 0.0, DDTemperaturesNames.D41_TEMP.name: 0.0, - DDTemperaturesNames.D87_TEMP.name: 0.0, - DDTemperaturesNames.D99_TEMP.name: 0.0, - DDTemperaturesNames.D99_AVG_TEMP.name: 0.0 + DDTemperaturesNames.D87_TEMP.name: 0.0 + } if self.can_interface is not None: @@ -87,25 +88,25 @@ self.dd_temperatures[DDTemperaturesNames.D50_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] - self.dd_temperatures[DDTemperaturesNames.BRD_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D99_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.dd_temperatures[DDTemperaturesNames.D16_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.BRD_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.dd_temperatures[DDTemperaturesNames.D28_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D16_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.dd_temperatures[DDTemperaturesNames.D30_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D28_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.dd_temperatures[DDTemperaturesNames.D44_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D30_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] - self.dd_temperatures[DDTemperaturesNames.D75_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D44_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - self.dd_temperatures[DDTemperaturesNames.D99_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D75_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] self.dd_temperatures[DDTemperaturesNames.D4_AVG_TEMP.name] = struct.unpack('f', bytearray( @@ -114,13 +115,13 @@ self.dd_temperatures[DDTemperaturesNames.D50_AVG_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0] - self.dd_temperatures[DDTemperaturesNames.D28_AVG_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D99_AVG_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0] - self.dd_temperatures[DDTemperaturesNames.D30_AVG_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D28_AVG_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0] - self.dd_temperatures[DDTemperaturesNames.D99_AVG_TEMP.name] = struct.unpack('f', bytearray( + self.dd_temperatures[DDTemperaturesNames.D30_AVG_TEMP.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0] self.dd_temperatures[DDTemperaturesNames.D9_TEMP.name] = struct.unpack('f', bytearray(