Index: firmware/Debug/makefile
===================================================================
diff -u -rdcbd821e41803adc6e582d909207bc97f85ff939 -rf068446fdb7889d320ddb6ffbd58f347ce0501e7
--- firmware/Debug/makefile	(.../makefile)	(revision dcbd821e41803adc6e582d909207bc97f85ff939)
+++ firmware/Debug/makefile	(.../makefile)	(revision f068446fdb7889d320ddb6ffbd58f347ce0501e7)
@@ -10,9 +10,9 @@
 ORDERED_OBJS += \
 "./irqDispatch_a.obj" \
 "./irqDispatch_c.obj" \
-"./App/Controllers/AlarmLamp.obj" \
 "./App/Drivers/CPLD.obj" \
 "./App/Drivers/Comm.obj" \
+"./App/Drivers/InternalADC.obj" \
 "./App/Drivers/SafetyShutdown.obj" \
 "./App/Modes/ModeDisinfect.obj" \
 "./App/Modes/ModeDrain.obj" \
@@ -24,10 +24,12 @@
 "./App/Modes/ModeService.obj" \
 "./App/Modes/ModeStandby.obj" \
 "./App/Modes/OperationModes.obj" \
+"./App/Services/AlarmMgmt.obj" \
 "./App/Services/CommBuffers.obj" \
 "./App/Services/FPGA.obj" \
 "./App/Services/Interrupts.obj" \
 "./App/Services/MsgQueues.obj" \
+"./App/Services/PIControllers.obj" \
 "./App/Services/SystemComm.obj" \
 "./App/Services/SystemCommMessages.obj" \
 "./App/Services/Timers.obj" \
@@ -37,6 +39,8 @@
 "./App/Tasks/TaskGeneral.obj" \
 "./App/Tasks/TaskPriority.obj" \
 "./App/Tasks/TaskTimer.obj" \
+"./FWCommon/RTC.obj" \
+"./source/adc.obj" \
 "./source/can.obj" \
 "./source/crc.obj" \
 "./source/dabort.obj" \
@@ -80,18 +84,18 @@
 # All of the sources participating in the build are defined here
 -include sources.mk
 -include subdir_vars.mk
--include App/Controllers/subdir_vars.mk
 -include App/Drivers/subdir_vars.mk
 -include App/Modes/subdir_vars.mk
 -include App/Services/subdir_vars.mk
 -include App/Tasks/subdir_vars.mk
+-include FWCommon/subdir_vars.mk
 -include source/subdir_vars.mk
 -include subdir_rules.mk
--include App/Controllers/subdir_rules.mk
 -include App/Drivers/subdir_rules.mk
 -include App/Modes/subdir_rules.mk
 -include App/Services/subdir_rules.mk
 -include App/Tasks/subdir_rules.mk
+-include FWCommon/subdir_rules.mk
 -include source/subdir_rules.mk
 -include objects.mk
 
@@ -223,10 +227,10 @@
 # Other Targets
 clean:
 	-$(RM) $(BIN_OUTPUTS__QUOTED)$(EXE_OUTPUTS__QUOTED)
