Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -receb190a5d66fdbee779478ac8bb50a846ed9241 -r5c430c3ac17fc8ad836fd70b8a3b8a12af44319e
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision eceb190a5d66fdbee779478ac8bb50a846ed9241)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 5c430c3ac17fc8ad836fd70b8a3b8a12af44319e)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2023 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
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      21-Dec-2022
+* @date    (last)      02-Jan-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -1040,8 +1040,8 @@
                 handleTestMonitoredVoltageOverrideRequest( message );
                 break;
 
-            case MSG_ID_DRAIN_PUMP_TARGET_OUTLET_PRESSURE:
-                handleSetDrainPumpTargetOutletPressure( message );
+            case MSG_ID_DRAIN_PUMP_TARGET_OUTLET_FLOW:
+                handleSetDrainPumpTargetOutletFlowLPM( message );
                 break;
 
             case MSG_ID_DG_SWITCHES_STATUS_OVERRIDE:
@@ -1225,9 +1225,13 @@
                 break;
 
             case MSG_ID_DG_DRAIN_PUMP_CURRENT_OVERRIDE:
-                handleTestDGDrainPumpCurrentOverrideRequest( message );
+                handleTestDrainPumpMeasuredCurrentOverride( message );
                 break;
 
+            case MSG_ID_DG_GEN_IDLE_PUBLISH_INTERVAL_OVERRIDE:
+                handleTestGenIdlePublishIntervalOverride( message );
+                break;
+
             case MSG_ID_DG_DRAIN_PUMP_DIRECTION_OVERRIDE:
                 handleTestDGDrainPumpDirectionOverrideRequest( message );
                 break;
@@ -1260,6 +1264,10 @@
                 handleTestDGFillModeBroadcastOverrideRequest( message );
                 break;
 
+            case MSG_ID_DG_HEATERS_DUTY_CYCLE_OVERRIDE:
+                handleTestDGHeatersDutyCycleOverrideRequest( message );
+                break;
+
             default:
                 // TODO - unrecognized message ID received - ignore
                 break;