Index: PersistentAlarm.h
===================================================================
diff -u -r85db35aef9a57d1efc02bb3b42fc802b65aa3646 -r7c49409b1bfeee8fd788fe1cd2a6dbf2abda7fea
--- PersistentAlarm.h	(.../PersistentAlarm.h)	(revision 85db35aef9a57d1efc02bb3b42fc802b65aa3646)
+++ PersistentAlarm.h	(.../PersistentAlarm.h)	(revision 7c49409b1bfeee8fd788fe1cd2a6dbf2abda7fea)
@@ -34,25 +34,31 @@
 typedef enum PersistentAlarm
 {
 #ifdef _HD_
-    PERSISTENT_ALARM_BLOOD_FLOW_SIGNAL_STRENGTH,        ///< Blood flow signal strength too low
-    PERSISTENT_ALARM_DIALYSATE_FLOW_SIGNAL_STRENGTH,    ///< Dialysate flow signal strength too low
+    PERSISTENT_ALARM_BLOOD_FLOW_SIGNAL_STRENGTH,                    ///< Blood flow signal strength too low
+    PERSISTENT_ALARM_DIALYSATE_FLOW_SIGNAL_STRENGTH,                ///< Dialysate flow signal strength too low
 #endif
 #ifdef _DG_
-    PERSISTENT_ALARM_INLET_WATER_HIGH_TEMPERATURE,      ///< Inlet water high temperature persistent alarm 
-    PERSISTENT_ALARM_INLET_WATER_LOW_TEMPERATURE,       ///< Inlet water low temperature persistent alarm
-    PERSISTENT_ALARM_INLET_WATER_HIGH_CONDUCTIVITY,     ///< Inlet water high conductivity persistent alarm
-    PERSISTENT_ALARM_INLET_WATER_LOW_CONDUCTIVITY,      ///< Inlet water low conductivity persistent alarm
-    PERSISTENT_ALARM_RO_REJECTION_RATIO_OUT_OF_RANGE,   ///< RO rejection ratio out of range persistent alarm
-    PERSISTENT_ALARM_INLET_WATER_LOW_PRESSURE,          ///< Inlet water low pressure persistent alarm
-    PERSISTENT_ALARM_INLET_WATER_PRESSURE_FAULT,        ///< Inlet water pressure fault persistent alarm
+    PERSISTENT_ALARM_INLET_WATER_HIGH_TEMPERATURE,                  ///< Inlet water high temperature persistent alarm
+    PERSISTENT_ALARM_INLET_WATER_LOW_TEMPERATURE,                   ///< Inlet water low temperature persistent alarm
+    PERSISTENT_ALARM_INLET_WATER_HIGH_CONDUCTIVITY,                 ///< Inlet water high conductivity persistent alarm
+    PERSISTENT_ALARM_INLET_WATER_LOW_CONDUCTIVITY,                  ///< Inlet water low conductivity persistent alarm
+    PERSISTENT_ALARM_RO_REJECTION_RATIO_OUT_OF_RANGE,               ///< RO rejection ratio out of range persistent alarm
+    PERSISTENT_ALARM_INLET_WATER_LOW_PRESSURE,                      ///< Inlet water low pressure persistent alarm
+    PERSISTENT_ALARM_INLET_WATER_PRESSURE_FAULT,                    ///< Inlet water pressure fault persistent alarm
+    PERSISTENT_ALARM_POST_ACID_CONDUCTIVITY_OUT_OF_RANGE,           ///< Post acid concentrate conductivity out of range
+    PERSISTENT_ALARM_POST_BICARB_CONDUCTIVITY_OUT_OF_RANGE,         ///< Post bicarbonate concentrate conductivity out of range
+    PERSISTENT_ALARM_RO_PUMP_FLOW_RATE_OUT_OF_RANGE,                ///< RO pump flow rate out of range
+    PERSISTENT_ALARM_CP1_SPEED_CONTROL_ERROR,                       ///< Concentrate pump CP1 speed control error
+    PERSISTENT_ALARM_CP2_SPEED_CONTROL_ERROR,                       ///< Concentrate pump CP2 speed control error
 #endif
-    NUM_OF_PERSISTENT_ALARM                             ///< Number of persistent alarms
+    NUM_OF_PERSISTENT_ALARM                                         ///< Number of persistent alarms
 } PERSISTENT_ALARM_T;
 
 // ********** public function prototypes **********
 
+// Persistent period resolution is in ms
 void initPersistentAlarm( PERSISTENT_ALARM_T alarmIndex, ALARM_ID_T alarm, BOOL isClearable,
-                          U32 persistentClearCount, U32 persistentTriggerCount );
+                          U32 persistentClearPeriod, U32 persistentTriggerPeriod );
 void checkPersistentAlarm( PERSISTENT_ALARM_T const alarmIndex, BOOL const isOutOfRange, F32 const data );
 
 /**@}*/