Index: leahi_dialin/dd/modules/gen_dialysate.py =================================================================== diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 --- leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df) +++ leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2) @@ -51,6 +51,7 @@ self.dialysate_delivery_in_progress = 0 self.dialysate_good_to_deliver = 0 self.targetQd = 0.0 + self.isBalancingChamberSwitchingActive = 0 self.dd_gen_dialysate_timestamp = 0 @@ -62,6 +63,7 @@ "d18_pressure", "d51_pressure", "dialysate_good_to_deliver", "targetQd", + "isBalancingChamberSwitchingActive", "dd_gen_dialysate_timestamp"]) def _handler_gen_dialysate_sync(self, message, timestamp=0.0): """ @@ -74,10 +76,24 @@ 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.dialysate_good_to_deliver = struct.unpack('I', bytearray( + self.d6_level = struct.unpack('I', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] - self.targetQd = struct.unpack('f', bytearray( + self.d63_level = struct.unpack('f', 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( + message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] + self.isBalancingChamberSwitchingActive = struct.unpack('I', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0] self.dd_gen_dialysate_timestamp = timestamp