Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r46d5a7768e1518b76482a2de48a0cd4b42a0bb8d -r3a2b4f4cfc9681ea855365ad7bc00bea47e2a3e3
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 46d5a7768e1518b76482a2de48a0cd4b42a0bb8d)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3a2b4f4cfc9681ea855365ad7bc00bea47e2a3e3)
@@ -8,7 +8,7 @@
 * @file    SystemCommMessages.c
 *
 * @author  (last)      Michael Garthwaite
-* @date    (last)      31-Jul-2023
+* @date    (last)      03-Aug-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -78,6 +78,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 **********
@@ -2307,20 +2314,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 );
         }
     }