Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r60193b56d5b3a67801644008b9db8ee8e3916c31 -r891f92cdeae032aa920f9b861d4613cee41fb31b
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 60193b56d5b3a67801644008b9db8ee8e3916c31)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 891f92cdeae032aa920f9b861d4613cee41fb31b)
@@ -173,7 +173,7 @@
 
     if ( TRUE == stop )
     {
-        //activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
+        activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
     }
 
     // execute mode state machine
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r60193b56d5b3a67801644008b9db8ee8e3916c31 -r891f92cdeae032aa920f9b861d4613cee41fb31b
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 60193b56d5b3a67801644008b9db8ee8e3916c31)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 891f92cdeae032aa920f9b861d4613cee41fb31b)
@@ -112,7 +112,7 @@
 #ifndef RUN_WITHOUT_DG
     if ( TRUE == stop )
     {
-        //activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER ); // TODO - remove alarm?  Nothing to stop here.
+        activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER ); // TODO - remove alarm?  Nothing to stop here.
     }
 
     // State machine to get DG to prep a reservoir so we can start a treatment
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r60193b56d5b3a67801644008b9db8ee8e3916c31 -r891f92cdeae032aa920f9b861d4613cee41fb31b
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 60193b56d5b3a67801644008b9db8ee8e3916c31)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 891f92cdeae032aa920f9b861d4613cee41fb31b)
@@ -555,7 +555,7 @@
 
     if ( TRUE == stop )
     {
-        //activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
+        activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
     }
 
     // Treatment mode state machine
Index: firmware/App/Modes/SelfTests.c
===================================================================
diff -u -r60193b56d5b3a67801644008b9db8ee8e3916c31 -r891f92cdeae032aa920f9b861d4613cee41fb31b
--- firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 60193b56d5b3a67801644008b9db8ee8e3916c31)
+++ firmware/App/Modes/SelfTests.c	(.../SelfTests.c)	(revision 891f92cdeae032aa920f9b861d4613cee41fb31b)
@@ -431,8 +431,7 @@
 
     if ( SELF_TEST_STATUS_FAILED == result )
     {
-        // TODO disabled temporarily
-        //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRE_TREATMENT_DRY_SELF_TEST_FAILURE, currentDrySelfTestsState );
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_PRE_TREATMENT_DRY_SELF_TEST_FAILURE, currentDrySelfTestsState );
     }
 
     // Publish current self-test time data
@@ -448,8 +447,7 @@
         }
         else
         {
-            // TODO disabled temporarily
-            //SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT, currentDrySelfTestsState );
+            SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT, currentDrySelfTestsState );
         }
     }
 }
@@ -812,7 +810,7 @@
     }
     else
     {
-        //activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
+        activateAlarmNoData( ALARM_ID_INSTALL_NEW_CARTRIDGE );
     }
 
     if ( TRUE == doesAlarmStatusIndicateStop() )
Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -r60193b56d5b3a67801644008b9db8ee8e3916c31 -r891f92cdeae032aa920f9b861d4613cee41fb31b
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 60193b56d5b3a67801644008b9db8ee8e3916c31)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision 891f92cdeae032aa920f9b861d4613cee41fb31b)
@@ -117,7 +117,7 @@
         }
         else
         {
-            //activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
+            activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_BY_USER );
         }
         // coming back to stop state via non-alarm path, so no audio - just want alarm for its options
         signalAlarmSilence( ALARM_SILENCE_CMD_CANCEL );