Index: firmware/.cproject
===================================================================
diff -u -rc0d1d149e3b669b0bf424206c725b5c1bfaff797 -rd3e396a8b52d79faa3b408e7533320d8f8cb76c0
--- firmware/.cproject	(.../.cproject)	(revision c0d1d149e3b669b0bf424206c725b5c1bfaff797)
+++ firmware/.cproject	(.../.cproject)	(revision d3e396a8b52d79faa3b408e7533320d8f8cb76c0)
@@ -13,7 +13,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1939553624" name="Debug" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug">
+				<configuration artifactExtension="out" artifactName="${ProjName}" buildProperties="" cleanCommand="${CG_CLEAN_CMD}" description="" id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1939553624" name="Debug" parent="com.ti.ccstudio.buildDefinitions.TMS470.Debug" postannouncebuildStep="AlarmEnum Check" postbuildStep="${PROJECT_ROOT}/checkAlarms.sh;" preannouncebuildStep="AlarmEnum Check" prebuildStep="${PROJECT_ROOT}/checkAlarms.sh;">
 					<folderInfo id="com.ti.ccstudio.buildDefinitions.TMS470.Debug.1939553624." name="/" resourcePath="">
 						<toolChain id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.DebugToolchain.516134309" name="TI Build Tools" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.DebugToolchain" targetTool="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.linkerDebug.150797795">
 							<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS.329041903" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_TAGS" valueType="stringList">
@@ -26,7 +26,7 @@
 							</option>
 							<option id="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION.1493801136" name="Compiler version" superClass="com.ti.ccstudio.buildDefinitions.core.OPT_CODEGEN_VERSION" value="18.12.2.LTS" valueType="string"/>
 							<targetPlatform id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.targetPlatformDebug.1046552665" name="Platform" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.targetPlatformDebug"/>
-							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.builderDebug.703238781" keepEnvironmentInBuildfile="false" name="GNU Make" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.builderDebug"/>
+							<builder buildPath="${BuildDirectory}" id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.builderDebug.703238781" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="GNU Make" parallelBuildOn="true" parallelizationNumber="optimal" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.builderDebug"/>
 							<tool id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.compilerDebug.1092939665" name="ARM Compiler" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.exe.compilerDebug">
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.CODE_STATE.481769107" name="Designate code state, 16-bit (thumb) or 32-bit (--code_state)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.CODE_STATE" value="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.CODE_STATE.32" valueType="enumerated"/>
 								<option id="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.SILICON_VERSION.1922380744" name="Target processor version (--silicon_version, -mv)" superClass="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.SILICON_VERSION" value="com.ti.ccstudio.buildDefinitions.TMS470_18.12.compilerID.SILICON_VERSION.7R4" valueType="enumerated"/>
Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -r9feea867113c62088f0ce91750127972dbd9bf53 -rd3e396a8b52d79faa3b408e7533320d8f8cb76c0
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 9feea867113c62088f0ce91750127972dbd9bf53)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision d3e396a8b52d79faa3b408e7533320d8f8cb76c0)
@@ -272,7 +272,7 @@
         // Ensure we do not sit in stopped state for too long
         if ( bloodSittingTimerCtr > MAX_TIME_BLOOD_SITTING )
         {
-            activateAlarmNoData( ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RINSEBACK );
+            activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK );
         }
     }
 
Index: firmware/App/Modes/TreatmentStop.c
===================================================================
diff -u -rac6532c81f2a6d4ad1c67420c22d59f6aeeaae13 -rd3e396a8b52d79faa3b408e7533320d8f8cb76c0
--- firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision ac6532c81f2a6d4ad1c67420c22d59f6aeeaae13)
+++ firmware/App/Modes/TreatmentStop.c	(.../TreatmentStop.c)	(revision d3e396a8b52d79faa3b408e7533320d8f8cb76c0)
@@ -142,7 +142,7 @@
     // Ensure we do not sit in stopped state for too long
     if ( ++bloodSittingTimerCtr > MAX_TIME_BLOOD_SITTING )
     {
-        activateAlarmNoData( ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RINSEBACK );
+        activateAlarmNoData( ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK );
     }
 
     // Execute treatment stop sub-mode state machine
Index: firmware/checkAlarms.sh
===================================================================
diff -u
--- firmware/checkAlarms.sh	(revision 0)
+++ firmware/checkAlarms.sh	(revision d3e396a8b52d79faa3b408e7533320d8f8cb76c0)
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+echo "
+#include <stdio.h>
+#include <stdlib.h>
+
+#define __ALARM_MGMT_C__
+#include \"Common.h\"
+#include \"AlarmDefs.h\"
+
+int main()
+{
+    ALARM_ID_T alarm;
+
+    for ( alarm = ALARM_ID_NO_ALARM; alarm < NUM_OF_ALARM_IDS; alarm++ )
+    {
+        if ( alarm != ALARM_TABLE[ alarm ].alarmID )
+        {
+            printf(\"Error: Alarm Enum and Alarm Table mismatch!\n\");
+            printf(\"Error: Alarm %i NOT MATCH Alarm Table Index %i!\n\", alarm, ALARM_TABLE[ alarm ].alarmID);
+            exit(1);
+        }
+    }
+    printf(\"Alarm table check completed!\n\");
+}" > alarmCheck.c
+
+gcc -o alarmCheck alarmCheck.c -I../App -I../App/Services -I../Common -I../FWCommon -I../include
+./alarmCheck