Index: firmware/App/Monitors/Level.c
===================================================================
diff -u -r5126b79e4970ffe2ed9db4cccea18a1216c78570 -r229341f9eb23fec730cdf9b1f8f3960de2daf384
--- firmware/App/Monitors/Level.c	(.../Level.c)	(revision 5126b79e4970ffe2ed9db4cccea18a1216c78570)
+++ firmware/App/Monitors/Level.c	(.../Level.c)	(revision 229341f9eb23fec730cdf9b1f8f3960de2daf384)
@@ -22,11 +22,6 @@
 #include "TaskPriority.h"
 #include "Timers.h"
 
-#ifdef __PUMPTEST__
-#include "gio.h"
-#include "PistonPumpControl.h"
-#endif
-
 /**
  *  @addtogroup Level
  *  @{
@@ -45,11 +40,6 @@
 #define LEVEL_DEBOUNCE_TIME_MS              ( MS_PER_SECOND / 10 )                                  ///< Level debounce time in milliseconds.
 #define DATA_PUBLISH_COUNTER_START_COUNT    7                                                       ///< Data publish counter start count.
 
-#ifdef __PUMPTEST__
-#define DOSING_TRIGGER_GIO_PORT_PIN         6U                                                                      ///< GPIO pin ID on port A for dosing trigger input signal.
-#define GET_PUMP_DOSING_TRIGGER()           (PIN_SIGNAL_STATE_T)(gioGetBit(gioPORTA, DOSING_TRIGGER_GIO_PORT_PIN))  ///< Macro to get dosing trigger state.
-#endif
-
 /// Level status structure
 typedef struct
 {
@@ -130,12 +120,6 @@
                 currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
                 break;
 
-#ifdef __PUMPTEST__
-            case PUMP_TRIG_LEVEL:
-                currentLevelStatus = ( GET_PUMP_DOSING_TRIGGER() == 0 ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH );
-                break;
-#endif
-
 #ifndef _VECTORCAST_
             default:
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_LEVEL_SELECTED, i );
@@ -167,11 +151,6 @@
                     case D46_LEVL:
                         SEND_EVENT_WITH_2_U32_DATA( DD_EVENT_D46_LEVL_CHANGE, (U32)status[ i ].data, (U32)currentLevelStatus );
                         break;
-#ifdef __PUMPTEST__
-                    case PUMP_TRIG_LEVEL:
-                         // TODO: Will handle event later if required
-                         break;
-#endif
 
 #ifndef _VECTORCAST_
                     default:
@@ -192,10 +171,6 @@
         levelsStatus[i].priorRawLevel = currentLevelStatus;
     }
 
-#ifdef __PUMPTEST__
-    // Handle dosing trigger
-    processPistonPumpDosingTrigger();
-#endif
     publishLevelsData();
 }
 
@@ -308,11 +283,7 @@
 
         data.d6Level    = (U32)getLevelStatus( D6_LEVL );
         data.d63Level   = (U32)getLevelStatus( D63_LEVL );
-#ifndef __PUMPTEST__
         data.d46Level   = (U32)getLevelStatus( D46_LEVL );
-#else
-        data.d46Level   = (U32)getLevelStatus( PUMP_TRIG_LEVEL );
-#endif
 
         levelsDataPublicationCounter = 0;