Index: firmware/App/Controllers/AirPump.c
===================================================================
diff -u -rbcb2d06f70133461b4dccff75dd544a2013ad725 -rc70a43525f1db35c45d79d4e1b2f87f7ea84e579
--- firmware/App/Controllers/AirPump.c	(.../AirPump.c)	(revision bcb2d06f70133461b4dccff75dd544a2013ad725)
+++ firmware/App/Controllers/AirPump.c	(.../AirPump.c)	(revision c70a43525f1db35c45d79d4e1b2f87f7ea84e579)
@@ -99,7 +99,7 @@
     // need to pass the result immediately to user when user enter invalid range
     if ( FALSE == validInput )
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_AIR_PUMP_DUTY_CYCLE_OUT_OF_RANGE, power, (U32)state )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_TD_AIR_PUMP_DUTY_CYCLE_OUT_OF_RANGE, power )
         result = FALSE;
     }
     // unsigned integer never be less than 0
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 )
             }
         }
     }
Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r6f02ff4686ec9dfc60247e9ed3fc9c5cc7771543 -rc70a43525f1db35c45d79d4e1b2f87f7ea84e579
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 6f02ff4686ec9dfc60247e9ed3fc9c5cc7771543)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision c70a43525f1db35c45d79d4e1b2f87f7ea84e579)
@@ -183,6 +183,7 @@
     SW_FAULT_ID_TD_VALVES_INVALID_FIND_DEENERGIZED_EDGE = 152,
     SW_FAULT_ID_BLOOD_PRIME_INVALID_STATE = 153,
     SW_FAULT_ID_MODE_PRE_TREATMENT_INVALID_STATE = 148,
+    SW_FAULT_ID_TD_AIR_PUMP_DUTY_CYCLE_OUT_OF_RANGE = 149,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;