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] }