Index: leahi_dialin/common/generic_defs.py
===================================================================
diff -u -r1f7b5ac840adf6740b023706fcb73691c33a9be7 -r5d919ffa14be669314a6a1c233ea820e7302a44a
--- leahi_dialin/common/generic_defs.py	(.../generic_defs.py)	(revision 1f7b5ac840adf6740b023706fcb73691c33a9be7)
+++ leahi_dialin/common/generic_defs.py	(.../generic_defs.py)	(revision 5d919ffa14be669314a6a1c233ea820e7302a44a)
@@ -21,6 +21,7 @@
 from .disp_defs import AcidTypes, BicarbTypes
 
 
+# ================================================== Enum Creators: DataTypes ==================================================
 @unique
 class DataTypes(DialinEnum):
     NONE                = (0, '<I', 4)                           # No Data Type                          - Random 4 bytes value to keep order
@@ -65,6 +66,8 @@
 }
 
 
+
+# ================================================== Enum Creators: Record Base ==================================================
 @unique
 class RecordsBaseEnum(DialinEnum):
     def __new__(cls, value, unpack_type, unpack_length: int=1):
@@ -81,68 +84,10 @@
         return self.unpack_length
 
 
-@unique
-class RecordTypes(DialinEnum):
-    SYSTEM_RECORD               = 0                    # System Record
-    SERVICE_RECORD              = 1                    # System Record
-    CALIBRATION_RECORD          = 2                    # System Record
-    INSTITUTIONAL_RECORD        = 3                    # System Record
-    USAGE_INFORMATION_RECORD    = 4                    # System Record
-    NUM_OF_RECORD_TYPES         = 5                    # Number of Record Types
 
-RecordTypes._str_list = {
-    # Official Name :               Accepted strings
-    'SYSTEM_RECORD': [],
-    'SERVICE_RECORD': [],
-    'CALIBRATION_RECORD': [],
-    'INSTITUTIONAL_RECORD': [],
-    'USAGE_INFORMATION_RECORD': [],
-    'NUM_OF_RECORD_TYPES': [],
-}
-
-
+# ================================================== Enum Creators: Record Sub Fields ==================================================
 @unique
-class SystemRecordFields(RecordsBaseEnum):
-    TOP_LEVEL_PN                = (0, DataTypes.U08, 10)        # Top level part number
-    TOP_LEVEL_SN                = (1, DataTypes.U08, 20)        # Top level serial number
-    MFG_LOCATION                = (2, DataTypes.U32)            # Manufacturing Location
-    MFG_DATE                    = (3, DataTypes.U32)            # Manufacturing Date
-    CRC                         = (4, DataTypes.U16)            # CRC
-    NUM_OF_SYSTEM_RECORD_FIELDS = (5, DataTypes.NONE)           # Number of System Record Fields
-
-SystemRecordFields._str_list = {
-    # Official Name :               Accepted strings
-    'TOP_LEVEL_PN': ['pn', 'part number'],
-    'TOP_LEVEL_SN': ['sn', 'serial number'],
-    'MFG_LOCATION': ['location', 'manufacturing location'],
-    'MFG_DATE': ['date', 'manufacturing date'],
-    'CRC': [],
-    'NUM_OF_SYSTEM_RECORD_FIELDS': [],
-}
-
-
-@unique
-class ServiceRecordFields(DialinEnum):
-    SERVICE_LOC                     = (0, DataTypes.U08)        # DD service location
-    LAST_SERVICE_EPOCH_DATE         = (1, DataTypes.U32)        # DD last service date in epoch
-    SERVICE_INTERVAL_SECONDS        = (2, DataTypes.U32)        # DD service interval in seconds
-    LAST_RESET_TIME_EPOCH           = (3, DataTypes.U32)        # Last time the record was reset in epoch
-    CRC                             = (4, DataTypes.U16)        # CRC
-    NUM_OF_SERVICE_RECORD_FIELDS    = (5, DataTypes.NONE)       # Number of Service Record Fields
-
-ServiceRecordFields._str_list = {
-    # Official Name :               Accepted strings
-    'SERVICE_LOC': [],
-    'LAST_SERVICE_EPOCH_DATE': [],
-    'SERVICE_INTERVAL_SECONDS': [],
-    'LAST_RESET_TIME_EPOCH': [],
-    'CRC': [],
-    'NUM_OF_SERVICE_RECORD_FIELDS': [],
-}
-
-
-@unique
-class CalibRecordAccelerometerFields(DialinEnum):
+class CalibRecordAccelerometerFields(RecordsBaseEnum):
     ACCEL_X_OFFSET                                  = (0, DataTypes.F32)        # DD accelerometer X axis offset
     ACCEL_Y_OFFSET                                  = (1, DataTypes.F32)        # DD accelerometer Y axis offset
     ACCEL_Z_OFFSET                                  = (2, DataTypes.F32)        # DD accelerometer Z axis offset
@@ -162,7 +107,7 @@
 
 
 @unique
