Index: Debug/makefile
===================================================================
diff -u -r765d2c35118e202444e737c66c77faf9678cc87e -r40a959e1341c8964f872df462ac3a2d874e3b0b3
--- Debug/makefile	(.../makefile)	(revision 765d2c35118e202444e737c66c77faf9678cc87e)
+++ Debug/makefile	(.../makefile)	(revision 40a959e1341c8964f872df462ac3a2d874e3b0b3)
@@ -8,11 +8,12 @@
 GEN_CMDS__FLAG := 
 
 ORDERED_OBJS += \
-"./App/Contollers/AlarmLamp.obj" \
-"./App/Contollers/Buttons.obj" \
-"./App/Contollers/SafetyShutdown.obj" \
-"./App/Contollers/WatchdogMgmt.obj" \
+"./irqDispatch_a.obj" \
+"./irqDispatch_c.obj" \
+"./App/Controllers/AlarmLamp.obj" \
+"./App/Controllers/Buttons.obj" \
 "./App/Drivers/CPLD.obj" \
+"./App/Drivers/SafetyShutdown.obj" \
 "./App/Modes/ModeFault.obj" \
 "./App/Modes/ModeInitPOST.obj" \
 "./App/Modes/ModeOpParams.obj" \
@@ -23,18 +24,30 @@
 "./App/Modes/ModeStandby.obj" \
 "./App/Modes/ModeTreatment.obj" \
 "./App/Modes/OperationModes.obj" \
+"./App/Services/CommBuffers.obj" \
+"./App/Services/CommInterrupts.obj" \
+"./App/Services/FPGA.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/dabort.obj" \
 "./source/errata_SSWF021_45.obj" \
 "./source/esm.obj" \
 "./source/gio.obj" \
 "./source/lin.obj" \
+"./source/mibspi.obj" \
 "./source/notification.obj" \
 "./source/pinmux.obj" \
 "./source/rti.obj" \
+"./source/sci.obj" \
 "./source/sys_core.obj" \
 "./source/sys_dma.obj" \
 "./source/sys_intvecs.obj" \
@@ -59,14 +72,18 @@
 
 # All of the sources participating in the build are defined here
 -include sources.mk
--include App/Contollers/subdir_vars.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 source/subdir_vars.mk
--include App/Contollers/subdir_rules.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 source/subdir_rules.mk
 -include objects.mk
@@ -185,7 +202,7 @@
 HD.out: $(OBJS) $(CMD_SRCS) $(GEN_CMDS)
 	@echo 'Building target: "$@"'
 	@echo 'Invoking: ARM Linker'
-	"/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/bin/armcl" -mv7R4 --code_state=32 --float_support=VFPv3D16 -me -g --diag_warning=225 --diag_wrap=off --display_error_number --enum_type=packed --abi=eabi -z -m"HD.map" --heap_size=0x800 --stack_size=0x800 -i"/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/lib" -i"/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/include" --reread_libs --diag_wrap=off --display_error_number --warn_sections --xml_link_info="HD_linkInfo.xml" --rom_model -o "HD.out" $(ORDERED_OBJS)
+	"/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/bin/armcl" -mv7R4 --code_state=32 --float_support=VFPv3D16 -me --define=__TI_VIM_128CH__ -g --diag_warning=225 --diag_wrap=off --display_error_number --enum_type=packed --abi=eabi -z -m"HD.map" --heap_size=0x800 --stack_size=0x800 -i"/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/lib" -i"/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/include" --reread_libs --diag_wrap=off --display_error_number --warn_sections --xml_link_info="HD_linkInfo.xml" --rom_model -o "HD.out" $(ORDERED_OBJS)
 	@echo 'Finished building target: "$@"'
 	@echo ' '
 
@@ -199,9 +216,11 @@
 # Other Targets
 clean:
 	-$(RM) $(BIN_OUTPUTS__QUOTED)$(EXE_OUTPUTS__QUOTED)
