Index: leahi_dialin/common/generic_defs.py
===================================================================
diff -u -rba8c32638b676dc71d30d30f3756b63ec14c7170 -rfa06efd219892c67eabb3099a4af3dea4304edb5
--- leahi_dialin/common/generic_defs.py	(.../generic_defs.py)	(revision ba8c32638b676dc71d30d30f3756b63ec14c7170)
+++ leahi_dialin/common/generic_defs.py	(.../generic_defs.py)	(revision fa06efd219892c67eabb3099a4af3dea4304edb5)
@@ -238,36 +238,65 @@
     i = 0
     members = {}
     for pres_sensor in DDPressureSensorNames:
+        if 'num_' in pres_sensor.name.lower():
+            continue
         for field_name in CalibRecordSensorFields:
+            if 'num_' in field_name.name.lower():
+                continue
             members[f'PRES__{pres_sensor.name}__{field_name.name}'] = (i, field_name.datatype())
             i += 1
     for temp_sensor in DDTemperatureSensorNames:
+        if 'num_' in temp_sensor.name.lower():
+            continue
         for field_name in CalibRecordSensorFields:
+            if 'num_' in field_name.name.lower():
+                continue
             members[f'TEMP__{temp_sensor.name}__{field_name.name}'] = (i, field_name.datatype())
             i += 1
     for conc_pump in DDConcentratePumpNames:
+        if 'num_' in conc_pump.name.lower():
+            continue
         for field_name in CalibRecordSensorFields:
+            if 'num_' in field_name.name.lower():
+                continue
             members[f'CONC__{conc_pump.name}__{field_name.name}'] = (i, field_name.datatype())
             i += 1
     for dial_pump in DDDialysatePumpNames:
-        members[f'DIAL__{dial_pump.name}__{field_name.name}__TARGET_SPEED'] = (i, DataTypes.F32)
-        i += 1
+        if 'num_' in dial_pump.name.lower():
+            continue
+        elif 'd48' in dial_pump.name.lower():
+            members[f'DIAL__{dial_pump.name}_TARGET_SPEED'] = (i, DataTypes.F32)
+            i += 1
         for field_name in CalibRecordSensorFields:
+            if 'num_' in field_name.name.lower():
+                continue
             members[f'DIAL__{dial_pump.name}__{field_name.name}'] = (i, field_name.datatype())
             i += 1
     for acid in AcidTypes:
+        if 'num_' in acid.name.lower():
+            continue
         for field_name in CalibRecordConcentrateFields:
+            if 'num_' in field_name.name.lower():
+                continue
             members[f'ACID__{acid.name}__{field_name.name}'] = (i, field_name.datatype())
             i += 1
     for bicarb in BicarbTypes:
+        if 'num_' in bicarb.name.lower():
+            continue
         for field_name in CalibRecordConcentrateFields:
+            if 'num_' in field_name.name.lower():
+                continue
             members[f'BICARB__{bicarb.name}__{field_name.name}'] = (i, field_name.datatype())
             i += 1
     for field_name in CalibRecordAccelerometerFields:
-        members[f'ACCEL__{bicarb.name}__{field_name.name}'] = (i, field_name.datatype())
+        if 'num_' in field_name.name.lower():
+            continue
+        members[f'ACCEL__{field_name.name}'] = (i, field_name.datatype())
         i += 1
     for field_name in CalibRecordBloodLeakFields:
-        members[f'BLOOD_LEAK__{bicarb.name}__{field_name.name}'] = (i, field_name.datatype())
+        if 'num_' in field_name.name.lower():
+            continue
+        members[f'BLOOD_LEAK__{field_name.name}'] = (i, field_name.datatype())
         i += 1
     members[f'NUM_OF_CALIBRATION_RECORD_FIELDS'] = (i, DataTypes.NONE)