Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rf1d812de6fbaf4943d05bbee2271bcb61138325a -rf6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision f1d812de6fbaf4943d05bbee2271bcb61138325a)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision f6aa1ffddb85a233371e3e7e4d7c0c0eb3e61493)
@@ -25,11 +25,12 @@
 #include "Buttons.h"
 #include "Compatible.h"
 #include "CpldInterface.h"
+#include "DDInterface.h"
 #include "LevelSensors.h"
 #include "Messaging.h"
 #include "OperationModes.h"
 #include "PAL.h"
-#include "PressureSensor.h"
+#include "Pressures.h"
 #include "RotaryValve.h"
 #include "Switches.h"
 #include "SystemCommTD.h"
@@ -82,6 +83,8 @@
 
 /// Message handling function lookup table
 static const U16 MSG_FUNCTION_HANDLER_LOOKUP[] = {
+    MSG_ID_DD_OP_MODE_DATA,
+    MSG_ID_DD_PRESSURES_DATA,
     MSG_ID_TESTER_LOGIN_REQUEST,
     MSG_ID_TD_SOFTWARE_RESET_REQUEST,
     MSG_ID_TD_BUBBLE_OVERRIDE_REQUEST,
@@ -124,11 +127,14 @@
     MSG_ID_TD_BLOOD_PUMP_MEASURED_FLOW_RATE_OVERRIDE_REQUEST,
     MSG_ID_TD_BLOOD_PUMP_MEASURED_MOTOR_SPEED_OVERRIDE_REQUEST,
     MSG_ID_TD_BLOOD_PUMP_MEASURED_ROTOR_SPEED_OVERRIDE_REQUEST,
-    MSG_ID_TD_BLOOD_PUMP_ROTOR_COUNT_OVERRIDE_REQUEST
+    MSG_ID_TD_BLOOD_PUMP_ROTOR_COUNT_OVERRIDE_REQUEST,
+    MSG_ID_TD_TMP_PRESSURE_OVERRIDE_REQUEST
 };
 
 /// Message handling function table
 static const MsgFuncPtr MSG_FUNCTION_HANDLERS[] = {
+    &setDDOpMode,
+    &setDialysatePressure,
     &handleTesterLogInRequest,
     &testTDSoftwareResetRequest,
     &testBubbleDetectOverride,
@@ -171,7 +177,8 @@
     &testMeasuredBloodFlowRateOverride,
     &testMeasuredBloodPumpSpeedOverride,
     &testMeasuredBloodPumpRotorSpeedOverride,
-    &testBloodPumpRotorCountOverride
+    &testBloodPumpRotorCountOverride,
+    &testTMPOverride
 };
 
 #define NUM_OF_FUNCTION_HANDLERS (sizeof(MSG_FUNCTION_HANDLERS) / sizeof(MsgFuncPtr))
@@ -433,46 +440,7 @@
     }
 }
 
-// Send message helper functions
 
-/*********************************************************************//**
- * @brief
- * The broadcastAlarmStatus function constructs an alarm status msg to
- * be broadcast and queues the msg for transmit on the appropriate CAN channel.
- * @details \b Inputs: none
- * @details \b Outputs: alarm status msg constructed and queued.
- * @param almStatus alarm status record
- * @return TRUE if msg successfully queued for transmit, FALSE if not
- *************************************************************************/
-BOOL broadcastAlarmStatus( COMP_ALARM_STATUS_T almStatus )
-{
-    BOOL result;
-    ALARM_COMP_STATUS_PAYLOAD_T payload;
-
-    payload.alarmState          = (U32)almStatus.alarmsState;
-    payload.alarmTop            = (U32)almStatus.alarmTop;
-    payload.silenceExpiresIn    = almStatus.alarmsSilenceExpiresIn;
-
-    payload.alarmsFlags  = ( almStatus.systemFault                  ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_SYSTEM_FAULT)       : 0 );
-    payload.alarmsFlags |= ( almStatus.stop                         ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_STOP)               : 0 );
-    payload.alarmsFlags |= ( almStatus.noClear                      ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_CLEAR)           : 0 );
-    payload.alarmsFlags |= ( almStatus.noResume                     ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_RESUME)          : 0 );
-    payload.alarmsFlags |= ( almStatus.noRinseback                  ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_RINSEBACK)       : 0 );
-    payload.alarmsFlags |= ( almStatus.noEndTreatment               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_END_TREATMENT)   : 0 );
-    payload.alarmsFlags |= ( almStatus.ok                           ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_OK_BUTTON_ONLY)     : 0 );
-    payload.alarmsFlags |= ( almStatus.alarmsSilenced               ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_ALARMS_SILENCED)    : 0 );
-    payload.alarmsFlags |= ( almStatus.lampOn                       ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_LAMP_ON)            : 0 );
-    payload.alarmsFlags |= ( almStatus.noBloodRecirc                ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_BLOOD_RECIRC)       : 0 );
-    payload.alarmsFlags |= ( almStatus.noDialRecirc                 ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_DIALYSATE_RECIRC)   : 0 );
-    payload.alarmsFlags |= ( almStatus.noMinimize                   ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_NO_MINIMIZE)        : 0 );
-    payload.alarmsFlags |= ( almStatus.topAlarmConditionDetected    ? BIT_BY_POS(ALARM_STATE_FLAG_BIT_POS_TOP_CONDITION)      : 0 );
-
-    result = broadcastData( MSG_ID_ALARM_STATUS_DATA, COMM_BUFFER_OUT_CAN_TD_ALARM, (U08*)&payload, sizeof( ALARM_COMP_STATUS_PAYLOAD_T ) );
-
-    return result;
-}
-
-
 // ***********************************************************************
 // ***************** Message Sending Helper Functions ********************
 // ***********************************************************************