Index: firmware/source/sys_main.c
===================================================================
diff -u -reb877ae36c28eb83553ee11ccccf42e2c4a5b4d2 -r9f03f8819187df2f9200c240c794ad69f4882d4a
--- firmware/source/sys_main.c	(.../sys_main.c)	(revision eb877ae36c28eb83553ee11ccccf42e2c4a5b4d2)
+++ firmware/source/sys_main.c	(.../sys_main.c)	(revision 9f03f8819187df2f9200c240c794ad69f4882d4a)
@@ -52,24 +52,38 @@
 /* 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 "Buttons.h"
+#include "DGCommon.h"
+#include "Accel.h"
+#include "AlarmMgmt.h"
 #include "CommBuffers.h"
+#include "ConductivitySensors.h"
 #include "CPLD.h"
+#include "DrainPump.h"
 #include "FPGA.h"
+#include "Heaters.h"
+#include "InternalADC.h"
+#include "Interrupts.h"
+#include "LoadCell.h"
 #include "MsgQueues.h"
 #include "OperationModes.h"
+#include "Pressures.h"
+#include "Reservoirs.h"
+#include "ROPump.h"
+#include "RTC.h"
 #include "SafetyShutdown.h"
 #include "SystemComm.h"
 #include "TaskBG.h"
+#include "TemperatureSensors.h"
 #include "Timers.h"
+#include "Valves.h"
 #include "WatchdogMgmt.h"
 
 static void initProcessor( void );
@@ -99,9 +113,7 @@
     initTasks();        // setup and start the scheduled tasks
 
     // start task background (will not return)
-#ifndef _VECTORCAST_
     taskBackground();
-#endif
 
 /* USER CODE END */
 
@@ -123,7 +135,16 @@
 static void initProcessor( void )
 {
     gioInit();      // configure GPIO pins
-    mibspiInit();   // re-purposing MIBSPI5 I/O/C pins as GPIO
+    adcInit();      // configure internal ADC channels
+    mibspiInit();   // configure MIBSPI3 and re-purpose MIBSPI1 & 5 pins for GPIO
+    etpwmInit();    // configure PWMs
+        etpwmSetCmpA( etpwmREG1, 0 );
+        etpwmSetCmpB( etpwmREG1, 0 );
+        etpwmSetCmpB( etpwmREG2, 0 );
+        etpwmSetCmpA( etpwmREG3, 0 );
+        etpwmSetCmpA( etpwmREG6, 0 );
+        etpwmSetCmpB( etpwmREG6, 0 );
+        etpwmStartTBCLK();
     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
@@ -142,13 +163,25 @@
     initTimers();
     initSafetyShutdown();
     initCPLD();
-    initAlarmLamp();
-    initButtons();
+    initAlarmMgmt();
     initWatchdogMgmt();
+    initInterrupts();
     initFPGA();
+    initInternalADC();
+    initPressures();
+    initLoadCell();
+    initValves();
+    initHeaters();
+    initTemperatureSensors();
+    initConductivitySensors();
+    initROPump();
+    initDrainPump();
+    initAccel();
+    initRTC();
     initCommBuffers();
     initMsgQueues();
     initSystemComm();
+    initReservoirs();
     initOperationModes();
 }
 
@@ -178,7 +211,7 @@
     rtiInit();
     rtiEnableNotification( rtiNOTIFICATION_COMPARE0 | rtiNOTIFICATION_COMPARE1 | rtiNOTIFICATION_COMPARE3 );
     rtiStartCounter( rtiCOUNTER_BLOCK0 );
-    // the timer task (and other comm related interrupts) require FIQ enabled
+    // the timer task requires FIQ enabled
     _enable_FIQ();
     // the general and priority tasks require IRQ enabled
     _enable_IRQ();