Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -r573da874fd941a594c4a4b478b2f42ecaf6fff08 -rc70a43525f1db35c45d79d4e1b2f87f7ea84e579
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 573da874fd941a594c4a4b478b2f42ecaf6fff08)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision c70a43525f1db35c45d79d4e1b2f87f7ea84e579)
@@ -264,14 +264,17 @@
  *************************************************************************/
 void execAirTrapMonitorTreatment( void )
 {
+    AIR_TRAP_LEVELS_T lowerAirTrap = getLevelSensorState( H17_LEVL );
+    AIR_TRAP_LEVELS_T upperAirTrap = getLevelSensorState( H16_LEVL );
+
     // Check air trap fill timeout during treatment
     if ( AIR_TRAP_RAISE_LEVEL_STATE == airTrapControllerState )
     {
         if ( TRUE == didTimeout( airTrapFillStartTime, AIR_TRAP_FILL_TIMEOUT_MS ) )
         {
             // TODO: if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_TRAP_LEVELING_ALARM ) != SW_CONFIG_ENABLE_VALUE )
             {
-                activateAlarmNoData( ALARM_ID_TD_AIR_TRAP_FILL_TIMEOUT );
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_AIR_TRAP_FILL_TIMEOUT, lowerAirTrap, upperAirTrap )
             }
         }
     }
@@ -282,7 +285,7 @@
         {
             // TODO: if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_AIR_TRAP_LEVELING_ALARM ) != SW_CONFIG_ENABLE_VALUE )
             {
-                activateAlarmNoData( ALARM_ID_TD_AIR_TRAP_LOWER_TIMEOUT );
+                SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_AIR_TRAP_LOWER_TIMEOUT, lowerAirTrap, upperAirTrap )
             }
         }
     }