Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rb8fe353893a8fec3aa371aac7bb58a2e3b7daa86 -r56d02fbdb137d2665a629dd7162c44d397b6545e
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision b8fe353893a8fec3aa371aac7bb58a2e3b7daa86)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 56d02fbdb137d2665a629dd7162c44d397b6545e)
@@ -61,7 +61,6 @@
 #define LINEAR_COEFFICIENT                    0.2313                                              ///< X linear coefficient
 #define CONSTANT_TERM                         63.667                                              ///< Constant term
 
-
 /// Defined states for the air trap controller state machine.
 typedef enum AirTrap_States
 {
@@ -239,9 +238,7 @@
 
         isAirTrapLevelsValid = ( ( ( AIR_TRAP_LEVEL_AIR == lowerAirTrap ) && ( AIR_TRAP_LEVEL_FLUID == upperAirTrap ) ) ? TRUE : FALSE );
 
-#ifndef _RELEASE_
-//        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ILLEGAL_AIR_TRAP_ALARM ) != SW_CONFIG_ENABLE_VALUE )
-#endif
+        //TODO: if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_ILLEGAL_AIR_TRAP_ALARM ) != SW_CONFIG_ENABLE_VALUE )
         {
             checkPersistentAlarm( ALARM_ID_TD_AIR_TRAP_ILLEGAL_LEVELS, isAirTrapLevelsValid, lowerAirTrap, upperAirTrap );
         }
@@ -265,13 +262,9 @@
     {
         if ( TRUE == didTimeout( airTrapFillStartTime, AIR_TRAP_FILL_TIMEOUT_MS ) )
         {
-#ifndef _RELEASE_
-//            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_TRAP_LEVELING_ALARM ) != SW_CONFIG_ENABLE_VALUE )
-#endif
+            // TODO: if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_TRAP_LEVELING_ALARM ) != SW_CONFIG_ENABLE_VALUE )
             {
-#ifndef TEST_UI_ONLY
                 activateAlarmNoData( ALARM_ID_TD_AIR_TRAP_FILL_TIMEOUT );
-#endif
             }
         }
     }
@@ -280,13 +273,9 @@
     {
         if ( TRUE == didTimeout( airTrapLowerStartTime, AIR_TRAP_LOWER_TIMEOUT_MS ) )
         {
-#ifndef _RELEASE_
-//            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_TRAP_LEVELING_ALARM ) != SW_CONFIG_ENABLE_VALUE )
-#endif
+            // TODO: if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_TRAP_LEVELING_ALARM ) != SW_CONFIG_ENABLE_VALUE )
             {
-#ifndef TEST_UI_ONLY
                 activateAlarmNoData( ALARM_ID_TD_AIR_TRAP_LOWER_TIMEOUT );
-#endif
             }
         }
     }
@@ -344,7 +333,6 @@
     publishAirTrapData();
 }
 
-
 /*********************************************************************//**
  * @brief
  * The getCalculatedAirPumpDutyCycle function get the Air Pump calculated  raw dutycycle based on H14 pressure
@@ -361,7 +349,6 @@
     return dutyCycle;
 }
 
-
 /*********************************************************************//**
  * @brief
  * The handleAirTrapManualControlState function handles the manual control