Index: leahi_dialin/common/fp_defs.py
===================================================================
diff -u -r167accc09150c3cf8bb258d7ccf364b8ec673b07 -r5f16af73fb80a76c6dc767661f11a8f3508770a1
--- leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 167accc09150c3cf8bb258d7ccf364b8ec673b07)
+++ leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 5f16af73fb80a76c6dc767661f11a8f3508770a1)
@@ -760,3 +760,53 @@
         DDCalibrationRecordFields._str_list[member] = []
     
     return DDCalibrationRecordFields
+
+
+@unique
+class FPServiceRecordFields(RecordsBaseEnum):
+    WATER_RECOVERY                      = (0, DataTypes.BOOL)       # Low : 0, Medium : 1, High : 2.
+    PRIMARY_FILTER_REPLACEMENT_DATE     = (1, DataTypes.U32)        # Last replacement date of primary carbon filter
+    SECONDARY_FILTER_REPLACEMENT_DATE   = (2, DataTypes.U32)        # Last replacement date of secondary carbon filter
+    RO_MEMBRANE_REPLACEMENT_DATE        = (3, DataTypes.U32)        # Last replacement date of RO Membrane
+    SERVICE_LOC                         = (4, DataTypes.U32)        # FP service location.
+    LAST_SERVICE_EPOCH_DATE             = (5, DataTypes.U32)        # FP last service date in epoch.
+    SERVICE_INTERVAL_SECONDS            = (6, DataTypes.U32)        # FP 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
+
+FPServiceRecordFields._str_list = {
+    # Official Name :               Accepted strings
+    'WATER_RECOVERY': [],
+    'PRIMARY_FILTER_REPLACEMENT_DATE': [],
+    'SECONDARY_FILTER_REPLACEMENT_DATE': [],
+    'RO_MEMBRANE_REPLACEMENT_DATE': [],
+    'SERVICE_LOC': [],
+    'LAST_SERVICE_EPOCH_DATE': [],
+    'SERVICE_INTERVAL_SECONDS': [],
+    'LAST_RESET_TIME_EPOCH': [],
+    'NUM_OF_SERVICE_RECORD_FIELDS': [],
+}
+
+
+@unique
+class FPUsageInformationRecordFields(RecordsBaseEnum):
+    PRIMARY_FILTER_TREATMENT_COUNT              = (0, DataTypes.U32)        # Number of treatments performed on ultrafilter 1 since last replaced
+    PRIMARY_FILTER_DISINFECTION_COUNT           = (1, DataTypes.U32)        # Number of disinfections performed on ultrafilter 1 since last replaced
+    SECONDARY_FILTER_TREATMENT_COUNT            = (2, DataTypes.U32)        # Number of treatments performed on ultrafilter 2 since last replaced
+    SECONDARY_FILTER_DISINFECTION_COUNT         = (3, DataTypes.U32)        # Number of disinfections performed on ultrafilter 2 since last replaced
+    RO_MEMBRANE_TREATMENT_COUNT                 = (4, DataTypes.U32)        # Number of treatments performed on UF Pump Tubing since last replaced
+    RO_MEMBRANE_DISINFECTION_COUNT              = (5, DataTypes.U32)        # Number of disinfections performed on UF Pump Tubing since last replaced
+    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
+
+FPUsageInformationRecordFields._str_list = {
+    # Official Name :               Accepted strings
+    'PRIMARY_FILTER_TREATMENT_COUNT': [],
+    'PRIMARY_FILTER_DISINFECTION_COUNT': [],
+    'SECONDARY_FILTER_TREATMENT_COUNT': [],
+    'SECONDARY_FILTER_DISINFECTION_COUNT': [],
+    'RO_MEMBRANE_TREATMENT_COUNT': [],
+    'RO_MEMBRANE_DISINFECTION_COUNT': [],
+    'LAST_RESET_TIME_EPOCH': [],
+    'NUM_OF_USAGE_INFO_RECORD_FIELDS': [],
+}