Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r373b25b7e3229e9203f4af6bfa491def69e2ce83 -rf38051e1882be3e774f10ba924343a6ce1334890
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 373b25b7e3229e9203f4af6bfa491def69e2ce83)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision f38051e1882be3e774f10ba924343a6ce1334890)
@@ -64,12 +64,13 @@
 #define FLOW_SAMPLES_TO_AVERAGE                        ( 250 / TASK_PRIORITY_INTERVAL )            ///< Averaging flow data over 250 ms intervals.
 #define FLOW_AVERAGE_MULTIPLIER                        ( 1.0 / (F32)FLOW_SAMPLES_TO_AVERAGE )      ///< Optimization - multiplying is faster than dividing.
 
-//#define RO_FLOW_ADC_TO_LPM_FACTOR                      5555                                        ///< Conversion factor from ADC counts to LPM (liters/min) for RO flow rate (multiply this by inverse of FPGA reading).
-
+#ifdef USE_SMALL_FLOW_SENSOR_K_FACTOR
 // TODO new flow sensor k factor for testing only
-#define RO_FLOW_ADC_TO_LPM_FACTOR                      300                                        ///< Conversion factor from ADC counts to LPM (liters/min) for RO flow rate (multiply this by inverse of FPGA reading).
+#define RO_FLOW_ADC_TO_LPM_FACTOR                      300                                         ///< Conversion factor from ADC counts to LPM (liters/min) for RO flow rate (multiply this by inverse of FPGA reading).
+#else
+#define RO_FLOW_ADC_TO_LPM_FACTOR                      5555                                        ///< Conversion factor from ADC counts to LPM (liters/min) for RO flow rate (multiply this by inverse of FPGA reading).
+#endif
 
-
 #define ROP_FLOW_TO_PWM_SLOPE                          0.1                                         ///< Slope of flow to PWM line equation.
 #define ROP_FLOW_TO_PWM_INTERCEPT                      0.0                                         ///< Intercept of flow to PWM line equation.
 
@@ -183,7 +184,7 @@
                                                                  MAX_PRESSURE_OUT_OF_RANGE_PERSISTENT_INTERVAL );
 
     // Initialize the persistent alarm for not turning off the pump
-    initPersistentAlarm( ALARM_ID_RO_PUMP_OFF_FAULT, SAFETY_SHUTDOWN_TIMEOUT, SAFETY_SHUTDOWN_TIMEOUT );
+    initPersistentAlarm( ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE, SAFETY_SHUTDOWN_TIMEOUT, SAFETY_SHUTDOWN_TIMEOUT );
 
     // Initialize the variables
     roControlTimerCounter             = 0;
@@ -390,10 +391,10 @@
         F32 pressureInlet  = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_INLET );
         BOOL isPumpRunning = ( pressureInlet + MAX_PRESSURE_TARGET_TOLERANCE ) < actualPressure;
 
-        checkPersistentAlarm( ALARM_ID_RO_PUMP_OFF_FAULT, isPumpRunning, pressureInlet, ( pressureInlet + MAX_PRESSURE_TARGET_TOLERANCE ) );
+        checkPersistentAlarm( ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE, isPumpRunning, pressureInlet, ( pressureInlet + MAX_PRESSURE_TARGET_TOLERANCE ) );
 
         // Check if it has timed out
-        if ( TRUE == isAlarmActive( ALARM_ID_RO_PUMP_OFF_FAULT ) )
+        if ( TRUE == isAlarmActive( ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE ) )
         {
             activateSafetyShutdown();
         }