Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r20d0c02f453b6dae1884fb1b5ba542053852ffc1 -re6471488a8342e5b23f8a4dc977980e1e442d923
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 20d0c02f453b6dae1884fb1b5ba542053852ffc1)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e6471488a8342e5b23f8a4dc977980e1e442d923)
@@ -5210,6 +5210,38 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleSetRawAirTrapLevelSensorOverrideRequest function handles a request to
+ * override an air trap level sensor raw value.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleSetRawAirTrapLevelSensorOverrideRequest( 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 = testSetRawAirTrapLevelOverride( (AIR_TRAP_LEVEL_SENSORS_T)payload.index, (AIR_TRAP_LEVELS_T)( payload.state.u32 ) );
+        }
+        else
+        {
+            result = testResetRawAirTrapLevelOverride( (AIR_TRAP_LEVEL_SENSORS_T)payload.index );
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleSetFluidLeakBroadcastIntervalOverrideRequest function handles a
  * request to override the fluid leak state broadcast interval.
  * @details Inputs: none