Index: results/cppcheck.log
===================================================================
diff -u -r631ae13923351cdb64281c9cd3819593fbbbc21d -rc282822f36836a8127f447c8ac5b8a50e851be63
--- results/cppcheck.log	(.../cppcheck.log)	(revision 631ae13923351cdb64281c9cd3819593fbbbc21d)
+++ results/cppcheck.log	(.../cppcheck.log)	(revision c282822f36836a8127f447c8ac5b8a50e851be63)
@@ -3,7 +3,6 @@
 Checking hdfirmware/firmware/App/Controllers/AlarmLamp.c ...
 2/47 files checked 4% done
 Checking hdfirmware/firmware/App/Controllers/BloodFlow.c ...
-Checking hdfirmware/firmware/App/Controllers/BloodFlow.c: BREADBOARD_TARGET...
 Checking hdfirmware/firmware/App/Controllers/BloodFlow.c: RAW_FLOW_SENSOR_DATA...
 3/47 files checked 6% done
 Checking hdfirmware/firmware/App/Controllers/Buttons.c ...
@@ -13,27 +12,38 @@
 Checking hdfirmware/firmware/App/Controllers/DGInterface.c: V1_5_SYSTEM...
 5/47 files checked 10% done
 Checking hdfirmware/firmware/App/Controllers/DialInFlow.c ...
-Checking hdfirmware/firmware/App/Controllers/DialInFlow.c: BREADBOARD_TARGET...
 Checking hdfirmware/firmware/App/Controllers/DialInFlow.c: RAW_FLOW_SENSOR_DATA...
 6/47 files checked 12% done
 Checking hdfirmware/firmware/App/Controllers/DialOutFlow.c ...
+<<<<<<< HEAD
 Checking hdfirmware/firmware/App/Controllers/DialOutFlow.c: BREADBOARD_TARGET...
 7/47 files checked 14% done
+=======
+7/46 files checked 14% done
+>>>>>>> staging
 Checking hdfirmware/firmware/App/Controllers/PresOccl.c ...
 8/47 files checked 16% done
 Checking hdfirmware/firmware/App/Controllers/Valves.c ...
 Checking hdfirmware/firmware/App/Controllers/Valves.c: DEBUG_ENABLED...
 Checking hdfirmware/firmware/App/Controllers/Valves.c: TST_3WAY_VALVES_ALWAYS_OPEN...
 9/47 files checked 18% done
 Checking hdfirmware/firmware/App/Drivers/CPLD.c ...
+<<<<<<< HEAD
 Checking hdfirmware/firmware/App/Drivers/CPLD.c: RM46_EVAL_BOARD_TARGET...
 10/47 files checked 20% done
+=======
+10/46 files checked 21% done
+>>>>>>> staging
 Checking hdfirmware/firmware/App/Drivers/Comm.c ...
 Checking hdfirmware/firmware/App/Drivers/Comm.c: DEBUG_ENABLED...
 11/47 files checked 23% done
 Checking hdfirmware/firmware/App/Drivers/InternalADC.c ...
+<<<<<<< HEAD
 Checking hdfirmware/firmware/App/Drivers/InternalADC.c: RM46_EVAL_BOARD_TARGET...
 12/47 files checked 25% done
+=======
+12/46 files checked 25% done
+>>>>>>> staging
 Checking hdfirmware/firmware/App/Drivers/SafetyShutdown.c ...
 13/47 files checked 27% done
 Checking hdfirmware/firmware/App/Modes/Dialysis.c ...
@@ -44,32 +54,41 @@
 15/47 files checked 31% done
 Checking hdfirmware/firmware/App/Modes/ModeInitPOST.c ...
 Checking hdfirmware/firmware/App/Modes/ModeInitPOST.c: DISABLE_ACCELS...
-Checking hdfirmware/firmware/App/Modes/ModeInitPOST.c: DISABLE_UI_TREATMENT_WORKFLOW;SKIP_POST...
-Checking hdfirmware/firmware/App/Modes/ModeInitPOST.c: RM46_EVAL_BOARD_TARGET...
 Checking hdfirmware/firmware/App/Modes/ModeInitPOST.c: SKIP_POST...
 16/47 files checked 33% done
 Checking hdfirmware/firmware/App/Modes/ModePostTreat.c ...
+<<<<<<< HEAD
 Checking hdfirmware/firmware/App/Modes/ModePostTreat.c: DISABLE_UI_TREATMENT_WORKFLOW...
 Checking hdfirmware/firmware/App/Modes/ModePostTreat.c: RM46_EVAL_BOARD_TARGET...
 17/47 files checked 35% done
 Checking hdfirmware/firmware/App/Modes/ModePreTreat.c ...
 18/47 files checked 37% done
+=======
+17/46 files checked 36% done
+Checking hdfirmware/firmware/App/Modes/ModePreTreat.c ...
+18/46 files checked 38% done
+>>>>>>> staging
 Checking hdfirmware/firmware/App/Modes/ModeService.c ...
 19/47 files checked 39% done
 Checking hdfirmware/firmware/App/Modes/ModeStandby.c ...
 Checking hdfirmware/firmware/App/Modes/ModeStandby.c: EMC_TEST_BUILD...
 Checking hdfirmware/firmware/App/Modes/ModeStandby.c: EMC_TEST_BUILD;RUN_WITHOUT_DG...
