Index: firmware/App/Monitors/WaterQualityMonitor.c
===================================================================
diff -u -rf07b1a8a668e0bc8421700ec781133c110ce074c -re61432cac762f194ece830635f3939c155054777
--- firmware/App/Monitors/WaterQualityMonitor.c	(.../WaterQualityMonitor.c)	(revision f07b1a8a668e0bc8421700ec781133c110ce074c)
+++ firmware/App/Monitors/WaterQualityMonitor.c	(.../WaterQualityMonitor.c)	(revision e61432cac762f194ece830635f3939c155054777)
@@ -35,35 +35,35 @@
 
 // ********** private definitions **********
 
-#define INLET_TEMPERATURE_LOW_THRESHOLD_C                            5.0F                                                    ///< Minimum allowed Inlet temperature in C.
-#define INLET_TEMPERATURE_HIGH_THRESHOLD_C                           30.0F                                                   ///< Maximum allowed Inlet temperature in C.
-#define INLET_TEMPERATURE_CRITICAL_THRESHOLD_C                       40.0F                                                   ///< Maximum allowed Inlet temperature in C during filters flush state.
+#define INLET_TEMPERATURE_LOW_THRESHOLD_C                            5.0F                                                    ///< Minimum allowed P10/D1 Inlet temperature in C.
+#define INLET_TEMPERATURE_HIGH_THRESHOLD_C                           30.0F                                                   ///< Maximum allowed P10/D1 Inlet temperature in C.
+#define INLET_TEMPERATURE_CRITICAL_THRESHOLD_C                       40.0F                                                   ///< Maximum allowed M3 Inlet temperature in C during filters flush state.
 #define INLET_TEMPERATURE_PERSISTENCE_TIMER_MS                       ( 5 * MS_PER_SECOND )                                   ///< Persistence timer to trigger alarm in ms.
 #define INLET_TEMPERATURE_PERSISTENCE_CLEAR_MS                       ( 5 * MS_PER_SECOND )                                   ///< Persistence timer to clear alarm in ms.
 
 #define MAX_INLET_RO_PUMP_PRESSURE_WARNING_HIGH_PSIG                 120.0F                                                  ///< Maximum allowed Input warning pressure to the RO membrane.
 #define MAX_INLET_RO_PUMP_PRESSURE_WARNING_LOW_PSIG                  58.0F                                                   ///< Minimum Input warning pressure to the RO membrane.
-#define MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG                    25.0F                                                   ///< Minimum allowed Input warning low pressure value in psig for RO featured.
-#define MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG                   40.0F                                                   ///< Maximum allowed Input warning high pressure value in psig for RO featured.
-#define MAX_INLET_WATER_PRESSURE_FAULT_HIGH_PSIG                     75.0F                                                   ///< Maximum allowed Input fault high pressure value in psig for RO featured.
-#define MIN_INLET_WATER_PRESSURE_PSIG                                1.0F                                                    ///< Minimum allowed Input fault pressure value in psig for RO featured.
-#define MIN_INLET_WATER_PRESSURE_DEFEATURED_WARNING_LOW_PSIG         5.0F                                                    ///< Minimum allowed Input warning low pressure value in psig for RO Defeatured.
-#define MAX_INLET_WATER_PRESSURE_DEFEATURED_WARNING_HIGH_PSIG        10.0F                                                   ///< Maximum allowed Input warning high pressure value in psig for RO Defeatured.
-#define MAX_INLET_WATER_PRESSURE_DEFEATURED_FAULT_HIGH_PSIG          40.0F                                                   ///< Maximum allowed Input fault high pressure value in psig for RO Defeatured.
-#define MIN_PRESSURE_RELIEF_WARNING_LOW_PSIG                         13.0F                                                   ///< Minimum pressure relief warning in psi
-#define MAX_PRESSURE_RELIEF_WARNING_HIGH_PSIG                        17.0F                                                   ///< Maximum pressure relief warning in psi
+#define MIN_INLET_WATER_PRESSURE_WARNING_LOW_PSIG                    25.0F                                                   ///< Minimum allowed M3 Input warning low pressure value in psig for RO featured.
+#define MAX_INLET_WATER_PRESSURE_WARNING_HIGH_PSIG                   40.0F                                                   ///< Maximum allowed M3 Input warning high pressure value in psig for RO featured.
+#define MAX_INLET_WATER_PRESSURE_FAULT_HIGH_PSIG                     75.0F                                                   ///< Maximum allowed M3 Input fault high pressure value in psig for RO featured.
+#define MIN_INLET_WATER_PRESSURE_PSIG                                1.0F                                                    ///< Minimum allowed P8 Input fault pressure value in psig for RO featured.
+#define MIN_INLET_WATER_PRESSURE_DEFEATURED_WARNING_LOW_PSIG         5.0F                                                    ///< Minimum allowed M3 Input warning low pressure value in psig for RO Defeatured.
+#define MAX_INLET_WATER_PRESSURE_DEFEATURED_WARNING_HIGH_PSIG        10.0F                                                   ///< Maximum allowed M3 Input warning high pressure value in psig for RO Defeatured.
+#define MAX_INLET_WATER_PRESSURE_DEFEATURED_FAULT_HIGH_PSIG          40.0F                                                   ///< Maximum allowed M3 Input fault high pressure value in psig for RO Defeatured.
+#define MIN_PRESSURE_RELIEF_WARNING_LOW_PSIG                         13.0F                                                   ///< Minimum P17 pressure relief warning in psi
+#define MAX_PRESSURE_RELIEF_WARNING_HIGH_PSIG                        17.0F                                                   ///< Maximum P17 pressure relief warning in psi
 #define MAX_PERMEATE_FLOW_FAULT_THRESHOLD                            1.25F                                                   ///< Maximum permeate flow threshold value in percentage.
