Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -r40bcef6aa65af6c93ce937c6c4aa2de13e8a78d3 -r9982992ce63b422258a4fb83ec734a1f41625be2
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 40bcef6aa65af6c93ce937c6c4aa2de13e8a78d3)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 9982992ce63b422258a4fb83ec734a1f41625be2)
@@ -18,6 +18,7 @@
 
 #include "Common.h"
 #include "AlarmLamp.h"
+#include "AlarmMgmt.h"
 #include "OperationModes.h"
 #include "SystemComm.h"
 #include "WatchdogMgmt.h"
@@ -51,6 +52,9 @@
     // run operation mode state machine
     execOperationModes();
 
+    // manage alarm state
+    execAlarmMgmt();
+
     // control alarm lamp
     execAlarmLamp();
 
Fisheye: Tag 9982992ce63b422258a4fb83ec734a1f41625be2 refers to a dead (removed) revision in file `firmware/Debug/App/Contollers/subdir_rules.mk'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9982992ce63b422258a4fb83ec734a1f41625be2 refers to a dead (removed) revision in file `firmware/Debug/App/Contollers/subdir_vars.mk'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9982992ce63b422258a4fb83ec734a1f41625be2 refers to a dead (removed) revision in file `firmware/Debug/App/Drivers/subdir_rules.mk'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9982992ce63b422258a4fb83ec734a1f41625be2 refers to a dead (removed) revision in file `firmware/Debug/App/Drivers/subdir_vars.mk'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9982992ce63b422258a4fb83ec734a1f41625be2 refers to a dead (removed) revision in file `firmware/Debug/App/Modes/subdir_rules.mk'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9982992ce63b422258a4fb83ec734a1f41625be2 refers to a dead (removed) revision in file `firmware/Debug/App/Modes/subdir_vars.mk'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9982992ce63b422258a4fb83ec734a1f41625be2 refers to a dead (removed) revision in file `firmware/Debug/App/Tasks/subdir_rules.mk'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9982992ce63b422258a4fb83ec734a1f41625be2 refers to a dead (removed) revision in file `firmware/Debug/App/Tasks/subdir_vars.mk'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9982992ce63b422258a4fb83ec734a1f41625be2 refers to a dead (removed) revision in file `firmware/Debug/ccsObjs.opt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9982992ce63b422258a4fb83ec734a1f41625be2 refers to a dead (removed) revision in file `firmware/Debug/makefile'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9982992ce63b422258a4fb83ec734a1f41625be2 refers to a dead (removed) revision in file `firmware/Debug/objects.mk'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9982992ce63b422258a4fb83ec734a1f41625be2 refers to a dead (removed) revision in file `firmware/Debug/source/subdir_rules.mk'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9982992ce63b422258a4fb83ec734a1f41625be2 refers to a dead (removed) revision in file `firmware/Debug/source/subdir_vars.mk'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 9982992ce63b422258a4fb83ec734a1f41625be2 refers to a dead (removed) revision in file `firmware/Debug/sources.mk'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: firmware/source/sys_main.c
===================================================================
diff -u -r1156c9be51ef9f40054860355ebee40b49ef03ca -r9982992ce63b422258a4fb83ec734a1f41625be2
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision 1156c9be51ef9f40054860355ebee40b49ef03ca)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 9982992ce63b422258a4fb83ec734a1f41625be2)
@@ -52,19 +52,23 @@
 /* USER CODE BEGIN (1) */
 #include "system.h"
 #include "sys_dma.h"
+#include "adc.h"
 #include "can.h"
+#include "etpwm.h"
 #include "gio.h"
 #include "mibspi.h"
 #include "sci.h"
 #include "rti.h"
 
 #include "Common.h"
 #include "AlarmLamp.h"
+#include "BloodFlow.h"
 #include "AlarmMgmt.h"
 #include "Buttons.h"
 #include "CommBuffers.h"
 #include "CPLD.h"
 #include "FPGA.h"
+#include "InternalADC.h"
 #include "MsgQueues.h"
 #include "OperationModes.h"
 #include "SafetyShutdown.h"
@@ -124,7 +128,9 @@
 static void initProcessor( void )
 {
     gioInit();      // configure GPIO pins
+    adcInit();      // configure internal ADC channels
     mibspiInit();   // re-purposing MIBSPI5 I/O/C pins as GPIO
+    etpwmInit();    // configure PWMs
     canInit();      // CAN1 = CAN, re-purposing CAN2 and CAN3 Rx and Tx pins as GPIO
     sciInit();      // SCI1 used for PC serial interface, SCI2 used for FPGA serial interface
     dmaEnable();    // enable DMA
@@ -144,6 +150,8 @@
     initTimers();
     initSafetyShutdown();
     initCPLD();
+    initInternalADC();
+    initBloodFlow();
     initAlarmLamp();
     initButtons();
     initWatchdogMgmt();