Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r8074ecece0b11532c173ad951a98036f0c54ca52 -r2e21405574597474db0ebae86cdd7fa2d517f71c
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 8074ecece0b11532c173ad951a98036f0c54ca52)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 2e21405574597474db0ebae86cdd7fa2d517f71c)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      12-Jul-2022
+* @author  (last)      Dong Nguyen
+* @date    (last)      27-Sep-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -52,6 +52,9 @@
 #define MSG_NOT_ACKED_MAX_RETRIES       3                                   ///< maximum number of times a message that requires ACK that was not ACK'd can be re-sent before alarm
 #define PENDING_ACK_LIST_SIZE           25                                  ///< maximum number of Delanli messages that can be pending ACK at any given time
 
+#define MAX_FPGA_CLOCK_SPEED_ERRORS             3                           ///< maximum number of FPGA clock speed errors within window period before alarm
+#define MAX_FPGA_CLOCK_SPEED_ERROR_WINDOW_MS    (10 * SEC_PER_MIN * MS_PER_SECOND)    ///< FPGA clock speed error window
+
 #pragma pack(push, 1)
 
 /// Record for transmitted message that is pending acknowledgement from receiver.
@@ -136,6 +139,9 @@
     // initialize bad message CRC time windowed count
     initTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC, MAX_COMM_CRC_FAILURES, MAX_COMM_CRC_FAILURE_WINDOW_MS );
 
+    // initialize FPGA clock speed error time windowed count
+    initTimeWindowedCount( TIME_WINDOWED_COUNT_FPGA_CLOCK_SPEED_ERROR, MAX_FPGA_CLOCK_SPEED_ERRORS, MAX_FPGA_CLOCK_SPEED_ERROR_WINDOW_MS);
+
     // initialize pending ACK list
     for ( i = 0; i < PENDING_ACK_LIST_SIZE; i++ )
     {
@@ -892,6 +898,10 @@
             handleHDRequestDGUsageInfo( message );
             break;
 
+        case MSG_ID_HD_REQUEST_DG_SERVICE_MODE:
+            handleServiceModeRequest( message );
+            break;
+
         // NOTE: This case must be last
         case MSG_ID_DG_TESTER_LOGIN_REQUEST:
             handleTesterLogInRequest( message );
@@ -1192,6 +1202,14 @@
                 handleResendAllAlarmsCommand( message );
                 break;
 
+            case MSG_ID_DG_SET_OP_MODE_REQUEST:
+                handleTestSetOpModeRequest( message );
+                break;
+
+            case MSG_ID_DG_RESERVOIR_TARE_REQUEST:
+                handleTestTareReservoirRequest( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;