Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r272d33ed055f9d107788a17a76f2b9bc5bb510aa -r5f16af73fb80a76c6dc767661f11a8f3508770a1
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 272d33ed055f9d107788a17a76f2b9bc5bb510aa)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 5f16af73fb80a76c6dc767661f11a8f3508770a1)
@@ -1187,17 +1187,21 @@
 @unique
 class DDServiceRecordFields(RecordsBaseEnum):
     IS_HDF_ONLINE_FLUID             = (0, DataTypes.BOOL)       # DD Is HDF Online
-    WATER_RECOVERY                  = (1, DataTypes.U32)        # DD Water Recovery
-    SERVICE_LOC                     = (2, DataTypes.U08)        # DD service location
-    LAST_SERVICE_EPOCH_DATE         = (3, DataTypes.U32)        # DD last service date in epoch
-    SERVICE_INTERVAL_SECONDS        = (4, DataTypes.U32)        # DD service interval in seconds
-    LAST_RESET_TIME_EPOCH           = (5, DataTypes.U32)        # Last time the record was reset in epoch
-    NUM_OF_SERVICE_RECORD_FIELDS    = (6, DataTypes.NONE)       # Number of Service Record Fields
+    UF_1_REPLACEMENT_DATE           = (1, DataTypes.U32)        # Last replacement date of Ultrafilter 1
+    UF_2_REPLACEMENT_DATE           = (2, DataTypes.U32)        # Last replacement date of Ultrafilter 2
+    UF_PUMP_TUBING_REPLACEMENT_DATE = (3, DataTypes.U32)        # Last replacement date of UF Pump Tubing
+    SERVICE_LOC                     = (4, DataTypes.U32)        # DD service location
+    LAST_SERVICE_EPOCH_DATE         = (5, DataTypes.U32)        # DD last service date in epoch
+    SERVICE_INTERVAL_SECONDS        = (6, DataTypes.U32)        # DD service interval in seconds
+    LAST_RESET_TIME_EPOCH           = (7, DataTypes.U32)        # Last time the record was reset in epoch
+    NUM_OF_SERVICE_RECORD_FIELDS    = (8, DataTypes.NONE)       # Number of Service Record Fields
 
 DDServiceRecordFields._str_list = {
     # Official Name :               Accepted strings
     'IS_HDF_ONLINE_FLUID': [],
-    'WATER_RECOVERY': [],
+    'UF_1_REPLACEMENT_DATE': [],
+    'UF_2_REPLACEMENT_DATE': [],
+    'UF_PUMP_TUBING_REPLACEMENT_DATE': [],
     'SERVICE_LOC': [],
     'LAST_SERVICE_EPOCH_DATE': [],
     'SERVICE_INTERVAL_SECONDS': [],
@@ -1288,17 +1292,29 @@
 class DDUsageInformationRecordFields(RecordsBaseEnum):
     RO_WATER_GEN_TOTAL_L                        = (0, DataTypes.F32)        # Total RO water generated in liters. (Cannot be reset)
     RO_WATER_GEN_SINCE_LAST_SERVICE_L           = (1, DataTypes.F32)        # RO water generated since last treatment in liters
-    LAST_BASIC_FLUSH_COMPLETE_DATE_EPOCH        = (2, DataTypes.U32)        # Last basic flush complete date in epoch.
-    LAST_HEAT_DISINFECT_COMPLETE_DATE_EPOCH     = (3, DataTypes.U32)        # Last heat disinfect complete date in epoch.
-    LAST_HEAT_ACTIVE_COOL_COMPLETE_DATE_EPOCH   = (4, DataTypes.U32)        # Last heat disinfect active cool complete date in epoch.
-    LAST_FILTER_FLUSH_COMPLETE_DATE_EPOCH       = (5, DataTypes.U32)        # Last filter flush complete date in epoch.
-    LAST_RESET_TIME_EPOCH                       = (6, DataTypes.U32)        # Last time the record was reset in epoch.
-    NUM_OF_USAGE_INFO_RECORD_FIELDS             = (7, DataTypes.NONE)       # Number of Usage Information Record Fields
+    UF_1_TREATMENT_COUNT                        = (2, DataTypes.U32)        # Number of treatments performed on ultrafilter 1 since last replaced
+    UF_1_DISINFECTION_COUNT                     = (3, DataTypes.U32)        # Number of disinfections performed on ultrafilter 1 since last replaced
+    UF_2_TREATMENT_COUNT                        = (4, DataTypes.U32)        # Number of treatments performed on ultrafilter 2 since last replaced
+    UF_2_DISINFECTION_COUNT                     = (5, DataTypes.U32)        # Number of disinfections performed on ultrafilter 2 since last replaced
+    UF_PUMP_TUBING_TREATMENT_COUNT              = (6, DataTypes.U32)        # Number of treatments performed on UF Pump Tubing since last replaced
+    UF_PUMP_TUBING_DISINFECTION_COUNT           = (7, DataTypes.U32)        # Number of disinfections performed on UF Pump Tubing since last replaced
+    LAST_BASIC_FLUSH_COMPLETE_DATE_EPOCH        = (8, DataTypes.U32)        # Last basic flush complete date in epoch.
+    LAST_HEAT_DISINFECT_COMPLETE_DATE_EPOCH     = (9, DataTypes.U32)        # Last heat disinfect complete date in epoch.
+    LAST_HEAT_ACTIVE_COOL_COMPLETE_DATE_EPOCH   = (10, DataTypes.U32)       # Last heat disinfect active cool complete date in epoch.
+    LAST_FILTER_FLUSH_COMPLETE_DATE_EPOCH       = (11, DataTypes.U32)       # Last filter flush complete date in epoch.
+    LAST_RESET_TIME_EPOCH                       = (12, DataTypes.U32)       # Last time the record was reset in epoch.
+    NUM_OF_USAGE_INFO_RECORD_FIELDS             = (13, DataTypes.NONE)      # Number of Usage Information Record Fields
 
 DDUsageInformationRecordFields._str_list = {
     # Official Name :               Accepted strings
     'RO_WATER_GEN_TOTAL_L': [],
     'RO_WATER_GEN_SINCE_LAST_SERVICE_L': [],
+    'UF_1_TREATMENT_COUNT': [],
+    'UF_1_DISINFECTION_COUNT': [],
+    'UF_2_TREATMENT_COUNT': [],
+    'UF_2_DISINFECTION_COUNT': [],
+    'UF_PUMP_TUBING_TREATMENT_COUNT': [],
+    'UF_PUMP_TUBING_DISINFECTION_COUNT': [],
     'LAST_BASIC_FLUSH_COMPLETE_DATE_EPOCH': [],
     'LAST_HEAT_DISINFECT_COMPLETE_DATE_EPOCH': [],
     'LAST_HEAT_ACTIVE_COOL_COMPLETE_DATE_EPOCH': [],