-class CalibRecordBloodLeakFields(DialinEnum):
+class CalibRecordBloodLeakFields(RecordsBaseEnum):
     SET_POINT                                   = (0, DataTypes.F32)        # DD Blood leak sensor set point
     CALIBRATION_TIME                            = (3, DataTypes.U32)        # Calibration time
     CRC                                         = (4, DataTypes.U16)        # CRC
@@ -178,7 +123,7 @@
 
 
 @unique
-class CalibRecordConcentrateFields(DialinEnum):
+class CalibRecordConcentrateFields(RecordsBaseEnum):
     CONCENTRATE_MIX_RATIO                           = (0, DataTypes.F32)        # Acid or Bicarb Concentrate mix ratio.
     FULL_BOTTLE_VOLUME_ML                           = (1, DataTypes.F32)        # Acid or Bicarb full bottle volume in milliliters.
     CONDUCTIVITY_USPCM                              = (2, DataTypes.F32)        # Acid or Bicarb conductivity in uS/cm.
@@ -200,7 +145,7 @@
 
 
 @unique
-class CalibRecordSensorFields(DialinEnum):
+class CalibRecordSensorFields(RecordsBaseEnum):
     FORTH_ORDER_COEFF                       = (0, DataTypes.F32)        # Sensor's Fourth order coefficient
     THIRD_ORDER_COEFF                       = (1, DataTypes.F32)        # Sensor's Third order coefficient
     SECOND_ORDER_COEFF                      = (2, DataTypes.F32)        # Sensor's Second order coefficient
@@ -223,71 +168,144 @@
 }
 
 
+# ================================================== Enum Creators: Record Fields ==================================================
 @unique
-class CalibrationRecordFields(DialinEnum):
+class RecordTypes(DialinEnum):
+    SYSTEM_RECORD               = 0                    # System Record
+    SERVICE_RECORD              = 1                    # System Record
+    CALIBRATION_RECORD          = 2                    # System Record
+    INSTITUTIONAL_RECORD        = 3                    # System Record
+    USAGE_INFORMATION_RECORD    = 4                    # System Record
+    NUM_OF_RECORD_TYPES         = 5                    # Number of Record Types
+
+RecordTypes._str_list = {
+    # Official Name :               Accepted strings
+    'SYSTEM_RECORD': [],
+    'SERVICE_RECORD': [],
+    'CALIBRATION_RECORD': [],
+    'INSTITUTIONAL_RECORD': [],
+    'USAGE_INFORMATION_RECORD': [],
+    'NUM_OF_RECORD_TYPES': [],
+}
+
+
+@unique
+class SystemRecordFields(RecordsBaseEnum):
+    TOP_LEVEL_PN                = (0, DataTypes.U08, 10)        # Top level part number
+    TOP_LEVEL_SN                = (1, DataTypes.U08, 20)        # Top level serial number
+    MFG_LOCATION                = (2, DataTypes.U32)            # Manufacturing Location
+    MFG_DATE                    = (3, DataTypes.U32)            # Manufacturing Date
+    CRC                         = (4, DataTypes.U16)            # CRC
+    NUM_OF_SYSTEM_RECORD_FIELDS = (5, DataTypes.NONE)           # Number of System Record Fields
+
+SystemRecordFields._str_list = {
+    # Official Name :               Accepted strings
+    'TOP_LEVEL_PN': ['pn', 'part number'],
+    'TOP_LEVEL_SN': ['sn', 'serial number'],
+    'MFG_LOCATION': ['location', 'manufacturing location'],
+    'MFG_DATE': ['date', 'manufacturing date'],
+    'CRC': [],
+    'NUM_OF_SYSTEM_RECORD_FIELDS': [],
+}
+
+
+@unique
+class ServiceRecordFields(RecordsBaseEnum):
+    SERVICE_LOC                     = (0, DataTypes.U08)        # DD service location
+    LAST_SERVICE_EPOCH_DATE         = (1, DataTypes.U32)        # DD last service date in epoch
+    SERVICE_INTERVAL_SECONDS        = (2, DataTypes.U32)        # DD service interval in seconds
+    LAST_RESET_TIME_EPOCH           = (3, DataTypes.U32)        # Last time the record was reset in epoch
+    CRC                             = (4, DataTypes.U16)        # CRC
+    NUM_OF_SERVICE_RECORD_FIELDS    = (5, DataTypes.NONE)       # Number of Service Record Fields
+
+ServiceRecordFields._str_list = {
+    # Official Name :               Accepted strings
+    'SERVICE_LOC': [],
+    'LAST_SERVICE_EPOCH_DATE': [],
+    'SERVICE_INTERVAL_SECONDS': [],
+    'LAST_RESET_TIME_EPOCH': [],
+    'CRC': [],
+    'NUM_OF_SERVICE_RECORD_FIELDS': [],
+}
+
+
+@unique
+class CalibrationRecordFields(RecordsBaseEnum):
     def __new__(cls):
         obj = object.__new__(cls)
         i = 0
         for pres_sensor in DDPressureSensorNames:
             for field_name in CalibRecordSensorFields:
