Index: leahi_dialin/dd/modules/gen_dialysate.py =================================================================== diff -u -r0bdafdb1821e164a8416ea4b47be946f13239b5a -r410054cfec7aee839266233249413b08b368fbd3 --- leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 0bdafdb1821e164a8416ea4b47be946f13239b5a) +++ leahi_dialin/dd/modules/gen_dialysate.py (.../gen_dialysate.py) (revision 410054cfec7aee839266233249413b08b368fbd3) @@ -50,12 +50,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 @@ -77,27 +71,14 @@ @param message: published gen dialysate data message @return: None """ - self.execution_state = struct.unpack('I', bytearray( 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 @@ -112,7 +93,6 @@ @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise """ - return cmd_generic_broadcast_interval_override( ms = ms, reset = reset, @@ -132,7 +112,6 @@ @return: 1 if successful, zero otherwise """ - reset_byte_array = integer_to_bytearray(reset) inprog = integer_to_bytearray(in_progress) payload = reset_byte_array + inprog @@ -157,7 +136,6 @@ @return: 1 if successful, zero otherwise """ - reset_byte_array = integer_to_bytearray(reset) dev = integer_to_bytearray(delivery) payload = reset_byte_array + dev @@ -182,7 +160,6 @@ @return: 1 if successful, zero otherwise """ - reset_byte_array = integer_to_bytearray(reset) tmp = float_to_bytearray(temperature) payload = reset_byte_array + tmp @@ -207,7 +184,6 @@ @return: 1 if successful, zero otherwise """ - sts = integer_to_bytearray(state) payload = sts @@ -231,7 +207,6 @@ @return: 1 if successful, zero otherwise """ - reset_value = integer_to_bytearray(reset) interval_value = integer_to_bytearray(state) payload = reset_value + interval_value