Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r00f98c3a603917bb25450e7686bc75a34c357e97 -ra57af2726f27208a2de96e9331678caf022d927d
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 00f98c3a603917bb25450e7686bc75a34c357e97)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision a57af2726f27208a2de96e9331678caf022d927d)
@@ -374,7 +374,7 @@
         heatDisinfectionStartConfirmed = FALSE;
 
         // Request DD to start Heat Disinfection.
-        cmdStartDDHeatDisinfect();
+        cmdSendDDCommand( DD_CMD_START_DISINFECT_HEAT );
 
         state = STANDBY_WAIT_FOR_DD_CLEANING_MODE_CMD_RESPONSE_STATE;
     }
@@ -447,10 +447,12 @@
 {
     TD_STANDBY_STATE_T state = STANDBY_CLEANING_MODE_IN_PROGRESS_STATE;
 
-    // Wait until DD reports Heat Disinfection complete.
-    if ( ( DD_MODE_HEAT == getDDOpMode() ) &&
-         ( DD_HEAT_DISINFECT_STATE_COMPLETE == getDDSubMode() ) )
+    // DD transitions back to Standby when Heat Disinfection is complete.
+    if ( DD_MODE_STAN == getDDOpMode() )
     {
+        // Clear Heat Disinfection in-progress alarm.
+        // clearAlarm( <Heat Disinfection alarm ID> );
+
         requestedDisinfectionCommand = DD_CMD_NONE;
         heatDisinfectionStartConfirmed = FALSE;
 
@@ -477,14 +479,11 @@
         // Common Standby actuator settings.
         resetAirTrap();
 
-        setAirPumpState( AIR_PUMP_STATE_OFF,
-                         AIR_PUMP_MOTOR_OFF );
+        setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF );
 
-        set3WayValveState( H13_VALV,
-                           VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+        set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
 
-        set3WayValveState( H20_VALV,
-                           VALVE_3WAY_COMMON_TO_CLOSED_STATE );
+        set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE );
 
         stopSyringePump();
         signalBloodPumpHardStop();
@@ -497,11 +496,9 @@
             break;
 
         case STANDBY_WAIT_FOR_TREATMENT_STATE:
-            setValvePosition( H1_VALV,
-                              VALVE_POSITION_A_INSERT_EJECT );
+            setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT );
 
-            setValvePosition( H19_VALV,
-                              VALVE_POSITION_A_INSERT_EJECT );
+            setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT );
 
             // TODO:
             // H5 Ejector      Off
@@ -528,8 +525,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA(
-                    ALARM_ID_TD_SOFTWARE_FAULT,
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT,
                     SW_FAULT_ID_MODE_STANDBY_INVALID_STATE,
                     currentStandbyState );
             break;
@@ -711,7 +707,8 @@
     // Respond to request to start treatment.
     response.accepted        = result;
     response.rejectionReason = rejReason;
-    sendMessage( MSG_ID_TD_RESP_INITIATE_TREATMENT_WORKFLOW, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08*) &response, sizeof( UI_RESPONSE_PAYLOAD_T ) );
+    sendMessage( MSG_ID_TD_RESP_INITIATE_TREATMENT_WORKFLOW, COMM_BUFFER_OUT_CAN_TD_2_UI,
+                 (U08*) &response, sizeof( UI_RESPONSE_PAYLOAD_T ) );
 
     return result;
 }
@@ -829,8 +826,7 @@
     }
     else
     {
-        response.rejectionReason =
-            REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT;
+        response.rejectionReason = REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT;
     }
 
     response.accepted = result;
@@ -893,8 +889,7 @@
     }
     else
     {
-        response.rejectionReason =
-            REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT;
+        response.rejectionReason = REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT;
     }
 
     response.accepted = result;