Index: firmware/App/Services/DDInterface.c
===================================================================
diff -u -ra5560a2917aa62bcafd8e6a81041ace723237109 -r5370f221c5d368e899534ba3980cdbd319393a06
--- firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision a5560a2917aa62bcafd8e6a81041ace723237109)
+++ firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 5370f221c5d368e899534ba3980cdbd319393a06)
@@ -258,24 +258,24 @@
 BOOL setDialysatePressure( MESSAGE_T *message )
 {
     BOOL result = FALSE;
-    DD_PRESSURE_TEMP_DATA_T payload;
+//    PRESSURE_DD_DATA_T payload;    // TODO - restore when payload type moved to DDDefs.h.  Also, do we need to handle FP pressures as well?
+//
+//    // parse message payload
+//    memcpy( &payload, &message->payload[ 0 ], sizeof( PRESSURE_DD_DATA_T ) );
+//
+//    if ( message->hdr.payloadLen == sizeof( PRESSURE_DD_DATA_T ) )
+//    {
+//        // update dialysate pressure
+//        dialysatePressure = payload.d41Pressure;
+//        result = TRUE;
+//    }
+//    else
+//    {
+//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_DD_PRESSURE_DATA, (U32)message->hdr.payloadLen );
+//    }
+//
+//    ddDialysatePressureFreshFlag = TRUE;
 
-    // parse message payload
-    memcpy( &payload, &message->payload[ 0 ], sizeof( DD_PRESSURE_TEMP_DATA_T ) );
-
-    if ( message->hdr.payloadLen == sizeof( DD_PRESSURE_TEMP_DATA_T ) )
-    {
-        // update dialysate pressure
-        dialysatePressure = payload.d41Pressure;
-        result = TRUE;
-    }
-    else
-    {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_DD_PRESSURE_DATA, (U32)message->hdr.payloadLen );
-    }
-
-    ddDialysatePressureFreshFlag = TRUE;
-
     return result;
 }
 
Index: firmware/App/Services/SystemCommTD.c
===================================================================
diff -u -r6b96f1a18ab2f93068daddbf24178fbbae7cc570 -r5370f221c5d368e899534ba3980cdbd319393a06
--- firmware/App/Services/SystemCommTD.c	(.../SystemCommTD.c)	(revision 6b96f1a18ab2f93068daddbf24178fbbae7cc570)
+++ firmware/App/Services/SystemCommTD.c	(.../SystemCommTD.c)	(revision 5370f221c5d368e899534ba3980cdbd319393a06)
@@ -296,7 +296,7 @@
 {
     if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC ) )
     {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_COMM_TOO_MANY_BAD_CRCS, (U32)ALARM_SOURCE_TD );
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_TD_COMM_TOO_MANY_BAD_CRCS, (U32)ALM_SRC_TD );
     }
 }