-                obj._name_ = f'{pres_sensor.name}_{field_name.name}'
+                obj._name_ = f'PRES__{pres_sensor.name}__{field_name.name}'
                 obj._value_ = i
+                obj.unpack_type = field_name.datatype()
+                obj.multichar_length = 1
                 i += 1
         for temp_sensor in DDTemperatureSensorNames:
             for field_name in CalibRecordSensorFields:
-                obj._name_ = f'{temp_sensor.name}_{field_name.name}'
+                obj._name_ = f'TEMP__{temp_sensor.name}__{field_name.name}'
                 obj._value_ = i
+                obj.unpack_type = field_name.datatype()
+                obj.multichar_length = 1
                 i += 1
         for conc_pump in DDConcentratePumpNames:
             for field_name in CalibRecordSensorFields:
-                obj._name_ = f'{conc_pump.name}_{field_name.name}'
+                obj._name_ = f'CONC__{conc_pump.name}__{field_name.name}'
                 obj._value_ = i
+                obj.unpack_type = field_name.datatype()
+                obj.multichar_length = 1
                 i += 1
         for dial_pump in DDDialysatePumpNames:
             # Custom request for D12 to include Target Speed
             if dial_pump is DDDialysatePumpNames.D12_PUMP:
-                obj._name_ = f'{dial_pump.name}_TARGET_SPEED'
+                obj._name_ = f'DIAL__{dial_pump.name}__TARGET_SPEED'
                 obj._value_ = i
+                obj.unpack_type = field_name.datatype()
+                obj.multichar_length = 1
                 i += 1
             for field_name in CalibRecordSensorFields:
-                obj._name_ = f'{dial_pump.name}_{field_name.name}'
+                obj._name_ = f'DIAL__{dial_pump.name}__{field_name.name}'
                 obj._value_ = i
+                obj.unpack_type = field_name.datatype()
+                obj.multichar_length = 1
                 i += 1
         for acid in AcidTypes:
             for field_name in CalibRecordConcentrateFields:
-                obj._name_ = f'{acid.name}_{field_name.name}'
+                obj._name_ = f'ACID__{acid.name}__{field_name.name}'
                 obj._value_ = i
+                obj.unpack_type = field_name.datatype()
+                obj.multichar_length = 1
                 i += 1
         for bicarb in BicarbTypes:
             for field_name in CalibRecordConcentrateFields:
-                obj._name_ = f'{bicarb.name}_{field_name.name}'
+                obj._name_ = f'BICARB__{bicarb.name}__{field_name.name}'
                 obj._value_ = i
+                obj.unpack_type = field_name.datatype()
+                obj.multichar_length = 1
                 i += 1
-        for bicarb in BicarbTypes:
-            for field_name in CalibRecordConcentrateFields:
-                obj._name_ = f'{bicarb.name}_{field_name.name}'
-                obj._value_ = i
-                i += 1
         # Accelerometer
         for field_name in CalibRecordAccelerometerFields:
-            obj._name_ = f'ACCEL_{field_name.name}'
+            obj._name_ = f'ACCEL__{field_name.name}'
             obj._value_ = i
+            obj.unpack_type = field_name.datatype()
+            obj.multichar_length = 1
             i += 1
         # Blood Leak sensor
         for field_name in CalibRecordBloodLeakFields:
-            obj._name_ = f'BLOOD_LEAK_{field_name.name}'
+            obj._name_ = f'BLOOD_LEAK__{field_name.name}'
             obj._value_ = i
+            obj.unpack_type = field_name.datatype()
+            obj.multichar_length = 1
             i += 1
+        obj._name_ = 'NUM_OF_CALIBRATION_RECORD_FIELDS'
+        obj._value_ = i
+        obj.unpack_type = DataTypes.NONE
+        obj.multichar_length = 1
         return obj
 
-    # Dialysate Pump
-    # Acid concentrates
-    # Bicarb Concentrates
-    # Accelerometer
-    # Blood Leak sensor
 
 @unique
-class InstitutionalRecordFields(DialinEnum):
+class InstitutionalRecordFields(RecordsBaseEnum):
     MIN_DIALYSATE_SYSTEM_FLOW_MLPM          = (0, DataTypes.U32)        # Min dialysate flow in mL/min
     MAX_DIALYSATE_SYSTEM_FLOW_MLPM          = (1, DataTypes.U32)        # Max dialysate flow in mL/min
     MIN_DIALYSATE_TEMP_C                    = (2, DataTypes.F32)        # Min dialysate temperature in C
@@ -341,7 +359,7 @@
 
 
 @unique
-class UsageInformationRecordFields(DialinEnum):
+class UsageInformationRecordFields(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.
@@ -363,4 +381,4 @@
     'LAST_RESET_TIME_EPOCH': [],
     'CRC': [],
     'NUM_OF_USAGE_INFO_RECORD_FIELDS': [],
-}
\ No newline at end of file
+}