-	-$(RM) "App/Contollers/AlarmLamp.obj" "App/Contollers/Buttons.obj" "App/Contollers/SafetyShutdown.obj" "App/Contollers/WatchdogMgmt.obj" "App/Drivers/CPLD.obj" "App/Modes/ModeFault.obj" "App/Modes/ModeInitPOST.obj" "App/Modes/ModeOpParams.obj" "App/Modes/ModePostTreat.obj" "App/Modes/ModePreTreat.obj" "App/Modes/ModePrescription.obj" "App/Modes/ModeService.obj" "App/Modes/ModeStandby.obj" "App/Modes/ModeTreatment.obj" "App/Modes/OperationModes.obj" "App/Tasks/TaskBG.obj" "App/Tasks/TaskGeneral.obj" "App/Tasks/TaskPriority.obj" "App/Tasks/TaskTimer.obj" "source/dabort.obj" "source/errata_SSWF021_45.obj" "source/esm.obj" "source/gio.obj" "source/lin.obj" "source/notification.obj" "source/pinmux.obj" "source/rti.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) "App/Contollers/AlarmLamp.d" "App/Contollers/Buttons.d" "App/Contollers/SafetyShutdown.d" "App/Contollers/WatchdogMgmt.d" "App/Drivers/CPLD.d" "App/Modes/ModeFault.d" "App/Modes/ModeInitPOST.d" "App/Modes/ModeOpParams.d" "App/Modes/ModePostTreat.d" "App/Modes/ModePreTreat.d" "App/Modes/ModePrescription.d" "App/Modes/ModeService.d" "App/Modes/ModeStandby.d" "App/Modes/ModeTreatment.d" "App/Modes/OperationModes.d" "App/Tasks/TaskBG.d" "App/Tasks/TaskGeneral.d" "App/Tasks/TaskPriority.d" "App/Tasks/TaskTimer.d" "source/errata_SSWF021_45.d" "source/esm.d" "source/gio.d" "source/lin.d" "source/notification.d" "source/pinmux.d" "source/rti.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) "source/dabort.d" "source/sys_core.d" "source/sys_intvecs.d" "source/sys_mpu.d" "source/sys_pmu.d" 
+	-$(RM) "irqDispatch_a.obj" "irqDispatch_c.obj" "App/Controllers/AlarmLamp.obj" "App/Controllers/Buttons.obj" "App/Drivers/CPLD.obj" "App/Drivers/SafetyShutdown.obj" "App/Modes/ModeFault.obj" "App/Modes/ModeInitPOST.obj" "App/Modes/ModeOpParams.obj" "App/Modes/ModePostTreat.obj" "App/Modes/ModePreTreat.obj" "App/Modes/ModePrescription.obj" "App/Modes/ModeService.obj" "App/Modes/ModeStandby.obj" "App/Modes/ModeTreatment.obj" "App/Modes/OperationModes.obj" "App/Services/CommBuffers.obj" "App/Services/CommInterrupts.obj" "App/Services/FPGA.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/dabort.obj" "source/errata_SSWF021_45.obj" "source/esm.obj" "source/gio.obj" "source/lin.obj" "source/mibspi.obj" "source/notification.obj" "source/pinmux.obj" 
+	-$(RM) "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/Controllers/Buttons.d" "App/Drivers/CPLD.d" "App/Drivers/SafetyShutdown.d" "App/Modes/ModeFault.d" "App/Modes/ModeInitPOST.d" "App/Modes/ModeOpParams.d" "App/Modes/ModePostTreat.d" "App/Modes/ModePreTreat.d" "App/Modes/ModePrescription.d" "App/Modes/ModeService.d" "App/Modes/ModeStandby.d" "App/Modes/ModeTreatment.d" "App/Modes/OperationModes.d" "App/Services/CommBuffers.d" "App/Services/CommInterrupts.d" "App/Services/FPGA.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/errata_SSWF021_45.d" "source/esm.d" "source/gio.d" "source/lin.d" "source/mibspi.d" "source/notification.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" 
+	-$(RM) "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 ' '