Index: PersistentAlarm.h
===================================================================
diff -u -r97f119050f52c01aa9346c80b706dfdbbda3ac9e -r4b13eff164ec468e415fff197ed8af3b85504df0
--- PersistentAlarm.h	(.../PersistentAlarm.h)	(revision 97f119050f52c01aa9346c80b706dfdbbda3ac9e)
+++ PersistentAlarm.h	(.../PersistentAlarm.h)	(revision 4b13eff164ec468e415fff197ed8af3b85504df0)
@@ -8,7 +8,7 @@
 * @file PersistentAlarm.h
 *
 * @author (last) Quang Nguyen
-* @date (last) 17-Aug-2020
+* @date (last) 02-Sep-2020
 *
 * @author (original) Quang Nguyen
 * @date (original) 17-Aug-2020
@@ -34,25 +34,35 @@
 typedef enum PersistentAlarm
 {
 #ifdef _HD_
-    PERSISTENT_ALARM_ARTERIAL_PRESSURE_LOW,             ///< Arterial pressure too low during treatment
-    PERSISTENT_ALARM_ARTERIAL_PRESSURE_HIGH,            ///< Arterial pressure too high during treatment
-    PERSISTENT_ALARM_VENOUS_PRESSURE_LOW,               ///< Venous pressure too low during treatment
-    PERSISTENT_ALARM_VENOUS_PRESSURE_HIGH,              ///< Venous pressure too high during treatment
+    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_ARTERIAL_PRESSURE_LOW,                         ///< Arterial pressure too low during treatment
+    PERSISTENT_ALARM_ARTERIAL_PRESSURE_HIGH,                        ///< Arterial pressure too high during treatment
+    PERSISTENT_ALARM_VENOUS_PRESSURE_LOW,                           ///< Venous pressure too low during treatment
+    PERSISTENT_ALARM_VENOUS_PRESSURE_HIGH,                          ///< Venous pressure too high during treatment
 #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_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,
-                          F32 persistentClearCount, F32 persistentTriggerCount );
+                          U32 persistentClearPeriod, U32 persistentTriggerPeriod );
 void checkPersistentAlarm( PERSISTENT_ALARM_T const alarmIndex, BOOL const isOutOfRange, F32 const data, F32 const limit );
 
 /**@}*/