Index: leahi_dialin/common/dd_defs_proxy.py
===================================================================
diff -u -r5f8fef12f850bb73e1f8e7d7372a404e9db07fa4 -re324174eeb74c1630c6e913e7dfb65246924cd1f
--- leahi_dialin/common/dd_defs_proxy.py	(.../dd_defs_proxy.py)	(revision 5f8fef12f850bb73e1f8e7d7372a404e9db07fa4)
+++ leahi_dialin/common/dd_defs_proxy.py	(.../dd_defs_proxy.py)	(revision e324174eeb74c1630c6e913e7dfb65246924cd1f)
@@ -76,4 +76,19 @@
     DDCancelModes                   = dd_defs.DDCancelModes
     DDSubstitutionPumpAttributes    = dd_defs.DDSubstitutionPumpAttributes
 
+    # Records
+    RecordTypes                     = generic_defs.RecordTypes
+    SystemRecordFields              = generic_defs.SystemRecordFields
+    ServiceRecordFields             = generic_defs.ServiceRecordFields
+    CalibrationRecordFields         = generic_defs.CalibrationRecordFields
+    InstitutionalRecordFields       = generic_defs.InstitutionalRecordFields
+    UsageInformationRecordFields    = generic_defs.UsageInformationRecordFields
+
+    # Record support
+    CalibRecordAccelerometerFields  = generic_defs.CalibRecordAccelerometerFields
+    CalibRecordBloodLeakFields      = generic_defs.CalibRecordBloodLeakFields
+    CalibRecordConcentrateFields    = generic_defs.CalibRecordConcentrateFields
+    CalibRecordSensorFields         = generic_defs.CalibRecordSensorFields
+
+
 dd_enum_repository = DD_Defs()
Index: leahi_dialin/common/msg_ids.py
===================================================================
diff -u -r1f7b5ac840adf6740b023706fcb73691c33a9be7 -re324174eeb74c1630c6e913e7dfb65246924cd1f
--- leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision 1f7b5ac840adf6740b023706fcb73691c33a9be7)
+++ leahi_dialin/common/msg_ids.py	(.../msg_ids.py)	(revision e324174eeb74c1630c6e913e7dfb65246924cd1f)
@@ -192,11 +192,14 @@
     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_TREATMENT_LOG_AVERAGE_DATA = 0xAD
+    MSG_ID_TD_DRY_SELF_TEST_PROGRESS_DATA = 0xAD
     MSG_ID_TD_TUBE_SET_AUTHENTICATION_REQUEST = 0xAE
     MSG_ID_UI_TUBE_SET_AUTHENTICATION_ACK_RESPONSE = 0xAF
     MSG_ID_TD_SYRINGE_PUMP_DATA = 0xB1
     MSG_ID_TD_HEPARIN_PAUSE_RESUME_RESPONSE= 0xB2
+    MSG_ID_FFU_SIGNAL_TD_UPDATE_AVAILABLE = 0xB3
+    MSG_ID_FFU_SIGNAL_DD_UPDATE_AVAILABLE = 0xB4
+    MSG_ID_DD_SUBSTITUTION_PUMP_DATA = 0xB5
 
     MSG_ID_DD_PISTON_PUMP_CONTROL_DATA = 0xF0
 
@@ -388,6 +391,10 @@
     MSG_ID_DD_NVM_SET_INSTITUTIONAL_RECORD  = 0xA064
     MSG_ID_DD_NVM_SEND_USAGE_INFO_RECORD  = 0xA065
     MSG_ID_DD_NVM_SET_USAGE_INFO_RECORD  = 0xA066
+    MSG_ID_DD_FLOATER_LEVEL_OVERRIDE_REQUEST = 0xA06C
+    MSG_ID_DD_SUBSTITUTION_PUMP_START_STOP_OVERRIDE_REQUEST = 0xA06D
+    MSG_ID_DD_SUBSTITUTION_PUMP_BROADCAST_OVERRIDE_REQUEST = 0xA06E
+    MSG_ID_DD_SUBSTITUTION_PUMP_TARGET_SPEED_OVERRIDE_REQUEST = 0xA06F
 
     MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST = 0xA100
     MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST = 0xA101
Index: leahi_dialin/dd/dialysate_delivery.py
===================================================================
diff -u -r1f7b5ac840adf6740b023706fcb73691c33a9be7 -re324174eeb74c1630c6e913e7dfb65246924cd1f
--- leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision 1f7b5ac840adf6740b023706fcb73691c33a9be7)
+++ leahi_dialin/dd/dialysate_delivery.py	(.../dialysate_delivery.py)	(revision e324174eeb74c1630c6e913e7dfb65246924cd1f)
@@ -26,12 +26,14 @@
 from .modules.gen_dialysate import DDGenDialysate
 from .modules.heaters import DDHeaters
 from .modules.levels import DDLevels
+from .modules.mixing_cntrl import DDDialysateMixing
 from .modules.post_gen_dialysate import DDPostGenDialysate
 from .modules.pressure_sensors import DDPressureSensors
 from .modules.pre_gen_dialysate import DDPreGenDialysate
 from .modules.rinse_pump import DDRinsePump
 from .modules.records import DDRecords
 from .modules.spent_chamber_fill import DDSpentChamberFill
+from .modules.substitution_pump import DDSubstitutionPump
 from .modules.temperature_sensors import DDTemperatureSensors
 from .modules.dd_test_configs import DDTestConfig
 from .modules.ultrafiltration import DDUltrafiltration
@@ -126,6 +128,7 @@
         self.conductivity_sensors = DDConductivitySensors(self.can_interface, self.logger)  #: The Conductivity Sensors module
         self.dialysate_pumps = DDDialysatePumps(self.can_interface, self.logger)            #: The Dialysate Pumps module
         self.drybicart = DDDryBicart(self.can_interface, self.logger)                       #: The Dry Bicarb module
+        self.dialysate_mixing = DDDialysateMixing(self.can_interface, self.logger)          #: The Dialysate mixing module
         self.events = DDEvents(self.can_interface, self.logger)                             #: The Events module
         self.gen_dialysate = DDGenDialysate(self.can_interface, self.logger)                #: The Generate Dialysate module
         self.heaters = DDHeaters(self.can_interface, self.logger)                           #: The Heaters module
@@ -136,6 +139,7 @@
         self.rinse_pump = DDRinsePump(self.can_interface, self.logger)                      #: The Rinse Pump module
         self.records = DDRecords(self.can_interface, self.logger)                           #: The Records (System, Service, Calibration, Institutional, Usage Information) module
         self.spent_chamber_fill = DDSpentChamberFill(self.can_interface, self.logger)       #: The Spent Chamber module
+        self.substitution_pump = DDSubstitutionPump(self.can_interface, self.logger)        #: The Substitution Pump module
         self.temperature_sensors = DDTemperatureSensors(self.can_interface, self.logger)    #: The Temperature Sensors module
         self.test_configs = DDTestConfig(self.can_interface, self.logger)                   #: The Test Configs module
         self.ultrafiltration = DDUltrafiltration(self.can_interface, self.logger)           #: The Ultrafiltration module