Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r1781335a8c1833fad17b275bf44c7f6675e68423 -r9e6e86f604c8cce7c1704ae55d1e026de3422782
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 1781335a8c1833fad17b275bf44c7f6675e68423)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 9e6e86f604c8cce7c1704ae55d1e026de3422782)
@@ -417,8 +417,10 @@
     }
     else
     {
+#ifdef ENABLE_ALARM_2
         //Alarm when pressure is not in range
         SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_START_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
+#endif
     }
 
     return state;
@@ -511,13 +513,17 @@
         {
             if ( TRUE != isPressureDroppedDuringFill )
             {
+#ifdef ENABLE_ALARM_2
                 // When fill initiated, pressure is not dropped to the expected range, possible valve failures.
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
+#endif
             }
             else if ( TRUE != isPressureStalbilizedDuringFill )
             {
+#ifdef ENABLE_ALARM_2
                 // Alarm when switching time expired, but still pressure not in range which indicates fill is not yet completed.
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE1_FILL_END_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
+#endif
             }
             else
             {
@@ -588,8 +594,10 @@
     }
     else
     {
+#ifdef ENABLE_ALARM_2
         //Alarm when pressure is not in range
         SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE2_FILL_START_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
+#endif
     }
     return state;
 }
@@ -642,13 +650,17 @@
         {
             if ( TRUE != isPressureDroppedDuringFill )
             {
+#ifdef ENABLE_ALARM_2
                 // When fill initiated, pressure is not dropped to the expected range, possible valve failures.
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
+#endif
             }
             else if ( TRUE != isPressureStalbilizedDuringFill )
             {
+#ifdef ENABLE_ALARM_2
                 // Alarm when switching time expired, but still pressure not in range which indicates fill is not completed.
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DD_BC_STATE2_FILL_END_PRESSURE_OUT_OF_RANGE, freshDialPressure, spentDialPressure );
+#endif
             }
             else
             {