Index: leahi_dialin/dd/modules/gen_dialysate.py =================================================================== diff -u -r0d41ec2fd13ad36c344b6a8a7c2b88ef18e057b7 -r3b5cc3a0277570a12df2ec7d5f6a6b54ce70f40b --- leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 0d41ec2fd13ad36c344b6a8a7c2b88ef18e057b7) +++ leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 3b5cc3a0277570a12df2ec7d5f6a6b54ce70f40b) @@ -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,22 +74,10 @@ 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] + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] self.targetQd = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] self.dd_gen_dialysate_timestamp = timestamp def cmd_gen_dialysate_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: