Index: firmware/App/Controllers/ROPump.h
===================================================================
diff -u -r164e1a3ffca18c703676bc7f57f5903c76050600 -r300bdc1d729828fd4492bc905bb33faf5529cbda
--- firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 164e1a3ffca18c703676bc7f57f5903c76050600)
+++ firmware/App/Controllers/ROPump.h	(.../ROPump.h)	(revision 300bdc1d729828fd4492bc905bb33faf5529cbda)
@@ -22,7 +22,7 @@
 
 /**
  *  @defgroup ROPump ROPump
- *  @brief RO Pump monitor and controller module.  Controls and monitors the RO pump.
+ *  @brief RO Pump monitor and controller module.  Controls and monitors the RO pump and the flow meter.
  *  The flow meter is manufactured by SwissFlow, PN: 82015311.
  *  The diaphragm (RO) pump is manufactured by Aquatec, PN: 5889-2MM1-V724DY.
  *
Index: firmware/App/DGCommon.h
===================================================================
diff -u -r936336e10d1dd531253fb142c2fca803d5f45416 -r300bdc1d729828fd4492bc905bb33faf5529cbda
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 936336e10d1dd531253fb142c2fca803d5f45416)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 300bdc1d729828fd4492bc905bb33faf5529cbda)
@@ -25,7 +25,11 @@
 #define DG_VERSION_MAJOR        0
 #define DG_VERSION_MINOR        6
 #define DG_VERSION_MICRO        0
+<<<<<<< HEAD
+#define DG_VERSION_BUILD        449
+=======
 #define DG_VERSION_BUILD        172
+>>>>>>> DEN-16395-fw-remove-tro-tdi-check-from-post-treatment-modes-and-during-water-flush-and-chem-flush
 
 // ********** build switches **********
 
Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r164e1a3ffca18c703676bc7f57f5903c76050600 -r300bdc1d729828fd4492bc905bb33faf5529cbda
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 164e1a3ffca18c703676bc7f57f5903c76050600)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 300bdc1d729828fd4492bc905bb33faf5529cbda)
@@ -137,6 +137,8 @@
 
     setCurrentSubState( NO_SUB_STATE );
 
+    SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_INACTIVE_RESERVOIR_TEMP_REMOVE, (U32)inactiveReservoir, 0 ) // TODO remove
+
     if ( DG_RESERVOIR_1 == inactiveReservoir )
     {
         setValveStateDelayed( VRD1, VALVE_STATE_OPEN, DELAY_RES_DRAIN_VALVE_MS );
@@ -295,6 +297,8 @@
         acidBottleVolML   = acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidFullBottleVolumeML;
         bicarbBottleVolML = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbStartVolumeML;
 
+        SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_INACTIVE_RESERVOIR_TEMP_REMOVE, (U32)inactiveReservoir, 0 ) // TODO remove
+
         if ( DG_RESERVOIR_1 == inactiveReservoir )
         {
             setValveState( VRD1, VALVE_STATE_CLOSED );
@@ -360,6 +364,8 @@
 
     if ( ++drainEmptyTareTimerCtr > DRAIN_EMPTY_TARE_WAIT )
     {
+        SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_INACTIVE_RESERVOIR_TEMP_REMOVE, (U32)inactiveReservoir, 0 ) // TODO remove
+
         drainEmptyTareTimerCtr = 0;
         tareLoadCellsAtEmpty( inactiveReservoir );
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r164e1a3ffca18c703676bc7f57f5903c76050600 -r300bdc1d729828fd4492bc905bb33faf5529cbda
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 164e1a3ffca18c703676bc7f57f5903c76050600)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 300bdc1d729828fd4492bc905bb33faf5529cbda)
@@ -423,7 +423,6 @@
     return result;
 }
 
-
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -3636,37 +3635,6 @@
 }
 
 /*********************************************************************//**
- * @brief
- * The handleFansRPMOverride function handles a request to override a fans RPM value.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleFansRPMOverride( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
-        }
-        else
-        {
-            result = testResetFanRPMOverride( payload.index );
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
 * @brief
 * The handleStopDGRTCClock function handles a request to stop the RTC clock.
 * @details Inputs: none
@@ -3805,10 +3773,41 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestFansRPMAlarmStartTimeOffsetRequest function handles a
- * request to set the fans RPM alarm start time offset.
+ * The handleFansRPMOverride function handles a request to override a fans RPM value.
  * @details Inputs: none
  * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleFansRPMOverride( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetFanRPMOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestFansRPMAlarmStartTimeOverrideRequest function handles a
+ * request to override the fan RPM alarm start time.
+ * @details Inputs: none
+ * @details Outputs: message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
@@ -3831,7 +3830,6 @@
 }
 
 /*********************************************************************//**
- * @brief
  * The handleTestUsedAcidVolumeMLOverrideRequest function handles a
  * request to override the acid volume.
  * @details Inputs: none
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r164e1a3ffca18c703676bc7f57f5903c76050600 -r300bdc1d729828fd4492bc905bb33faf5529cbda
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 164e1a3ffca18c703676bc7f57f5903c76050600)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 300bdc1d729828fd4492bc905bb33faf5529cbda)
@@ -170,6 +170,12 @@
 // MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST
 BOOL sendServiceModeResponse( BOOL accepted, U32 rejCode );
 
+// MSG_ID_HD_OP_MODE
+BOOL handleSetHDOperationMode( MESSAGE_T *message );
+
+// MSG_ID_HD_REQUEST_DG_USAGE_INFO
+void handleHDRequestDGUsageInfo( MESSAGE_T * message );
+
 // MSG_ID_DG_SET_SERVICE_TIME
 void handleSetDGServiceTime( MESSAGE_T *message );
 
@@ -393,6 +399,12 @@
 // MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE
 void handleSetDrainPumpMeasuredRPMOverrideRequest( MESSAGE_T *message );
 
+// MSG_ID_DG_ALARM_INFO_SEND_INTERVAL_OVERRIDE
+void handleTestAlarmInfoSendIntervalOverrideRequest( MESSAGE_T *message );
+
+// MSG_ID_DG_SUPER_CLEAR_ALARMS_CMD
+void handleTestSuperClearAlarmsRequest( MESSAGE_T *message );
+
 // MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET
 void handleTestFansRPMAlarmStartTimeOffsetRequest( MESSAGE_T *message );
 
@@ -413,21 +425,27 @@
 void handleSetDGSoftwareConfigRecord( MESSAGE_T *message );
 #endif
 
+// MSG_ID_HD_REQUEST_DG_ALARMS
+void handleResendAllAlarmsCommand( MESSAGE_T *message );
+
 // MSG_ID_DG_HD_COMMUNICATION_STATUS
 void handleTestHDCommunicationStatusOverrideRequest( MESSAGE_T *message );
 
 // MSG_ID_DG_SET_PRIMARY_AND_TRIMMER_HEATERS_TARGET_TEMP
 void handleSetPrimaryAndTrimmerHeatersTargetTemperature( MESSAGE_T *message );
 
+// MSG_ID_DG_USED_ACID_VOLUME_ML_OVERRIDE
+void handleTestUsedAcidVolumeMLOverrideRequest(MESSAGE_T *message);
+
+// MSG_ID_DG_USED_BICARB_VOLUME_ML_OVERRIDE
+void handleTestUsedBicarbVolumeMLOverrideRequest(MESSAGE_T *message);
+
 // MSG_ID_DG_GET_USAGE_INFO_RECORD
 void handleGetDGUsageInfoRecord( MESSAGE_T *message );
 
 // MSG_ID_DG_SET_USAGE_INFO_RECORD
 void handleSetDGUsageInfoRecord( MESSAGE_T *message );
 
-// MSG_ID_HD_REQUEST_DG_ALARMS
-void handleResendAllAlarmsCommand( MESSAGE_T *message );
-
 // MSG_ID_DG_SET_OP_MODE_REQUEST
 void handleTestSetOpModeRequest( MESSAGE_T *message );