Index: results/cppcheck.log
===================================================================
diff -u -r5854029e95eca38ed459ac74ac013b240f7fc5d1 -r615e4900fa0e284bd387312e597f839b6ee8584a
--- results/cppcheck.log	(.../cppcheck.log)	(revision 5854029e95eca38ed459ac74ac013b240f7fc5d1)
+++ results/cppcheck.log	(.../cppcheck.log)	(revision 615e4900fa0e284bd387312e597f839b6ee8584a)
@@ -60,12 +60,14 @@
 Checking hdfirmware/firmware/App/Modes/ModeFault.c ...
 Checking hdfirmware/firmware/App/Modes/ModeFault.c: EMC_TEST_BUILD...
 13/44 files checked 29% done
+
 >>>>>>> Stashed changes
 Checking hdfirmware/firmware/App/Modes/ModeInitPOST.c ...
 Checking hdfirmware/firmware/App/Modes/ModeInitPOST.c: DISABLE_ACCELS...
 Checking hdfirmware/firmware/App/Modes/ModeInitPOST.c: RM46_EVAL_BOARD_TARGET...
 Checking hdfirmware/firmware/App/Modes/ModeInitPOST.c: SKIP_POST...
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 15/44 files checked 33% done
 Checking hdfirmware/firmware/App/Modes/ModePostTreat.c ...
 Checking hdfirmware/firmware/App/Modes/ModePostTreat.c: RM46_EVAL_BOARD_TARGET...
@@ -90,11 +92,25 @@
 Checking hdfirmware/firmware/App/Modes/ModeService.c ...
 17/44 files checked 38% done
 >>>>>>> Stashed changes
+=======
+14/44 files checked 31% done
+Checking hdfirmware/firmware/App/Modes/ModePostTreat.c ...
+Checking hdfirmware/firmware/App/Modes/ModePostTreat.c: RM46_EVAL_BOARD_TARGET...
+Checking hdfirmware/firmware/App/Modes/ModePostTreat.c: UF_TEST_ENABLED...
+15/44 files checked 33% done
+Checking hdfirmware/firmware/App/Modes/ModePreTreat.c ...
+Checking hdfirmware/firmware/App/Modes/ModePreTreat.c: RM46_EVAL_BOARD_TARGET...
+Checking hdfirmware/firmware/App/Modes/ModePreTreat.c: UF_TEST_ENABLED...
+16/44 files checked 35% done
+Checking hdfirmware/firmware/App/Modes/ModeService.c ...
+17/44 files checked 38% done
+>>>>>>> Stashed changes
 Checking hdfirmware/firmware/App/Modes/ModeStandby.c ...
 Checking hdfirmware/firmware/App/Modes/ModeStandby.c: EMC_TEST_BUILD...
 Checking hdfirmware/firmware/App/Modes/ModeStandby.c: RM46_EVAL_BOARD_TARGET...
 Checking hdfirmware/firmware/App/Modes/ModeStandby.c: UF_TEST_WITH_DG...
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 19/44 files checked 42% done
 Checking hdfirmware/firmware/App/Modes/ModeTreatment.c ...
 Checking hdfirmware/firmware/App/Modes/ModeTreatment.c: RM46_EVAL_BOARD_TARGET...
@@ -109,6 +125,8 @@
 Checking hdfirmware/firmware/App/Modes/TreatmentStop.c ...
 23/44 files checked 51% done
 =======
+=======
+>>>>>>> Stashed changes
 18/44 files checked 40% done
 Checking hdfirmware/firmware/App/Modes/ModeTreatment.c ...
 Checking hdfirmware/firmware/App/Modes/ModeTreatment.c: RM46_EVAL_BOARD_TARGET...
@@ -122,12 +140,16 @@
 21/44 files checked 47% done
 Checking hdfirmware/firmware/App/Modes/TreatmentStop.c ...
 22/44 files checked 49% done
+<<<<<<< Updated upstream
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 Checking hdfirmware/firmware/App/Services/AlarmMgmt.c ...
 Checking hdfirmware/firmware/App/Services/AlarmMgmt.c: ALARMS_DEBUG;DEBUG_ENABLED...
 Checking hdfirmware/firmware/App/Services/AlarmMgmt.c: DEBUG_ENABLED...
 Checking hdfirmware/firmware/App/Services/AlarmMgmt.c: EMC_TEST_BUILD...
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 24/44 files checked 53% done
 Checking hdfirmware/firmware/App/Services/CommBuffers.c ...
 Checking hdfirmware/firmware/App/Services/CommBuffers.c: DEBUG_ENABLED...
@@ -140,12 +162,20 @@
 Checking hdfirmware/firmware/App/Services/CommBuffers.c: EMC_TEST_BUILD...
 24/44 files checked 53% done
 >>>>>>> Stashed changes
+=======
+23/44 files checked 51% done
+Checking hdfirmware/firmware/App/Services/CommBuffers.c ...
+Checking hdfirmware/firmware/App/Services/CommBuffers.c: DEBUG_ENABLED...
+Checking hdfirmware/firmware/App/Services/CommBuffers.c: EMC_TEST_BUILD...
+24/44 files checked 53% done
+>>>>>>> Stashed changes
 Checking hdfirmware/firmware/App/Services/FPGA.c ...
 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...
 Checking hdfirmware/firmware/App/Services/FPGA.c: RM46_EVAL_BOARD_TARGET...
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 26/44 files checked 58% done
 Checking hdfirmware/firmware/App/Services/Interrupts.c ...
 Checking hdfirmware/firmware/App/Services/Interrupts.c: DEBUG_ENABLED...
