Index: firmware/App/Monitors/WaterQualityMonitor.c
===================================================================
diff -u -r7b70f5410bf7532b1722be7310e74e998e387cb9 -r0797158d6e367debb04e043798f1aeb1fb17063b
--- firmware/App/Monitors/WaterQualityMonitor.c	(.../WaterQualityMonitor.c)	(revision 7b70f5410bf7532b1722be7310e74e998e387cb9)
+++ firmware/App/Monitors/WaterQualityMonitor.c	(.../WaterQualityMonitor.c)	(revision 0797158d6e367debb04e043798f1aeb1fb17063b)
@@ -8,7 +8,7 @@
 * @file    WaterQualityMonitor.c
 *
 * @author  (last)      “rkallala”
-* @date    (last)      15-Jan-2026
+* @date    (last)      27-Jan-2026
 *
 * @author  (original)  Michael Garthwaite
 * @date    (original)  08-Sep-2025
@@ -281,7 +281,11 @@
     if ( ( pressureP13 >= MAX_INLET_RO_PUMP_PRESSURE_WARNING_LOW_PSIG ) && ( pressureP13 < MAX_INLET_RO_PUMP_PRESSURE_WARNING_HIGH_PSIG ) )
     {
         isFdutyCycleOfRange = currentDutyCyclePct > calculatedDutyCyclePct;
-        checkPersistentAlarm( ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE, isFdutyCycleOfRange, calculatedDutyCyclePct, getCurrentROPumpDutyCyclePCT() );
+
+        if ( getTestConfigStatus( TEST_CONFIG_FP_DISABLE_RO_CURRENT_ALARMS ) != TRUE )
+        {
+            checkPersistentAlarm( ALARM_ID_FP_POWER_BUDGET_OUT_OF_RANGE, isFdutyCycleOfRange, calculatedDutyCyclePct, getCurrentROPumpDutyCyclePCT() );
+        }
     }
 }
 
@@ -365,7 +369,10 @@
     BOOL isConductivtyOutOfLowRange = FALSE;
 
     isConductivtyOutOfLowRange = ( ( conductivityP9 > INLET_CONDUCTIVITY_HIGH_THRESHOLD_US ) ? TRUE : FALSE );
-    checkPersistentAlarm( ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE, isConductivtyOutOfLowRange, conductivityP9, INLET_CONDUCTIVITY_HIGH_THRESHOLD_US );
+    if ( getTestConfigStatus( TEST_CONFIG_FP_DISABLE_CONDUCTIVITY_ALARMS ) != TRUE )
+    {
+        checkPersistentAlarm( ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE, isConductivtyOutOfLowRange, conductivityP9, INLET_CONDUCTIVITY_HIGH_THRESHOLD_US );
+    }
 }
 
 /*********************************************************************//**
@@ -384,7 +391,10 @@
     BOOL isConductivityOutOfLowRange = FALSE;
 
     isConductivityOutOfLowRange = ( ( conductivityP18 > OUTLET_CONDUCTIVITY_HIGH_THRESHOLD_US ) ? TRUE : FALSE );
-    checkPersistentAlarm( ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE, isConductivityOutOfLowRange, conductivityP18, OUTLET_CONDUCTIVITY_HIGH_THRESHOLD_US );
+    if ( getTestConfigStatus( TEST_CONFIG_FP_DISABLE_CONDUCTIVITY_ALARMS ) != TRUE )
+    {
+        checkPersistentAlarm( ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE, isConductivityOutOfLowRange, conductivityP18, OUTLET_CONDUCTIVITY_HIGH_THRESHOLD_US );
+    }
 }
 
 /*********************************************************************//**
@@ -404,7 +414,10 @@
     //TODO update the macro with value from institutional configuration
     if ( avgRORR < MIN_RO_REJECTION_RATIO_PCT )
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE, avgRORR, MIN_RO_REJECTION_RATIO_PCT )
+        if ( getTestConfigStatus( TEST_CONFIG_FP_DISABLE_CONDUCTIVITY_ALARMS ) != TRUE )
+        {
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_REJECTION_RATIO_LOW_RANGE, avgRORR, MIN_RO_REJECTION_RATIO_PCT )
+        }
     }
 }