Index: firmware/Debug/source/subdir_rules.mk
===================================================================
diff -u -r2656aa6e11f4804dad57791321808fc0e925567e -r88b7f489c8da945997f1516600a30032393f5088
--- firmware/Debug/source/subdir_rules.mk	(.../subdir_rules.mk)	(revision 2656aa6e11f4804dad57791321808fc0e925567e)
+++ firmware/Debug/source/subdir_rules.mk	(.../subdir_rules.mk)	(revision 88b7f489c8da945997f1516600a30032393f5088)
@@ -6,14 +6,14 @@
 source/%.obj: ../source/%.c $(GEN_OPTS) | $(GEN_FILES)
 	@echo 'Building file: "$<"'
 	@echo 'Invoking: ARM Compiler'
-	"/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/bin/armcl" -mv7R4 --code_state=32 --float_support=VFPv3D16 -me --include_path="/home/fw/workspace/dgfirmware/firmware/App" --include_path="/home/fw/workspace/dgfirmware/firmware/App/Tasks" --include_path="/home/fw/workspace/dgfirmware/firmware/App/Modes" --include_path="/home/fw/workspace/dgfirmware/firmware/App/Drivers" --include_path="/home/fw/workspace/dgfirmware/firmware/App/Controllers" --include_path="/home/fw/workspace/dgfirmware/firmware/App/Services" --include_path="/home/fw/workspace/dgfirmware/firmware" --include_path="/home/fw/workspace/dgfirmware/firmware/include" --include_path="/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/include" --define=__TI_VIM_128CH__ -g --diag_warning=225 --diag_wrap=off --display_error_number --enum_type=packed --abi=eabi --preproc_with_compile --preproc_dependency="source/$(basename $(<F)).d_raw" --obj_directory="source" $(GEN_OPTS__FLAG) "$(shell echo $<)"
+	"/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/bin/armcl" -mv7R4 --code_state=32 --float_support=VFPv3D16 -me --include_path="/home/fw/workspace/dgfirmware2/firmware/App" --include_path="/home/fw/workspace/dgfirmware2/firmware/App/Tasks" --include_path="/home/fw/workspace/dgfirmware2/firmware/App/Modes" --include_path="/home/fw/workspace/dgfirmware2/firmware/App/Drivers" --include_path="/home/fw/workspace/dgfirmware2/firmware/App/Controllers" --include_path="/home/fw/workspace/dgfirmware2/firmware/App/Services" --include_path="/home/fw/workspace/dgfirmware2/firmware" --include_path="/home/fw/workspace/dgfirmware2/firmware/include" --include_path="/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/include" --define=__TI_VIM_128CH__ -g --diag_warning=225 --diag_wrap=off --display_error_number --enum_type=packed --abi=eabi --preproc_with_compile --preproc_dependency="source/$(basename $(<F)).d_raw" --obj_directory="source" $(GEN_OPTS__FLAG) "$(shell echo $<)"
 	@echo 'Finished building: "$<"'
 	@echo ' '
 
 source/%.obj: ../source/%.asm $(GEN_OPTS) | $(GEN_FILES)
 	@echo 'Building file: "$<"'
 	@echo 'Invoking: ARM Compiler'
-	"/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/bin/armcl" -mv7R4 --code_state=32 --float_support=VFPv3D16 -me --include_path="/home/fw/workspace/dgfirmware/firmware/App" --include_path="/home/fw/workspace/dgfirmware/firmware/App/Tasks" --include_path="/home/fw/workspace/dgfirmware/firmware/App/Modes" --include_path="/home/fw/workspace/dgfirmware/firmware/App/Drivers" --include_path="/home/fw/workspace/dgfirmware/firmware/App/Controllers" --include_path="/home/fw/workspace/dgfirmware/firmware/App/Services" --include_path="/home/fw/workspace/dgfirmware/firmware" --include_path="/home/fw/workspace/dgfirmware/firmware/include" --include_path="/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/include" --define=__TI_VIM_128CH__ -g --diag_warning=225 --diag_wrap=off --display_error_number --enum_type=packed --abi=eabi --preproc_with_compile --preproc_dependency="source/$(basename $(<F)).d_raw" --obj_directory="source" $(GEN_OPTS__FLAG) "$(shell echo $<)"
+	"/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/bin/armcl" -mv7R4 --code_state=32 --float_support=VFPv3D16 -me --include_path="/home/fw/workspace/dgfirmware2/firmware/App" --include_path="/home/fw/workspace/dgfirmware2/firmware/App/Tasks" --include_path="/home/fw/workspace/dgfirmware2/firmware/App/Modes" --include_path="/home/fw/workspace/dgfirmware2/firmware/App/Drivers" --include_path="/home/fw/workspace/dgfirmware2/firmware/App/Controllers" --include_path="/home/fw/workspace/dgfirmware2/firmware/App/Services" --include_path="/home/fw/workspace/dgfirmware2/firmware" --include_path="/home/fw/workspace/dgfirmware2/firmware/include" --include_path="/home/fw/ti/ccs910/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/include" --define=__TI_VIM_128CH__ -g --diag_warning=225 --diag_wrap=off --display_error_number --enum_type=packed --abi=eabi --preproc_with_compile --preproc_dependency="source/$(basename $(<F)).d_raw" --obj_directory="source" $(GEN_OPTS__FLAG) "$(shell echo $<)"
 	@echo 'Finished building: "$<"'
 	@echo ' '