-Checking hdfirmware/firmware/App/Modes/ModeStandby.c: RM46_EVAL_BOARD_TARGET...
 Checking hdfirmware/firmware/App/Modes/ModeStandby.c: RUN_WITHOUT_DG...
 20/47 files checked 41% done
 Checking hdfirmware/firmware/App/Modes/ModeTreatment.c ...
+<<<<<<< HEAD
 Checking hdfirmware/firmware/App/Modes/ModeTreatment.c: DISABLE_UI_TREATMENT_WORKFLOW...
 Checking hdfirmware/firmware/App/Modes/ModeTreatment.c: RM46_EVAL_BOARD_TARGET...
 21/47 files checked 43% done
 Checking hdfirmware/firmware/App/Modes/ModeTreatmentParams.c ...
 Checking hdfirmware/firmware/App/Modes/ModeTreatmentParams.c: DISABLE_UI_TREATMENT_WORKFLOW...
 Checking hdfirmware/firmware/App/Modes/ModeTreatmentParams.c: RM46_EVAL_BOARD_TARGET...
 22/47 files checked 46% done
+=======
+21/46 files checked 44% done
+Checking hdfirmware/firmware/App/Modes/ModeTreatmentParams.c ...
+22/46 files checked 47% done
+>>>>>>> staging
 Checking hdfirmware/firmware/App/Modes/OperationModes.c ...
 23/47 files checked 48% done
 Checking hdfirmware/firmware/App/Modes/Prime.c ...
@@ -89,8 +108,12 @@
 Checking hdfirmware/firmware/App/Services/FPGA.c: DEBUG_ENABLED...
 Checking hdfirmware/firmware/App/Services/FPGA.c: EMC_TEST_BUILD...
 Checking hdfirmware/firmware/App/Services/FPGA.c: READ_FPGA_ASYNC_DATA...
+<<<<<<< HEAD
 Checking hdfirmware/firmware/App/Services/FPGA.c: RM46_EVAL_BOARD_TARGET...
 28/47 files checked 58% done
+=======
+27/46 files checked 57% done
+>>>>>>> staging
 Checking hdfirmware/firmware/App/Services/Interrupts.c ...
 Checking hdfirmware/firmware/App/Services/Interrupts.c: DEBUG_ENABLED...
 Checking hdfirmware/firmware/App/Services/Interrupts.c: EMC_TEST_BUILD...
@@ -104,21 +127,23 @@
 Checking hdfirmware/firmware/App/Services/SystemComm.c ...
 Checking hdfirmware/firmware/App/Services/SystemComm.c: DEBUG_ENABLED...
 Checking hdfirmware/firmware/App/Services/SystemComm.c: EMC_TEST_BUILD...
+<<<<<<< HEAD
 Checking hdfirmware/firmware/App/Services/SystemComm.c: RM46_EVAL_BOARD_TARGET...
 32/47 files checked 66% done
+=======
+31/46 files checked 66% done
+>>>>>>> staging
 Checking hdfirmware/firmware/App/Services/SystemCommMessages.c ...
 Checking hdfirmware/firmware/App/Services/SystemCommMessages.c: DEBUG_ENABLED...
 Checking hdfirmware/firmware/App/Services/SystemCommMessages.c: EMC_TEST_BUILD...
 33/47 files checked 69% done
 Checking hdfirmware/firmware/App/Services/WatchdogMgmt.c ...
-Checking hdfirmware/firmware/App/Services/WatchdogMgmt.c: BREADBOARD_TARGET...
 Checking hdfirmware/firmware/App/Services/WatchdogMgmt.c: DEBUG_ENABLED...
 Checking hdfirmware/firmware/App/Services/WatchdogMgmt.c: EMC_TEST_BUILD...
 34/47 files checked 71% done
 Checking hdfirmware/firmware/App/Tasks/TaskBG.c ...
 35/47 files checked 73% done
 Checking hdfirmware/firmware/App/Tasks/TaskGeneral.c ...
-Checking hdfirmware/firmware/App/Tasks/TaskGeneral.c: RM46_EVAL_BOARD_TARGET...
 Checking hdfirmware/firmware/App/Tasks/TaskGeneral.c: TASK_TIMING_OUTPUT_ENABLED...
 36/47 files checked 75% done
 Checking hdfirmware/firmware/App/Tasks/TaskPriority.c ...
@@ -160,7 +185,6 @@
 Checking hdfirmware/firmware/FWCommon/RTC.c: _VECTORCAST_...
 43/47 files checked 90% done
 Checking hdfirmware/firmware/FWCommon/Timers.c ...
-Checking hdfirmware/firmware/FWCommon/Timers.c: _DG_...
 Checking hdfirmware/firmware/FWCommon/Timers.c: _VECTORCAST_...
 44/47 files checked 92% done
 Checking hdfirmware/firmware/FWCommon/Utilities.c ...