Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r7c48e10ecdc96673e153fbae688f35df5b5795f0 -r8dc6ca1797142104cd11932c301fedbc48a12ed1
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 7c48e10ecdc96673e153fbae688f35df5b5795f0)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8dc6ca1797142104cd11932c301fedbc48a12ed1)
@@ -7,8 +7,8 @@
 *
 * @file    SystemCommMessages.c
 *
-* @author  (last)      Bill Bracken
-* @date    (last)      24-Jul-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      31-Jul-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -77,6 +77,13 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T ovRecord;         ///< Test override array payload.
     BOOL flag;                                      ///< Flag.
 } LC_OVERRIDE_PAYLOAD_T;
+
+/// Flow Sensor override payload structure
+typedef struct
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T ovRecord;         ///< Test override array payload.
+    BOOL flag;                                      ///< Flag.
+} FS_OVERRIDE_PAYLOAD_T;
 #pragma pack(pop)
 
 // ********** private data **********
@@ -2305,20 +2312,20 @@
  *************************************************************************/
 void handleTestMeasuredFlowOverrideRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    FS_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // verify payload length
-    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( sizeof( FS_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
-        if ( FALSE == payload.reset )
+        memcpy( &payload, message->payload, sizeof( FS_OVERRIDE_PAYLOAD_T ) );
+        if ( FALSE == payload.ovRecord.reset )
         {
-            result = testSetMeasuredFlowRateOverride( payload.index, payload.state.f32 );
+            result = testSetMeasuredFlowRateOverride( payload.ovRecord.index, payload.ovRecord.state.f32, payload.flag );
         }
         else
         {
-            result = testResetMeasuredFlowRateOverride( payload.index );
+            result = testResetMeasuredFlowRateOverride( payload.ovRecord.index );
         }
     }