Index: firmware/App/Controllers/AirTrap.c
===================================================================
diff -u -rf48a62ac25425ea9f3b49bec3ef5a538a7834a11 -r52c71d1f7ca375d7d08829a92ccf3f6363fe22a2
--- firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision f48a62ac25425ea9f3b49bec3ef5a538a7834a11)
+++ firmware/App/Controllers/AirTrap.c	(.../AirTrap.c)	(revision 52c71d1f7ca375d7d08829a92ccf3f6363fe22a2)
@@ -43,18 +43,14 @@
 #define AIR_PUMP_ON_DELAY_TIME_MS             ( 10 * MS_PER_SECOND )                              ///< Delay between air pump On (in ms).
 #define AIR_PUMP_STOP_TIME_MS                 ( 1 * MS_PER_SECOND )                               ///< Maximum air pump turn on time
 
-//#define AIR_PUMP_ON_ERROR_MAX_CNT           6                                                   ///< Maximum number of air pump on events within time window before alarm triggered. Do not exceed MAX_TIME_WINDOWED_COUNT.
-//#define AIR_PUMP_ON_ERROR_TIME_WIN_MS       ( 60 * MS_PER_SECOND )                              ///< Time window for Air Pump on count error.
 #define AIR_TRAP_ILLEGAL_LEVELS_TIMEOUT_MS    ( 2 * MS_PER_SECOND )                               ///< Air trap illegal values timeout (in ms)
 #define DATA_PUBLISH_COUNTER_START_COUNT      7                                                   ///< Data publish counter start count.
 
 /// Air pump on delay after fill adjustment
 static const U32 AIR_PUMP_ON_DELAY_ADJUST_AFTER_FILL = ( AIR_PUMP_ON_DELAY_TIME_MS - ( 1 * MS_PER_SECOND ) );
 
-#define AIR_PUMP_MOTOR_FILL_PWM               58.8F                                               ///< Power level setting (PWM) in percentage for H12 air pump to fill (raise level) the air trap.
-#define AIR_PUMP_MOTOR_LOWER_PWM              23.5F                                               ///< Power level setting (PWM) in percentage for H12 air pump to lower the level of the air trap.
-#define AIR_PUMP_MOTOR_MIN_PWM_OVERRIDE       60                                                  ///< Air pump motor minimum PWM to override.
-#define AIR_PUMP_MOTOR_MAX_PWM_OVERRIDE       250                                                 ///< Air pump motor maximum PWM to override.
+#define AIR_PUMP_MOTOR_FILL_PWM               60.0F                                               ///< Power level setting (PWM) in percentage for H12 air pump to fill (raise level) the air trap.
+#define AIR_PUMP_MOTOR_LOWER_PWM              24.0F                                               ///< Power level setting (PWM) in percentage for H12 air pump to lower the level of the air trap.
 /// LDT-2384 test formula for air trap lower events for air pump duty cycle based on venous pressure
 /// air pump duty cycle (% PWM) = 0.0002x^2 + 0.0925x + 25.467, where x is long filtered (60 sec) H14 venous pressure in mmHg before air trap lower event
 #define QUADRATIC_COEFFICIENT                 0.0002F                                             ///< X2 quadratic coefficient