Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -ra2bc96881a5fc3d8f779246b2abebf15a8de9384 -r88a641b7b0185e0bad77e21e6d438e1d7283fd28
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision a2bc96881a5fc3d8f779246b2abebf15a8de9384)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 88a641b7b0185e0bad77e21e6d438e1d7283fd28)
@@ -237,9 +237,7 @@
                             MIN_BLOOD_PUMP_PWM_DUTY_CYCLE, MAX_BLOOD_PUMP_PWM_DUTY_CYCLE );
 
     // Initialize persistent alarm for flow sensor signal strength too low
-    initPersistentAlarm( PERSISTENT_ALARM_BLOOD_FLOW_SIGNAL_STRENGTH,
-                         ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW,
-                         FALSE, FLOW_SIG_STRGTH_ALARM_PERSIST, FLOW_SIG_STRGTH_ALARM_PERSIST );
+    initPersistentAlarm( ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW, FLOW_SIG_STRGTH_ALARM_PERSIST, FLOW_SIG_STRGTH_ALARM_PERSIST );
 }
 
 /*********************************************************************//**
@@ -1242,7 +1240,10 @@
         F32  sigStrength = getMeasuredBloodFlowSignalStrength();
         BOOL outOfRange = ( sigStrength < MIN_FLOW_SIG_STRENGTH ? TRUE : FALSE );
 
-        checkPersistentAlarm( PERSISTENT_ALARM_BLOOD_FLOW_SIGNAL_STRENGTH, outOfRange, sigStrength, MIN_FLOW_SIG_STRENGTH );
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW, outOfRange ) )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW, sigStrength, MIN_FLOW_SIG_STRENGTH );
+        }
     }
 #endif
 }
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -ra2bc96881a5fc3d8f779246b2abebf15a8de9384 -r88a641b7b0185e0bad77e21e6d438e1d7283fd28
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision a2bc96881a5fc3d8f779246b2abebf15a8de9384)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 88a641b7b0185e0bad77e21e6d438e1d7283fd28)
@@ -231,9 +231,7 @@
                             MIN_DIAL_IN_PUMP_PWM_DUTY_CYCLE, MAX_DIAL_IN_PUMP_PWM_DUTY_CYCLE );
 
     // Initialize persistent alarm for flow sensor signal strength too low
-    initPersistentAlarm( PERSISTENT_ALARM_DIALYSATE_FLOW_SIGNAL_STRENGTH,
-                         ALARM_ID_DIALYSATE_FLOW_SIGNAL_STRENGTH_TOO_LOW,
-                         FALSE, FLOW_SIG_STRGTH_ALARM_PERSIST, FLOW_SIG_STRGTH_ALARM_PERSIST );
+    initPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_SIGNAL_STRENGTH_TOO_LOW, FLOW_SIG_STRGTH_ALARM_PERSIST, FLOW_SIG_STRGTH_ALARM_PERSIST );
 }
 
 /*********************************************************************//**
@@ -1204,7 +1202,10 @@
         F32  sigStrength = getMeasuredDialInFlowSignalStrength();
         BOOL outOfRange = ( sigStrength < MIN_FLOW_SIG_STRENGTH ? TRUE : FALSE );
 
-        checkPersistentAlarm( PERSISTENT_ALARM_DIALYSATE_FLOW_SIGNAL_STRENGTH, outOfRange, sigStrength, MIN_FLOW_SIG_STRENGTH );
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DIALYSATE_FLOW_SIGNAL_STRENGTH_TOO_LOW, outOfRange ) )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DIALYSATE_FLOW_SIGNAL_STRENGTH_TOO_LOW, sigStrength, MIN_FLOW_SIG_STRENGTH );
+        }
     }
 #endif
 }
Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r30f049651877229042e3f8700c8596e5b9a1e0f4 -r88a641b7b0185e0bad77e21e6d438e1d7283fd28
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 30f049651877229042e3f8700c8596e5b9a1e0f4)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 88a641b7b0185e0bad77e21e6d438e1d7283fd28)
@@ -116,14 +116,10 @@
 void initPresOccl( void )
 {
     // Initialize persistent pressure alarms
-    initPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_LOW, ALARM_ID_ARTERIAL_PRESSURE_LOW,
-                         isAlarmRecoverable( ALARM_ID_ARTERIAL_PRESSURE_LOW ), PRES_ALARM_PERSISTENCE, PRES_ALARM_PERSISTENCE );
-    initPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_HIGH, ALARM_ID_ARTERIAL_PRESSURE_HIGH,
-                         isAlarmRecoverable( ALARM_ID_ARTERIAL_PRESSURE_HIGH ), PRES_ALARM_PERSISTENCE, PRES_ALARM_PERSISTENCE );
-    initPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_LOW, ALARM_ID_VENOUS_PRESSURE_LOW,
-                         isAlarmRecoverable( ALARM_ID_VENOUS_PRESSURE_LOW ), PRES_ALARM_PERSISTENCE, PRES_ALARM_PERSISTENCE );
-    initPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_HIGH, ALARM_ID_VENOUS_PRESSURE_HIGH,
-                         isAlarmRecoverable( ALARM_ID_VENOUS_PRESSURE_HIGH ), PRES_ALARM_PERSISTENCE, PRES_ALARM_PERSISTENCE );
+    initPersistentAlarm( ALARM_ID_ARTERIAL_PRESSURE_LOW, PRES_ALARM_PERSISTENCE, PRES_ALARM_PERSISTENCE );
+    initPersistentAlarm( ALARM_ID_ARTERIAL_PRESSURE_HIGH, PRES_ALARM_PERSISTENCE, PRES_ALARM_PERSISTENCE );
+    initPersistentAlarm( ALARM_ID_VENOUS_PRESSURE_LOW, PRES_ALARM_PERSISTENCE, PRES_ALARM_PERSISTENCE );
+    initPersistentAlarm( ALARM_ID_VENOUS_PRESSURE_HIGH, PRES_ALARM_PERSISTENCE, PRES_ALARM_PERSISTENCE );
 }
 
 /*********************************************************************//**
@@ -319,8 +315,23 @@
         F32 artHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_ART_PRESSURE_HIGH_LIMIT );
 
 #ifndef DISABLE_PRESSURE_CHECKS
-        checkPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_LOW, artPres < artLowLimit, artPres, artLowLimit );
-        checkPersistentAlarm( PERSISTENT_ALARM_ARTERIAL_PRESSURE_HIGH, artPres > artHighLimit, artPres, artHighLimit );
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres < artLowLimit ) )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres, artLowLimit );
+        }
+        if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_ARTERIAL_PRESSURE_LOW, artPres < artLowLimit ) )
+        {
+            clearAlarmCondition( ALARM_ID_ARTERIAL_PRESSURE_LOW );
+        }
+
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPres > artHighLimit ) )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPres, artHighLimit );
+        }
+        if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_ARTERIAL_PRESSURE_HIGH, artPres > artHighLimit ) )
+        {
+            clearAlarmCondition( ALARM_ID_ARTERIAL_PRESSURE_HIGH );
+        }
 #endif
     }
 }
@@ -344,8 +355,23 @@
         F32 venHighLimit = (F32)getTreatmentParameterS32( TREATMENT_PARAM_VEN_PRESSURE_HIGH_LIMIT );
 
 #ifndef DISABLE_PRESSURE_CHECKS
-        checkPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_LOW, venPres < venLowLimit, venPres, venLowLimit );
-        checkPersistentAlarm( PERSISTENT_ALARM_VENOUS_PRESSURE_HIGH, venPres > venHighLimit, venPres, venHighLimit );
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_LOW, venPres < venLowLimit ) )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_LOW, venPres, venLowLimit );
+        }
+        if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_VENOUS_PRESSURE_LOW, venPres < venLowLimit ) )
+        {
+            clearAlarmCondition( ALARM_ID_VENOUS_PRESSURE_LOW );
+        }
+
+        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres > venHighLimit ) )
+        {
+            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres, venHighLimit );
+        }
+        if ( TRUE == isPersistentAlarmConditionCleared( ALARM_ID_VENOUS_PRESSURE_HIGH, venPres > venHighLimit ) )
+        {
+            clearAlarmCondition( ALARM_ID_VENOUS_PRESSURE_HIGH );
+        }
 #endif
     }
 }
Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -r970e3eba4d1a6da19656cc56f2c6e5e288789bdd -r88a641b7b0185e0bad77e21e6d438e1d7283fd28
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 970e3eba4d1a6da19656cc56f2c6e5e288789bdd)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 88a641b7b0185e0bad77e21e6d438e1d7283fd28)
@@ -439,7 +439,7 @@
 
     if ( TRUE == didTimeout( primeDialysateDialyzerStartTime, PRIME_DIALYSATE_DIALYZER_TIME_LIMIT ) )
     {
-        activateAlarm1Data( ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT, PRIME_DIALYSATE_DIALYZER_TIME_LIMIT );
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT, PRIME_DIALYSATE_DIALYZER_TIME_LIMIT );
     }
 
     return state;
@@ -502,7 +502,7 @@
 
     if ( TRUE == didTimeout( primeDialysateBypassStartTime, PRIME_DIALYSATE_BYPASS_TIME_LIMIT ) )
     {
-        activateAlarm1Data( ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT, PRIME_DIALYSATE_BYPASS_TIME_LIMIT );
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT, PRIME_DIALYSATE_BYPASS_TIME_LIMIT );
     }
 
     return PRIME_DIALYSATE_BYPASS_STATE;