-#define INLET_WATER_PRES_OUT_OF_RANGE_TIMEOUT_MS                     ( 5 * MS_PER_SECOND )                                   ///< Persistence period for pressure out of range error in milliseconds.
-#define INLET_WATER_PRES_OUT_OF_RANGE_CLEAR_MS                       ( 5 * MS_PER_SECOND )                                   ///< Persistence period for pressure out of range clear in milliseconds.
-#define INLET_WATER_PRES_RELIEF_OUT_OF_RANGE_TIMEOUT_MS              ( 1 * MS_PER_SECOND )                                   ///< Persistence period for pressure out of range error in milliseconds.
-#define INLET_WATER_PRES_RELIEF_OUT_OF_RANGE_CLEAR_MS                ( 1 * MS_PER_SECOND )                                   ///< Persistence period for pressure out of range clear in milliseconds.
+#define INLET_WATER_PRES_OUT_OF_RANGE_TIMEOUT_MS                     ( 5 * MS_PER_SECOND )                                   ///< Persistence period for M3 pressure out of range error in milliseconds.
+#define INLET_WATER_PRES_OUT_OF_RANGE_CLEAR_MS                       ( 5 * MS_PER_SECOND )                                   ///< Persistence period for M3 pressure out of range clear in milliseconds.
+#define INLET_WATER_PRES_RELIEF_OUT_OF_RANGE_TIMEOUT_MS              ( 1 * MS_PER_SECOND )                                   ///< Persistence period for P17 pressure out of range error in milliseconds.
+#define INLET_WATER_PRES_RELIEF_OUT_OF_RANGE_CLEAR_MS                ( 1 * MS_PER_SECOND )                                   ///< Persistence period for P17 pressure out of range clear in milliseconds.
 #define INLET_PRES_OUT_OF_RANGE_TIMEOUT_MS                           ( 3 * MS_PER_SECOND )                                   ///< Persistence period for p8 pressure out of range error in milliseconds.
 #define INLET_PRES_OUT_OF_RANGE_CLEAR_MS                             ( 3 * MS_PER_SECOND )                                   ///< Persistence period for p8 pressure out of range clear in milliseconds.
 
-#define OUTLET_CONDUCTIVITY_HIGH_THRESHOLD_US                        200.0F                                                  ///< Minimum allowed inlet conductivity in uS/cm.
+#define OUTLET_CONDUCTIVITY_HIGH_THRESHOLD_US                        200.0F                                                  ///< Minimum allowed P18 permeate conductivity in uS/cm.
 #define INLET_WATER_COND_OUT_OF_RANGE_TIMEOUT_MS                     ( 5 * MS_PER_SECOND )                                   ///< Persistence period for conductivity out of range error in milliseconds.
 #define INLET_WATER_COND_OUT_OF_RANGE_CLEAR_MS                       ( 5 * MS_PER_SECOND )                                   ///< Persistence period for conductivity out of range clear in milliseconds.
-#define INLET_CONDUCTIVITY_HIGH_THRESHOLD_US                         2000.0F                                                 ///< Maximum allowed outlet conductivity in uS/cm.
+#define INLET_CONDUCTIVITY_HIGH_THRESHOLD_US                         2000.0F                                                 ///< Maximum allowed P9 inlet conductivity in uS/cm.
 #define MIN_RO_REJECTION_RATIO_PCT                                   90.0F                                                   ///< Minimum RO rejection ration in percentage
 
 #define PERMEATE_FLOW_OUT_RANGE_PERSISTENCE_TIMEOUT_MS               ( 5 * MS_PER_SECOND )                                   ///< Verify Water timer ( in ms )
@@ -106,6 +106,7 @@
     // Temperature Alarms
     initPersistentAlarm( ALARM_ID_FP_INLET_TEMPERATURE_OUT_LOW_RANGE, INLET_TEMPERATURE_PERSISTENCE_CLEAR_MS, INLET_TEMPERATURE_PERSISTENCE_TIMER_MS );
     initPersistentAlarm( ALARM_ID_FP_INLET_TEMPERATURE_OUT_HIGH_RANGE, INLET_TEMPERATURE_PERSISTENCE_CLEAR_MS, INLET_TEMPERATURE_PERSISTENCE_TIMER_MS );
+    initPersistentAlarm( ALARM_ID_FP_INLET_TEMPERATURE_OUT_CRITICAL_RANGE, INLET_TEMPERATURE_PERSISTENCE_CLEAR_MS, INLET_TEMPERATURE_PERSISTENCE_TIMER_MS );
 
     // Conductivity Alarms
     initPersistentAlarm( ALARM_ID_FP_INLET_CONDUCTIVITY_OUT_HIGH_RANGE, INLET_WATER_COND_OUT_OF_RANGE_CLEAR_MS, INLET_WATER_COND_OUT_OF_RANGE_TIMEOUT_MS );