Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r821d1609f976b1fc01389f2e865aebcaa6434a78 -rac8b318b42ed735a28fc6459008b0ddc2e07b302
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 821d1609f976b1fc01389f2e865aebcaa6434a78)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision ac8b318b42ed735a28fc6459008b0ddc2e07b302)
@@ -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 **********
@@ -414,7 +421,6 @@
     return result;
 }
 
-
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -2306,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 );
         }
     }
 
@@ -3606,37 +3612,6 @@
 }
 
 /*********************************************************************//**
- * @brief
- * The handleFansRPMOverride function handles a request to override a fans RPM value.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleFansRPMOverride( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
-        }
-        else
-        {
-            result = testResetFanRPMOverride( payload.index );
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
 * @brief
 * The handleStopDGRTCClock function handles a request to stop the RTC clock.
 * @details Inputs: none
@@ -3775,10 +3750,41 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestFansRPMAlarmStartTimeOffsetRequest function handles a
- * request to set the fans RPM alarm start time offset.
+ * The handleFansRPMOverride function handles a request to override a fans RPM value.
  * @details Inputs: none
  * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleFansRPMOverride( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetFanRPMOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestFansRPMAlarmStartTimeOverrideRequest function handles a
+ * request to override the fan RPM alarm start time.
+ * @details Inputs: none
+ * @details Outputs: message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
@@ -3801,7 +3807,6 @@
 }
 
 /*********************************************************************//**
- * @brief
  * The handleTestUsedAcidVolumeMLOverrideRequest function handles a
  * request to override the acid volume.
  * @details Inputs: none