@@ -158,6 +188,8 @@
 Checking hdfirmware/firmware/App/Services/PIControllers.c: EMC_TEST_BUILD...
 29/44 files checked 64% done
 =======
+=======
+>>>>>>> Stashed changes
 25/44 files checked 55% done
 Checking hdfirmware/firmware/App/Services/Interrupts.c ...
 Checking hdfirmware/firmware/App/Services/Interrupts.c: DEBUG_ENABLED...
@@ -169,29 +201,39 @@
 Checking hdfirmware/firmware/App/Services/PIControllers.c: DEBUG_ENABLED...
 Checking hdfirmware/firmware/App/Services/PIControllers.c: EMC_TEST_BUILD...
 28/44 files checked 62% done
+<<<<<<< Updated upstream
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 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...
 Checking hdfirmware/firmware/App/Services/SystemComm.c: RM46_EVAL_BOARD_TARGET...
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 30/44 files checked 67% done
 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...
 31/44 files checked 69% done
 =======
+=======
+>>>>>>> Stashed changes
 29/44 files checked 64% done
 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...
 30/44 files checked 67% done
+<<<<<<< Updated upstream
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 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...
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 32/44 files checked 71% done
 Checking hdfirmware/firmware/App/Tasks/TaskBG.c ...
 33/44 files checked 73% done
@@ -206,6 +248,8 @@
 Checking hdfirmware/firmware/App/Tasks/TaskTimer.c: TASK_TIMING_OUTPUT_ENABLED...
 36/44 files checked 80% done
 =======
+=======
+>>>>>>> Stashed changes
 31/44 files checked 69% done
 Checking hdfirmware/firmware/App/Tasks/TaskBG.c ...
 32/44 files checked 71% done
@@ -216,16 +260,23 @@
 34/44 files checked 76% done
 Checking hdfirmware/firmware/App/Tasks/TaskTimer.c ...
 35/44 files checked 78% done
+<<<<<<< Updated upstream
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 Checking hdfirmware/firmware/FWCommon/Accel.c ...
 Checking hdfirmware/firmware/FWCommon/Accel.c: _DG_...
 Checking hdfirmware/firmware/FWCommon/Accel.c: _HD_...
 Checking hdfirmware/firmware/FWCommon/Accel.c: _VECTORCAST_...
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 37/44 files checked 82% done
 =======
 36/44 files checked 80% done
 >>>>>>> Stashed changes
+=======
+36/44 files checked 80% done
+>>>>>>> Stashed changes
 Checking hdfirmware/firmware/FWCommon/FlashDrvr/Fapi_UserDefinedFunctions.c ...
 Checking hdfirmware/firmware/FWCommon/FlashDrvr/Fapi_UserDefinedFunctions.c: CPU_BYTE_ORDER...
 Checking hdfirmware/firmware/FWCommon/FlashDrvr/Fapi_UserDefinedFunctions.c: F021...
@@ -239,22 +290,32 @@
 Checking hdfirmware/firmware/FWCommon/FlashDrvr/Fapi_UserDefinedFunctions.c: __ARMCC_VERSION...
 Checking hdfirmware/firmware/FWCommon/FlashDrvr/Fapi_UserDefinedFunctions.c: __GNUC__...
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 38/44 files checked 85% done
 =======
 37/44 files checked 82% done
 >>>>>>> Stashed changes
+=======
+37/44 files checked 82% done
+>>>>>>> Stashed changes
 Checking hdfirmware/firmware/FWCommon/NVDataMgmt.c ...
 Checking hdfirmware/firmware/FWCommon/NVDataMgmt.c: _DG_...
 Checking hdfirmware/firmware/FWCommon/NVDataMgmt.c: _HD_...
 Checking hdfirmware/firmware/FWCommon/NVDataMgmt.c: _VECTORCAST_...
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 =======
+=======
+>>>>>>> Stashed changes
 38/44 files checked 85% done
 Checking hdfirmware/firmware/FWCommon/PersistentAlarm.c ...
 Checking hdfirmware/firmware/FWCommon/PersistentAlarm.c: _DG_...
 Checking hdfirmware/firmware/FWCommon/PersistentAlarm.c: _HD_...
 Checking hdfirmware/firmware/FWCommon/PersistentAlarm.c: _VECTORCAST_...
+<<<<<<< Updated upstream
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes
 39/44 files checked 87% done
 Checking hdfirmware/firmware/FWCommon/RTC.c ...
 Checking hdfirmware/firmware/FWCommon/RTC.c: _DG_...
@@ -269,10 +330,14 @@
 Checking hdfirmware/firmware/FWCommon/Utilities.c: _HD_...
 Checking hdfirmware/firmware/FWCommon/Utilities.c: _VECTORCAST_...
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 42/44 files checked 93% done
 =======
 42/44 files checked 94% done
 >>>>>>> Stashed changes
+=======
+42/44 files checked 94% done
+>>>>>>> Stashed changes
 Checking hdfirmware/firmware/FWCommon/irqDispatch_c.c ...
 Checking hdfirmware/firmware/FWCommon/irqDispatch_c.c: __TI_VIM_128CH__...
 Checking hdfirmware/firmware/FWCommon/irqDispatch_c.c: __TI_VIM_96CH__...