Index: leahi_dialin/dd/modules/gen_dialysate.py
===================================================================
diff -u -rfc671af6d1a18c900812e68c42ca14da3280e4f1 -r39190f5b592ef515e19ae1b5455a32b84f853cf5
--- leahi_dialin/dd/modules/gen_dialysate.py	(.../gen_dialysate.py)	(revision fc671af6d1a18c900812e68c42ca14da3280e4f1)
+++ leahi_dialin/dd/modules/gen_dialysate.py	(.../gen_dialysate.py)	(revision 39190f5b592ef515e19ae1b5455a32b84f853cf5)
@@ -51,15 +51,13 @@
         self.execution_state = 0                                #: The Execution state
         self.dialysate_delivery_in_progress = 0                 #: Is Dialysate delivery in progress or not
         self.dialysate_good_to_deliver = 0                      #: The Dialysate is good to delover or not
-        self.targetQd = 0.0                                     #: The Target Qd
-        self.isBalancingChamberSwitchingActive = 0              #: Is the balancing chamber switching or not
+        self.target_qd = 0.0                                    #: The Target Qd
 
 
     @publish(["msg_id_dd_gen_dialysate_mode_data",
               "execution_state", "dialysate_delivery_in_progress",
               "dialysate_good_to_deliver",
-              "targetQd",
-              "isBalancingChamberSwitchingActive",
+              "target_qd",
               "dd_gen_dialysate_timestamp"])
     def _handler_gen_dialysate_sync(self, message, timestamp=0.0):
         """
@@ -68,28 +66,26 @@
         @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('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]
+        sensor_list =[]
+        sensor_list.append(['self.execution_state', 'I'])
+        sensor_list.append(['self.dialysate_delivery_in_progress', 'I'])
+        # sensor_list.append(['self.d6_level', 'I'])
+        # sensor_list.append(['self.d63_level', 'f'])
+        # sensor_list.append(['self.d46_level', 'I'])
+        # sensor_list.append(['self.d9_pressure', 'f'])
+        # sensor_list.append(['self.d18_pressure', 'f'])
+        # sensor_list.append(['self.d51_pressure', 'f'])
+        sensor_list.append(['self.dialysate_good_to_deliver', 'I'])
+        sensor_list.append(['self.target_qd', 'f'])
+        
+        i = 1
+        for sensor in sensor_list:
+            start_pos = eval(f'MsgFieldPositions.START_POS_FIELD_{i}')
+            end_pos = eval(f'MsgFieldPositions.END_POS_FIELD_{i}')
+            value = struct.unpack(sensor[1],bytearray(message['message'][start_pos:end_pos]))[0]
+            exec(f'{sensor[0]} = {value}')
+            i += 1
+
         self.dd_gen_dialysate_timestamp = timestamp