-	-$(RM) "irqDispatch_a.obj" "irqDispatch_c.obj" "App/Controllers/AlarmLamp.obj" "App/Drivers/CPLD.obj" "App/Drivers/Comm.obj" "App/Drivers/SafetyShutdown.obj" "App/Modes/ModeDisinfect.obj" "App/Modes/ModeDrain.obj" "App/Modes/ModeFault.obj" "App/Modes/ModeFill.obj" "App/Modes/ModeFlush.obj" "App/Modes/ModeInitPOST.obj" "App/Modes/ModePostTreat.obj" "App/Modes/ModeService.obj" "App/Modes/ModeStandby.obj" "App/Modes/OperationModes.obj" "App/Services/CommBuffers.obj" "App/Services/FPGA.obj" "App/Services/Interrupts.obj" "App/Services/MsgQueues.obj" "App/Services/SystemComm.obj" "App/Services/SystemCommMessages.obj" "App/Services/Timers.obj" "App/Services/Utilities.obj" "App/Services/WatchdogMgmt.obj" "App/Tasks/TaskBG.obj" "App/Tasks/TaskGeneral.obj" "App/Tasks/TaskPriority.obj" "App/Tasks/TaskTimer.obj" "source/can.obj" "source/crc.obj" "source/dabort.obj" "source/ecap.obj" "source/emac.obj" "source/eqep.obj" "source/errata_SSWF021_45.obj" "source/esm.obj" "source/etpwm.obj" "source/gio.obj" "source/lin.obj" 
-	-$(RM) "source/mdio.obj" "source/mibspi.obj" "source/notification.obj" "source/phy_dp83640.obj" "source/pinmux.obj" "source/rti.obj" "source/sci.obj" "source/sys_core.obj" "source/sys_dma.obj" "source/sys_intvecs.obj" "source/sys_main.obj" "source/sys_mpu.obj" "source/sys_pcr.obj" "source/sys_phantom.obj" "source/sys_pmm.obj" "source/sys_pmu.obj" "source/sys_selftest.obj" "source/sys_startup.obj" "source/sys_vim.obj" "source/system.obj" 
-	-$(RM) "irqDispatch_c.d" "App/Controllers/AlarmLamp.d" "App/Drivers/CPLD.d" "App/Drivers/Comm.d" "App/Drivers/SafetyShutdown.d" "App/Modes/ModeDisinfect.d" "App/Modes/ModeDrain.d" "App/Modes/ModeFault.d" "App/Modes/ModeFill.d" "App/Modes/ModeFlush.d" "App/Modes/ModeInitPOST.d" "App/Modes/ModePostTreat.d" "App/Modes/ModeService.d" "App/Modes/ModeStandby.d" "App/Modes/OperationModes.d" "App/Services/CommBuffers.d" "App/Services/FPGA.d" "App/Services/Interrupts.d" "App/Services/MsgQueues.d" "App/Services/SystemComm.d" "App/Services/SystemCommMessages.d" "App/Services/Timers.d" "App/Services/Utilities.d" "App/Services/WatchdogMgmt.d" "App/Tasks/TaskBG.d" "App/Tasks/TaskGeneral.d" "App/Tasks/TaskPriority.d" "App/Tasks/TaskTimer.d" "source/can.d" "source/crc.d" "source/ecap.d" "source/emac.d" "source/eqep.d" "source/errata_SSWF021_45.d" "source/esm.d" "source/etpwm.d" "source/gio.d" "source/lin.d" "source/mdio.d" "source/mibspi.d" "source/notification.d" "source/phy_dp83640.d" "source/pinmux.d" "source/rti.d" 
-	-$(RM) "source/sci.d" "source/sys_dma.d" "source/sys_main.d" "source/sys_pcr.d" "source/sys_phantom.d" "source/sys_pmm.d" "source/sys_selftest.d" "source/sys_startup.d" "source/sys_vim.d" "source/system.d" 
+	-$(RM) "irqDispatch_a.obj" "irqDispatch_c.obj" "App/Drivers/CPLD.obj" "App/Drivers/Comm.obj" "App/Drivers/InternalADC.obj" "App/Drivers/SafetyShutdown.obj" "App/Modes/ModeDisinfect.obj" "App/Modes/ModeDrain.obj" "App/Modes/ModeFault.obj" "App/Modes/ModeFill.obj" "App/Modes/ModeFlush.obj" "App/Modes/ModeInitPOST.obj" "App/Modes/ModePostTreat.obj" "App/Modes/ModeService.obj" "App/Modes/ModeStandby.obj" "App/Modes/OperationModes.obj" "App/Services/AlarmMgmt.obj" "App/Services/CommBuffers.obj" "App/Services/FPGA.obj" "App/Services/Interrupts.obj" "App/Services/MsgQueues.obj" "App/Services/PIControllers.obj" "App/Services/SystemComm.obj" "App/Services/SystemCommMessages.obj" "App/Services/Timers.obj" "App/Services/Utilities.obj" "App/Services/WatchdogMgmt.obj" "App/Tasks/TaskBG.obj" "App/Tasks/TaskGeneral.obj" "App/Tasks/TaskPriority.obj" "App/Tasks/TaskTimer.obj" "FWCommon/RTC.obj" "source/adc.obj" "source/can.obj" "source/crc.obj" "source/dabort.obj" "source/ecap.obj" "source/emac.obj" "source/eqep.obj" 
+	-$(RM) "source/errata_SSWF021_45.obj" "source/esm.obj" "source/etpwm.obj" "source/gio.obj" "source/lin.obj" "source/mdio.obj" "source/mibspi.obj" "source/notification.obj" "source/phy_dp83640.obj" "source/pinmux.obj" "source/rti.obj" "source/sci.obj" "source/sys_core.obj" "source/sys_dma.obj" "source/sys_intvecs.obj" "source/sys_main.obj" "source/sys_mpu.obj" "source/sys_pcr.obj" "source/sys_phantom.obj" "source/sys_pmm.obj" "source/sys_pmu.obj" "source/sys_selftest.obj" "source/sys_startup.obj" "source/sys_vim.obj" "source/system.obj" 
+	-$(RM) "irqDispatch_c.d" "App/Drivers/CPLD.d" "App/Drivers/Comm.d" "App/Drivers/InternalADC.d" "App/Drivers/SafetyShutdown.d" "App/Modes/ModeDisinfect.d" "App/Modes/ModeDrain.d" "App/Modes/ModeFault.d" "App/Modes/ModeFill.d" "App/Modes/ModeFlush.d" "App/Modes/ModeInitPOST.d" "App/Modes/ModePostTreat.d" "App/Modes/ModeService.d" "App/Modes/ModeStandby.d" "App/Modes/OperationModes.d" "App/Services/AlarmMgmt.d" "App/Services/CommBuffers.d" "App/Services/FPGA.d" "App/Services/Interrupts.d" "App/Services/MsgQueues.d" "App/Services/PIControllers.d" "App/Services/SystemComm.d" "App/Services/SystemCommMessages.d" "App/Services/Timers.d" "App/Services/Utilities.d" "App/Services/WatchdogMgmt.d" "App/Tasks/TaskBG.d" "App/Tasks/TaskGeneral.d" "App/Tasks/TaskPriority.d" "App/Tasks/TaskTimer.d" "FWCommon/RTC.d" "source/adc.d" "source/can.d" "source/crc.d" "source/ecap.d" "source/emac.d" "source/eqep.d" "source/errata_SSWF021_45.d" "source/esm.d" "source/etpwm.d" "source/gio.d" "source/lin.d" "source/mdio.d" 
+	-$(RM) "source/mibspi.d" "source/notification.d" "source/phy_dp83640.d" "source/pinmux.d" "source/rti.d" "source/sci.d" "source/sys_dma.d" "source/sys_main.d" "source/sys_pcr.d" "source/sys_phantom.d" "source/sys_pmm.d" "source/sys_selftest.d" "source/sys_startup.d" "source/sys_vim.d" "source/system.d" 
 	-$(RM) "irqDispatch_a.d" "source/dabort.d" "source/sys_core.d" "source/sys_intvecs.d" "source/sys_mpu.d" "source/sys_pmu.d" 
 	-@echo 'Finished clean'
 	-@echo ' '