Index: firmware/App/Services/DDInterface.c
===================================================================
diff -u -r73d8423edc56daed591bc0b3f7baee5540aea423 -rf688e0f8bded1f0a687437e3136cfba8b14f87b6
--- firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 73d8423edc56daed591bc0b3f7baee5540aea423)
+++ firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision f688e0f8bded1f0a687437e3136cfba8b14f87b6)
@@ -124,14 +124,12 @@
         dgCmdResp[ i ].rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE;
     }
 
-    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_UPPER_MAX_SAFETY_TIMEOUT_MS );
+//    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS );
+//    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_OUT_OF_TARGET_TIMEOUT_MS );
+//    initPersistentAlarm( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, DIALYSATE_TEMP_CLEAR_TIMEOUT_MS, DIALYSATE_TEMP_UPPER_MAX_SAFETY_TIMEOUT_MS );
 
-    initPersistentAlarm( ALARM_ID_HD_NEW_LOAD_CELL_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_HD_NEW_DIALYSATE_TEMP_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
-    initPersistentAlarm( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
+//    initPersistentAlarm( ALARM_ID_HD_NEW_DIALYSATE_TEMP_DATA_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
+//    initPersistentAlarm( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE, DG_DATA_FRESHNESS_TIMEOUT_MS, DG_DATA_FRESHNESS_TIMEOUT_MS );
 }
 
 /**********************************************************************//**
@@ -179,18 +177,15 @@
 //    if ( getCPLDACPowerLossDetected() != TRUE )
     {
         // Trigger alarm if not receiving new dialysate temperature data message in timely manner
-        checkDGDataFreshness( ALARM_ID_HD_NEW_DIALYSATE_TEMP_DATA_MESSAGE_NOT_RECEIVE, &dgDialysateTemperatureDataFreshFlag );
+//        checkDGDataFreshness( ALARM_ID_HD_NEW_DIALYSATE_TEMP_DATA_MESSAGE_NOT_RECEIVE, &dgDialysateTemperatureDataFreshFlag );
 
-        // Trigger alarm if not receiving new reservoirs data message in timely manner
-        checkDGDataFreshness( ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE, &dgReservoirsDataFreshFlag );
-
         // Trigger alarm if not receiving new DG op mode message in timely manner
-        checkDGDataFreshness( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE, &dgOpModeDataFreshFlag );
-        if ( TRUE == isAlarmActive( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE ) )
-        {
-            // we don't want to keep thinking DG is in a useful mode - set it to fault mode until DG is able to report its' true mode status
-            setDGOpMode( DG_MODE_FAUL, 0 );
-        }
+//        checkDGDataFreshness( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE, &dgOpModeDataFreshFlag );
+//        if ( TRUE == isAlarmActive( ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE ) )
+//        {
+//            // we don't want to keep thinking DG is in a useful mode - set it to fault mode until DG is able to report its' true mode status
+//            setDGOpMode( DG_MODE_FAUL, 0 );
+//        }
 
         // Check to see if DG has restarted
         checkDGRestart();
@@ -391,7 +386,7 @@
     }
     else
     {
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_DG_OPERATING_MODE, opMode );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_DD_OPERATING_MODE, opMode );
     }
 
     dgOpModeDataFreshFlag = TRUE;
@@ -606,14 +601,14 @@
  *************************************************************************/
 void cmdStartDGFill( U32 fillToVolMl, F32 targetFlowLPM )
 {
-    dgCmdResp[ DG_CMD_START_FILL ].commandID = DG_CMD_NONE;
-
-    if ( ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) && ( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) )
-    {
-        // The empty bottle alarms should not be active. If they are, the user shall insert the new bottle first and then hit Ok/Resume and
-        // then the fill can go. This is to make sure the next fill is done the full bottles
+//    dgCmdResp[ DG_CMD_START_FILL ].commandID = DG_CMD_NONE;
+//
+//    if ( ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) && ( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) )
+//    {
+//        // The empty bottle alarms should not be active. If they are, the user shall insert the new bottle first and then hit Ok/Resume and
+//        // then the fill can go. This is to make sure the next fill is done the full bottles
 //        sendDGFillCommand( DG_CMD_START, fillToVolMl, targetFlowLPM );
-    }
+//    }
 }
 
 /*********************************************************************//**
@@ -904,15 +899,15 @@
     }
     else
     {
-//        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_COMMAND_RESPONSE_ID, dgCmdRespPtr->commandID );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_DD_INVALID_COMMAND_RESPONSE_ID, dgCmdRespPtr->commandID );
     }
 
     if ( TRUE == dgCmdRespPtr->rejected )
     {
         switch ( dgCmdRespPtr->rejectCode )
         {
             case DG_CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER:
-                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DG_COMMAND_INVALID_PARAMETER_FAULT, dgCmdRespPtr->commandID );
+//                SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DG_COMMAND_INVALID_PARAMETER_FAULT, dgCmdRespPtr->commandID );
                 break;
 
             case DG_CMD_REQUEST_REJECT_REASON_NONE:
@@ -968,26 +963,26 @@
     BOOL isTempAboveTrigger            = (BOOL)( isTDiTempAboveLowSafety || isTDiTempAboveDialysateTarget );
 
 //    if ( getTargetDialInFlowRate() >  0 )
-    {
-        // check clear condition first
-        if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP ) )
-        {
-            isTDiTempAboveHighSafety = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
-        }
-        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, isTDiTempAboveHighSafety, dgDialysateTemp, dgTrimmerTempSet );
-
-        if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP ) )
-        {
-            isTempAboveTrigger = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
-        }
-        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, isTempAboveTrigger, dgDialysateTemp, dgTrimmerTempSet );
-
-        if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP ) )
-        {
-            isTempBelowTrigger = ( dgDialysateTemp >= ( dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
-        }
-        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, isTempBelowTrigger, dgDialysateTemp, dgTrimmerTempSet );
-    }
+//    {
+//        // check clear condition first
+//        if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP ) )
+//        {
+//            isTDiTempAboveHighSafety = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
+//        }
+//        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, isTDiTempAboveHighSafety, dgDialysateTemp, dgTrimmerTempSet );
+//
+//        if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP ) )
+//        {
+//            isTempAboveTrigger = ( dgDialysateTemp <= ( dgTrimmerTempSet + DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
+//        }
+//        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, isTempAboveTrigger, dgDialysateTemp, dgTrimmerTempSet );
+//
+//        if ( TRUE == isAlarmActive( ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP ) )
+//        {
+//            isTempBelowTrigger = ( dgDialysateTemp >= ( dgTrimmerTempSet - DIALYSATE_TEMP_OUT_OF_TARGET_CLEAR_TOL_C ) ? FALSE : TRUE );
+//        }
+//        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, isTempBelowTrigger, dgDialysateTemp, dgTrimmerTempSet );
+//    }
 //    else
 //    {
 //        checkPersistentAlarm(ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP, FALSE, dgDialysateTemp, dgTrimmerTempSet );
@@ -1019,7 +1014,7 @@
         if ( ( DG_MODE_FAUL != dgCurrentOpMode ) && ( DG_MODE_GENE != dgCurrentOpMode ) &&
              ( DG_MODE_FILL != dgCurrentOpMode ) && ( DG_MODE_DRAI != dgCurrentOpMode ) )
         {
-            activateAlarmNoData( ALARM_ID_HD_DG_RESTARTED_FAULT );
+//            activateAlarmNoData( ALARM_ID_HD_DG_RESTARTED_FAULT );
             dgStarted = FALSE;  // do not want to re-trigger alarm after alarm is cleared
         }
     }