Index: leahi_dialin/common/generic_defs.py
===================================================================
diff -u -rc1bff8da59cff294d67d90dd1e1f102dd5b65466 -r1ce41b0e543f91b5e620c0d91758564cefaad9a8
--- leahi_dialin/common/generic_defs.py	(.../generic_defs.py)	(revision c1bff8da59cff294d67d90dd1e1f102dd5b65466)
+++ leahi_dialin/common/generic_defs.py	(.../generic_defs.py)	(revision 1ce41b0e543f91b5e620c0d91758564cefaad9a8)
@@ -19,6 +19,7 @@
 from ..utils.enums import DialinEnum
 from .dd_defs import DDPressureSensorNames, DDTemperatureSensorNames, DDConcentratePumpNames, DDDialysatePumpNames
 from .disp_defs import AcidTypes, BicarbTypes
+from .fp_defs import FPPressureSensorNames
 
 
 # ================================================== Enum Creators: DataTypes ==================================================
@@ -245,9 +246,19 @@
                 continue
             members[f'PRES__{pres_sensor.name}__{field_name.name}'] = (i, field_name.datatype())
             i += 1
+    for pres_sensor in FPPressureSensorNames:
+        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
+        elif temp_sensor.value >= DDTemperatureSensorNames.FIRST_CONDUCTIVITY_SENSOR.value:
+            continue
         for field_name in CalibRecordSensorFields:
             if 'num_' in field_name.name.lower():
                 continue
Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -r0bc2d3976315c12417c992717621a0284bbedef4 -r1ce41b0e543f91b5e620c0d91758564cefaad9a8
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 0bc2d3976315c12417c992717621a0284bbedef4)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 1ce41b0e543f91b5e620c0d91758564cefaad9a8)
@@ -170,6 +170,7 @@
     MSG_ID_TD_ADJUST_DISPOSABLES_CONFIRM_RESPONSE         = 0x93
     MSG_ID_UI_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_REQUEST  = 0x94
     MSG_ID_TD_ADJUST_DISPOSABLES_REMOVAL_CONFIRM_RESPONSE = 0x95
+    TBD_96 = 0x96
     MSG_ID_TD_BLOOD_PRIME_PROGRESS_DATA = 0x97
     MSG_ID_UI_BLOOD_PRIME_CMD_REQUEST = 0x98
     MSG_ID_TD_BLOOD_PRIME_CMD_RESPONSE = 0x99
@@ -192,8 +193,8 @@
     MSG_ID_TD_ADJUST_TREATMENT_LOGS_RESPONSE = 0xAA
     MSG_ID_TD_WATER_SAMPLE_RESULT_RESPONSE = 0xAB
     MSG_ID_TD_WATER_SAMPLE_DATA = 0xAC
-    MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA = 0xAD
-    TBD = 0xAE
+    MSG_ID_TD_TREATMENT_LOG_AVERAGE_DATA = 0xAD
+    MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA = 0xAE
     MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAF
     MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xB0
     MSG_ID_TD_SYRINGE_PUMP_DATA = 0xB1
@@ -233,8 +234,32 @@
     MSG_ID_DD_NVM_CAL_BLOOD_LEAK_SENSOR_RESPONSE = 0xD3
     MSG_ID_UI_DD_NVM_SET_CAL_BLOOD_LEAK_SENSOR = 0xD4
     MSG_ID_DD_NVM_RECORD_CRC_OVERRIDE_REQUEST = 0xD5
-    MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xD6
-
+    MSG_ID_UI_SETUP_CONNECTION_CONFIRM_REQUEST = 0xD6
+    MSG_ID_TD_SETUP_CONNECTION_CONFIRM_RESPONSE = 0xD7
+    MSG_ID_TD_POST_FINAL_TEST_RESULT = 0xD8
+    MSG_ID_TD_POST_SINGLE_TEST_RESULT = 0xD9
+    MSG_ID_TD_UI_CANCEL_REQUEST = 0xDA
+    MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xDB
+    MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA = 0xDC
+    MSG_ID_FP_FILTER_FLUSH_DATA = 0xDD
+    MSG_ID_FP_PERMEATE_FLUSH_DATA = 0xDE
+    TBD_DF = 0xDF
+    TBD_E0 = 0xE0
+    TBD_E1 = 0xE1
+    TBD_E2 = 0xE2
+    TBD_E3 = 0xE3
+    TBD_E4 = 0xE4
+    TBD_E5 = 0xE5
+    TBD_E6 = 0xE6
+    TBD_E7 = 0xE7
+    TBD_E8 = 0xE8
+    TBD_E9 = 0xE9
+    TBD_EA = 0xEA
+    TBD_EB = 0xEB
+    TBD_EC = 0xEC
+    TBD_ED = 0xED
+    TBD_EE = 0xEE
+    TBD_EF = 0xEF
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0