Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r0c5d8accd0f6b588402e81d784d84734a6fe0473 -r25dbc6221b63e20fe61b2af0ce9c9f56bf13e807
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 0c5d8accd0f6b588402e81d784d84734a6fe0473)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 25dbc6221b63e20fe61b2af0ce9c9f56bf13e807)
@@ -38,10 +38,12 @@
 #include "PistonPumpControl.h"
 #endif
 #include "Pressure.h"
+#include "SafetyShutdown.h"
 #include "SystemCommDD.h"
 #include "Temperature.h"
 #include "TDInterface.h"
 #include "Utilities.h"
+#include "Ultrafiltration.h"
 #include "Valves.h"
 
 
@@ -136,14 +138,13 @@
     { MSD_ID_DD_TD_COMMUNICATION_STATUS_OVERRIDE_REQUEST,                           &testTDCommunicationStatusOverride },
     { MSG_ID_DD_OP_MODE_STATUS_OVERRIDE_REQUEST,                                    &testDDOpModePublishIntervalOverride },
     { MSG_ID_DD_SET_OPERATION_MODE_OVERRIDE_REQUEST,                                &testSetOperationMode },
-    { MSG_ID_DD_START_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST,                          &testDDStartGenDialysateOverride },
     { MSG_ID_DD_DIALYSATE_PUMPS_START_STOP_OVERRIDE_REQUEST,                        &testDialysatePumpStartStopOverride },
     { MSG_ID_DD_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST,                            &testDDGenDialysateDataPublishIntervalOverride },
     { MSG_ID_DD_CONCENTRATE_PUMPS_START_STOP_OVERRIDE_REQUEST,                      &testConcentratePumpStartStopOverride },
     { MSG_ID_DD_HEATERS_START_STOP_OVERRIDE_REQUEST,                                &testHeaterStartStopOverride },
     { MSG_ID_DD_VALVES_OPEN_CLOSE_STATE_OVERRIDE_REQUEST,                           &testValveOpenCloseStateOverride },
     { MSG_ID_DD_GEN_DIALYSATE_REQUEST_DATA,                                         &handleDialysateDeliveryRequestMsg },
-    { MSD_ID_DD_RO_COMMUNICATION_STATUS_OVERRIDE_REQUEST,                           &testROCommunicationStatusOverride },
+    { MSD_ID_DD_FP_COMMUNICATION_STATUS_OVERRIDE_REQUEST,                           &testROCommunicationStatusOverride },
     { MSG_ID_DD_BAL_CHAMBER_DATA_PUBLISH_OVERRIDE_REQUEST,                          &testDDBalChamberDataPublishIntervalOverride },
     { MSG_ID_DD_BAL_CHAMBER_SWITCH_FREQ_OVERRIDE_REQUEST,                           &testBalChamberSwFreqOverride },
     { MSG_ID_DD_DIAL_DELIVERY_IN_PROGRESS_OVERRIDE_REQUEST,                         &testDialDeliveryInProgressOverride },
@@ -158,11 +159,10 @@
     { MSG_ID_DD_HEATERS_PWM_PERIOD_OVERIDE_REQUEST,                                 &testHeaterPWMPeriodOverride },
     { MSG_ID_DD_PRE_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST,                        &testDDPreGenDialysateDataPublishIntervalOverride },
     { MSG_ID_DD_POST_GEND_MODE_DATA_PUBLISH_OVERRIDE_REQUEST,                       &testDDPostGenDialysateDataPublishIntervalOverride },
-    { MSG_ID_DD_START_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST,                      &testDDStartPreGenDialysateOverride },
     { MSG_ID_DD_PRE_GEN_DIALYSATE_REQUEST_DATA,                                     &handlePreGenDialysateRequestMsg },
-    { MSG_ID_DD_STOP_PRE_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST,                       &testDDStopPreGenDialysateOverride },
-    { MSG_ID_DD_STOP_GEN_DIALYSATE_MODE_OVERRIDE_REQUEST,                           &testDDStopGenDialysateOverride },
     { MSG_ID_FW_VERSIONS_REQUEST,                                                   &handleVersionRequestMessage },
+    { MSG_ID_DD_SAFETY_SHUTDOWN_OVERRIDE_REQUEST,                                   &testSetResetSafetyShutdownOverride },
+    { MSG_ID_DD_UF_DATA_PUBLISH_OVERRIDE_REQUEST,                                   &testDDUFDataPublishIntervalOverride },
 #ifdef __PUMPTEST__
     { MSG_ID_DD_PISTON_PUMP_DATA_PUBLISH_OVERRIDE_REQUEST,                          &testDDPistonPumpControlDataPublishIntervalOverride },
     { MSG_ID_DD_PISTON_PUMP_START_STOP_OVERRIDE_REQUEST,                            &testDDPistonPumpStartStopOverride },
@@ -385,10 +385,10 @@
     // ACK/NAK request
     if ( message->hdr.msgID < MSG_ID_FIRST_TD_TESTER_MESSAGE )
     {
-        if ( respBuffer != COMM_BUFFER_NOT_USED )
-        {
-            sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, respBuffer, ack );
-        }
+//        if ( respBuffer != COMM_BUFFER_NOT_USED )
+//        {
+//            sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, respBuffer, ack );
+//        }
     }
     else
     {
@@ -606,7 +606,7 @@
         ddVersionRecord.compatibilityRev = SW_COMPATIBILITY_REV;
 
         // Send DD version information
-        result = sendMessage( MSG_ID_DD_VERSION_REPONSE, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&ddVersionRecord, sizeof( DD_VERSIONS_T ) );
+        result = sendMessage( MSG_ID_DD_VERSION_RESPONSE, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&ddVersionRecord, sizeof( DD_VERSIONS_T ) );
     }
 
     return result;