Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r9888b5cfd349830ed220cd1e65c608140c85bd85 -rdcd360fb4dc37db2dcbeb7fb14fb327fe68235f4
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 9888b5cfd349830ed220cd1e65c608140c85bd85)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision dcd360fb4dc37db2dcbeb7fb14fb327fe68235f4)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file SystemComm.c
+* @file    SystemComm.c
 *
-* @author (last) Quang Nguyen
-* @date (last) 26-Aug-2020
+* @author  (last)      Dara Navaei
+* @date    (last)      06-Nov-2021
 *
-* @author (original) Dara Navaei
-* @date (original) 05-Nov-2019
+* @author  (original)  Dara Navaei
+* @date    (original)  05-Nov-2019
 *
 ***************************************************************************/
 
@@ -825,7 +825,7 @@
     if ( TRUE == didTimeout( timeOfLastHDCheckIn, HD_COMM_TIMEOUT_IN_MS ) )
     {
         hdIsCommunicating = FALSE;
-        activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );
+        //activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );
     }
 }
 
@@ -950,7 +950,9 @@
                 U16 msgID;
 
                 memcpy( &msgID, &pendingAckList[ i ].msg[ sizeof( U08 ) + sizeof( U16) ], sizeof( U16 ) );
+#ifndef DISABLE_ACK_ALARM
                 SET_ALARM_WITH_1_U32_DATA( ALARM_ID_CAN_MESSAGE_NOT_ACKED, (U32)msgID );
+#endif
                 pendingAckList[ i ].used = FALSE;  // take pending message off of list
             }
         }
@@ -1105,7 +1107,7 @@
                 break;
 
             case MSG_ID_DRAIN_PUMP_SET_RPM:
-                // TODO This function is implemented in DEN-9480
+                handleTestSetDrainPumpRPM( message );
                 break;
 
             case MSG_ID_DRAIN_PUMP_SEND_INTERVAL_OVERRIDE:
@@ -1125,23 +1127,23 @@
                 break;
 
             case MSG_ID_TEMPERATURE_SENSORS_VALUE_OVERRIDE:
-                handleTestTemperatureSensorsOverrideRequest ( message );
+                handleTestTemperatureSensorsOverrideRequest( message );
                 break;
 
             case MSG_ID_TEMPERATURE_SENSORS_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestTemperatureSensorsDataPublishOverrideRequest ( message );
+                handleTestTemperatureSensorsDataPublishOverrideRequest( message );
                 break;
 
             case MSG_ID_HEATERS_PUBLISH_INTERVAL_ORVERRIDE:
-                handleTestHeatersDataPublishOverrideRequest ( message );
+                handleTestHeatersDataPublishOverrideRequest( message );
                 break;
 
             case MSG_ID_CONDUCTIVITY_OVERRIDE:
-                handleTestSetConductivityOverrideRequest ( message );
+                handleTestSetConductivityOverrideRequest( message );
                 break;
 
             case MSG_ID_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE:
-                handleTestSetConductivityDataPublishIntervalOverrideRequest ( message );
+                handleTestSetConductivityDataPublishIntervalOverrideRequest( message );
                 break;
 
             case MSG_ID_DG_ACCEL_OVERRIDE:
@@ -1165,7 +1167,7 @@
                 break;
 
             case MSG_ID_DRAIN_PUMP_TARGET_OUTLET_PRESSURE:
-                // The function was implemented in DEN-9480
+                handleSetDrainPumpTargetOutletPressure( message );
                 break;
 
             case MSG_ID_DG_SWITCHES_STATUS_OVERRIDE:
@@ -1213,7 +1215,7 @@
                 break;
 
             case MSG_ID_DG_RO_FLOW_RATE_OVERRIDE:
-                handleTestMeasuredROFlowRateOverride( message );
+                handleTestROMeasuredFlowOverrideRequest( message );
                 break;
 
             case MSG_ID_DG_SET_RO_PUMP_TARGET_FLOW:
@@ -1281,9 +1283,21 @@
                 break;
 
             case MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE:
-                handleFilterFlushTimePeriodOverride(message);
+                handleFilterFlushTimePeriodOverride( message );
                 break;
 
+            case MSG_ID_DG_FANS_RPM_OVERRIDE:
+                handleFansRPMOverride( message );
+                break;
+
+            case MSG_ID_DG_STOP_RTC_CLOCK:
+                handleStopDGRTCClock( message );
+                break;
+
+            case MSG_ID_DG_DRAIN_PUMP_MEASURED_RPM_OVERRIDE:
+                handleSetDrainPumpMeasuredRPMOverrideRequest( message );
+                break;
+
             case MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION:
                 handleTestBlockMessagesRequest( message );
                 break;