Index: dialin/dg/dialysate_fill.py
===================================================================
diff -u -r206fbc70f59d5b96203f24295ca2a2e7860289c2 -r0c80eb0ceebddeebf016dda84016b8cf0662de66
--- dialin/dg/dialysate_fill.py	(.../dialysate_fill.py)	(revision 206fbc70f59d5b96203f24295ca2a2e7860289c2)
+++ dialin/dg/dialysate_fill.py	(.../dialysate_fill.py)	(revision 0c80eb0ceebddeebf016dda84016b8cf0662de66)
@@ -51,11 +51,11 @@
         self.avg_bicarb = 0.0
         self.first_fill = False
         self.pctDiffConduct = 0.0
-        self.used_acid = 0.0
-        self.used_bicarb = 0.0
         self.total_volume = 0.0
-        self.dg_fill_mode_timestamp = 0.0
         self.ro_only_mode_status = 0
+        self.bad_fill_signal = 0
+        self.bad_fill_state = 0
+        self.dg_fill_mode_timestamp = 0.0
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.dg_sync_broadcast_ch_id
@@ -68,14 +68,14 @@
         Gets the current concentrate pump data value
 
         @return: List containing fill mode data values:
-            [ avg_acid, avg_bicarb, first_fill,
-              pctDiffConduct, used_acid, used_bicarb, total_volume ]
+            [ avg_acid, avg_bicarb, first_fill, pctDiffConduct, used_acid, used_bicarb, total_volume,
+             ro_only_mode_status, bad_fill_signal, bad_fill_state ]
         """
-        return [self.avg_acid, self.avg_bicarb, self.first_fill,
-                self.pctDiffConduct, self.used_acid, self.used_bicarb, self.total_volume]
+        return [self.avg_acid, self.avg_bicarb, self.first_fill, self.pctDiffConduct, self.total_volume,
+                self.ro_only_mode_status, self.bad_fill_signal, self.bad_fill_state]
 
-    @publish(["dg_fill_mode_timestamp","avg_acid", "avg_bicarb", "first_fill", "pctDiffConduct", "used_acid",
-              "used_bicarb", "total_volume", "ro_only_mode_status"])
+    @publish(["dg_fill_mode_timestamp","avg_acid", "avg_bicarb", "first_fill", "pctDiffConduct", "total_volume",
+              "ro_only_mode_status", "bad_fill_signal", "bad_fill_state"])
     def _handler_fill_mode_monitor_sync(self, message, timestamp=0.0):
         """
         Handles published dialysate fill mode data' data messages. Dialysate fill data are captured
@@ -92,13 +92,13 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
         self.pctDiffConduct = struct.unpack('<f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        self.used_acid = struct.unpack('<f', bytearray(
+        self.total_volume = struct.unpack('<f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
-        self.used_bicarb = struct.unpack('<f', bytearray(
+        self.ro_only_mode_status = struct.unpack('<i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
-        self.total_volume = struct.unpack('<f', bytearray(
+        self.bad_fill_signal = struct.unpack('<i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
-        self.ro_only_mode_status = struct.unpack('<i', bytearray(
+        self.bad_fill_state = struct.unpack('<i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
         self.dg_fill_mode_timestamp = timestamp