Index: results/cppcheckError.csv
===================================================================
diff -u -rf9890311898663a704692870ffb53d43cea0d20b -rc282822f36836a8127f447c8ac5b8a50e851be63
--- results/cppcheckError.csv	(.../cppcheckError.csv)	(revision f9890311898663a704692870ffb53d43cea0d20b)
+++ results/cppcheckError.csv	(.../cppcheckError.csv)	(revision c282822f36836a8127f447c8ac5b8a50e851be63)
@@ -1,47 +1,114 @@
 File, Line No., Severity, Issue, Description
-hdfirmware/firmware/App/Services/Interrupts.c,100,style,variableScope,The scope of the variable 'debugStr' can be reduced.
-hdfirmware/firmware/App/Services/PIControllers.c,77,style,variableScope,The scope of the variable 'controller' can be reduced.
-hdfirmware/firmware/FWCommon/RTC.c,1197,style,redundantAssignment,Variable 'result' is reassigned a value before the old one has been used.
-hdfirmware/firmware/FWCommon/RTC.c,695,style,unreadVariable,Variable 'controlReg2' is assigned a value that is never used.
-hdfirmware/firmware/irqDispatch_c.c,75,style,unusedFunction,The function 'C_irqDispatch' is never used.
-hdfirmware/firmware/App/Services/AlarmMgmt.c,278,style,unusedFunction,The function 'activateAlarm1Data' is never used.
-hdfirmware/firmware/App/Services/AlarmMgmt.c,301,style,unusedFunction,The function 'activateAlarm2Data' is never used.
-hdfirmware/firmware/App/Drivers/InternalADC.c,112,style,unusedFunction,The function 'adcNotification' is never used.
-hdfirmware/firmware/App/Services/Interrupts.c,96,style,unusedFunction,The function 'canErrorNotification' is never used.
-hdfirmware/firmware/App/Services/Interrupts.c,75,style,unusedFunction,The function 'canMessageNotification' is never used.
-hdfirmware/firmware/App/Services/Interrupts.c,230,style,unusedFunction,The function 'dmaGroupANotification' is never used.
-hdfirmware/firmware/App/Controllers/BloodFlow.c,847,style,unusedFunction,The function 'execBloodFlowTest' is never used.
-hdfirmware/firmware/App/Controllers/DialInFlow.c,831,style,unusedFunction,The function 'execDialInFlowTest' is never used.
-hdfirmware/firmware/App/Modes/Dialysis.c,60,style,unusedFunction,The function 'execDialysis' is never used.
-hdfirmware/firmware/App/Controllers/PresOccl.c,389,style,unusedFunction,The function 'execPresOcclTest' is never used.
-hdfirmware/firmware/App/Modes/TreatmentStop.c,62,style,unusedFunction,The function 'execTreatmentStop' is never used.
-hdfirmware/firmware/FWCommon/RTC.c,558,style,unusedFunction,The function 'getDataFromRAM' is never used.
-hdfirmware/firmware/App/Services/FPGA.c,839,style,unusedFunction,The function 'getFPGAId' is never used.
-hdfirmware/firmware/App/Services/FPGA.c,854,style,unusedFunction,The function 'getFPGARev' is never used.
-hdfirmware/firmware/App/Services/FPGA.c,869,style,unusedFunction,The function 'getFPGAStatus' is never used.
-hdfirmware/firmware/App/Services/PIControllers.c,206,style,unusedFunction,The function 'getPIControllerSignals' is never used.
-hdfirmware/firmware/FWCommon/RTC.c,522,style,unusedFunction,The function 'getRTCRAMState' is never used.
-hdfirmware/firmware/FWCommon/RTC.c,537,style,unusedFunction,The function 'getRTCRAMStatus' is never used.
-hdfirmware/firmware/FWCommon/RTC.c,411,style,unusedFunction,The function 'getRTCTimestamp' is never used.
-hdfirmware/firmware/App/Services/AlarmMgmt.c,359,style,unusedFunction,The function 'isAlarmActive' is never used.
-hdfirmware/firmware/App/Services/SystemComm.c,212,style,unusedFunction,The function 'isDGCommunicating' is never used.
-hdfirmware/firmware/App/Modes/ModeInitPOST.c,170,style,unusedFunction,The function 'isPOSTCompleted' is never used.
-hdfirmware/firmware/App/Modes/ModeInitPOST.c,185,style,unusedFunction,The function 'isPOSTPassed' is never used.
-hdfirmware/firmware/App/Drivers/Comm.c,273,style,unusedFunction,The function 'isSCI2DMATransmitInProgress' is never used.
-hdfirmware/firmware/App/Services/SystemComm.c,231,style,unusedFunction,The function 'isUICommunicating' is never used.
-hdfirmware/firmware/App/Services/Interrupts.c,60,style,unusedFunction,The function 'phantomInterrupt' is never used.
-hdfirmware/firmware/FWCommon/RTC.c,476,style,unusedFunction,The function 'readFromRAM' is never used.
-hdfirmware/firmware/App/Services/Interrupts.c,158,style,unusedFunction,The function 'sciNotification' is never used.
-hdfirmware/firmware/App/Controllers/DialInFlow.c,184,style,unusedFunction,The function 'setDialInPumpTargetFlowRate' is never used.
-hdfirmware/firmware/App/Services/FPGA.c,883,style,unusedFunction,The function 'setFPGAControl' is never used.
-hdfirmware/firmware/App/Controllers/PresOccl.c,143,style,unusedFunction,The function 'setOcclusionThreshold' is never used.
-hdfirmware/firmware/App/Controllers/PresOccl.c,112,style,unusedFunction,The function 'setPressureLimits' is never used.
-hdfirmware/firmware/App/Controllers/BloodFlow.c,247,style,unusedFunction,The function 'signalBloodPumpHardStop' is never used.
-hdfirmware/firmware/App/Controllers/DialInFlow.c,248,style,unusedFunction,The function 'signalDialInPumpHardStop' is never used.
-hdfirmware/firmware/App/Tasks/TaskGeneral.c,49,style,unusedFunction,The function 'taskGeneral' is never used.
-hdfirmware/firmware/App/Tasks/TaskPriority.c,36,style,unusedFunction,The function 'taskPriority' is never used.
-hdfirmware/firmware/App/Tasks/TaskTimer.c,32,style,unusedFunction,The function 'taskTimer' is never used.
-hdfirmware/firmware/App/Modes/Dialysis.c,47,style,unusedFunction,The function 'transitionToDialysis' is never used.
-hdfirmware/firmware/App/Modes/TreatmentStop.c,48,style,unusedFunction,The function 'transitionToTreatmentStop' is never used.
-hdfirmware/firmware/FWCommon/RTC.c,428,style,unusedFunction,The function 'writeToRAM' is never used.
+<<<<<<< HEAD
+hdfirmware/firmware/App/Controllers/DGInterface.c,658,style,unreadVariable,Variable 'activeRes' is assigned a value that is never used.
+hdfirmware/firmware/App/Controllers/DGInterface.c,659,style,unreadVariable,Variable 'inTreatment' is assigned a value that is never used.
+hdfirmware/firmware/App/Modes/ModePostTreat.c,74,style,unreadVariable,Variable 'stop' is assigned a value that is never used.
+hdfirmware/firmware/App/Modes/ModeTreatment.c,784,style,unreadVariable,Variable 'dialysisState' is assigned a value that is never used.
+hdfirmware/firmware/App/Services/Interrupts.c,175,style,variableScope,The scope of the variable 'debugStr' can be reduced.
+hdfirmware/firmware/App/Services/SystemCommMessages.c,3825,style,redundantAssignment,Variable 'result' is reassigned a value before the old one has been used.
+=======
+hdfirmware/firmware/App/Modes/ModeFault.c,72,style,unreadVariable,Variable 'stop' is assigned a value that is never used.
+hdfirmware/firmware/App/Modes/ModePostTreat.c,71,style,unreadVariable,Variable 'stop' is assigned a value that is never used.
+hdfirmware/firmware/App/Modes/ModePreTreat.c,78,style,unreadVariable,Variable 'stop' is assigned a value that is never used.
+hdfirmware/firmware/App/Modes/ModeTreatment.c,882,style,unreadVariable,Variable 'dialysisState' is assigned a value that is never used.
+hdfirmware/firmware/App/Modes/ModeTreatmentParams.c,384,style,redundantAssignment,Variable 'accepted' is reassigned a value before the old one has been used.
+hdfirmware/firmware/App/Services/Interrupts.c,175,style,variableScope,The scope of the variable 'debugStr' can be reduced.
+hdfirmware/firmware/App/Services/SystemCommMessages.c,4000,style,redundantAssignment,Variable 'result' is reassigned a value before the old one has been used.
+hdfirmware/firmware/App/Services/SystemCommMessages.c,1412,style,unreadVariable,Variable 'result' is assigned a value that is never used.
+>>>>>>> staging
+hdfirmware/firmware/FWCommon/FlashDrvr/Fapi_UserDefinedFunctions.c,0,information,toomanyconfigs,Too many #ifdef configurations - cppcheck only checks 12 of 21 configurations. Use --force to check all configurations.
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,1566,style,variableScope,The scope of the variable 'quotient' can be reduced.
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,1567,style,variableScope,The scope of the variable 'modulus' can be reduced.
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,1570,style,variableScope,The scope of the variable 'i' can be reduced.
+hdfirmware/firmware/FWCommon/RTC.c,1195,style,redundantAssignment,Variable 'result' is reassigned a value before the old one has been used.
+hdfirmware/firmware/FWCommon/RTC.c,782,style,variableScope,The scope of the variable 'decimalHigh' can be reduced.
+hdfirmware/firmware/FWCommon/RTC.c,783,style,variableScope,The scope of the variable 'decimalLow' can be reduced.
+hdfirmware/firmware/FWCommon/RTC.c,706,style,unreadVariable,Variable 'controlReg2' is assigned a value that is never used.
+hdfirmware/firmware/FWCommon/Utilities.c,246,style,variableScope,The scope of the variable 'timeInMS' can be reduced.
+hdfirmware/firmware/FWCommon/irqDispatch_c.c,76,style,unusedFunction,The function 'C_irqDispatch' is never used.
+hdfirmware/firmware/FWCommon/FlashDrvr/Fapi_UserDefinedFunctions.c,68,style,unusedFunction,The function 'Fapi_serviceWatchdogTimer' is never used.
+hdfirmware/firmware/App/Drivers/InternalADC.c,115,style,unusedFunction,The function 'adcNotification' is never used.
+hdfirmware/firmware/App/Services/Interrupts.c,172,style,unusedFunction,The function 'canErrorNotification' is never used.
+hdfirmware/firmware/App/Services/Interrupts.c,152,style,unusedFunction,The function 'canMessageNotification' is never used.
+<<<<<<< HEAD
+hdfirmware/firmware/App/Services/AlarmMgmt.c,301,style,unusedFunction,The function 'clearAlarmCondition' is never used.
+hdfirmware/firmware/App/Controllers/DGInterface.c,818,style,unusedFunction,The function 'cmdDGSampleWater' is never used.
+hdfirmware/firmware/App/Controllers/DGInterface.c,722,style,unusedFunction,The function 'cmdStopDG' is never used.
+=======
+hdfirmware/firmware/App/Controllers/DGInterface.c,668,style,unusedFunction,The function 'cmdDGSampleWater' is never used.
+hdfirmware/firmware/App/Controllers/DGInterface.c,572,style,unusedFunction,The function 'cmdStopDG' is never used.
+>>>>>>> staging
+hdfirmware/firmware/App/Services/Interrupts.c,315,style,unusedFunction,The function 'dmaGroupANotification' is never used.
+hdfirmware/firmware/App/Services/Interrupts.c,361,style,unusedFunction,The function 'edgeNotification' is never used.
+hdfirmware/firmware/App/Controllers/AirTrap.c,207,style,unusedFunction,The function 'execAirTrapMonitorPriming' is never used.
+hdfirmware/firmware/App/Controllers/AirTrap.c,441,style,unusedFunction,The function 'execAirTrapTest' is never used.
+hdfirmware/firmware/App/Controllers/DGInterface.c,152,style,unusedFunction,The function 'execPreTreatmentReservoirMgmt' is never used.
+hdfirmware/firmware/App/Controllers/PresOccl.c,539,style,unusedFunction,The function 'execPresOcclTest' is never used.
+hdfirmware/firmware/FWCommon/Accel.c,674,style,unusedFunction,The function 'getAccelCalibration' is never used.
+hdfirmware/firmware/App/Controllers/BloodFlow.c,1340,style,unusedFunction,The function 'getBloodFlowCalibration' is never used.
+hdfirmware/firmware/App/Controllers/BloodFlow.c,400,style,unusedFunction,The function 'getBloodPumpRotorCount' is never used.
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,764,style,unusedFunction,The function 'getBootloaderFlag' is never used.
+<<<<<<< HEAD
+hdfirmware/firmware/App/Services/AlarmMgmt.c,387,style,unusedFunction,The function 'getCurrentAlarmStatePriority' is never used.
+hdfirmware/firmware/App/Controllers/DGInterface.c,434,style,unusedFunction,The function 'getDGDrainPumpRPMSetPt' is never used.
+hdfirmware/firmware/App/Controllers/DGInterface.c,380,style,unusedFunction,The function 'getDGPressure' is never used.
+hdfirmware/firmware/App/Controllers/DGInterface.c,419,style,unusedFunction,The function 'getDGROPumpFlowRateMlMin' is never used.
+hdfirmware/firmware/App/Controllers/DGInterface.c,404,style,unusedFunction,The function 'getDGROPumpPressureSetPt' is never used.
+hdfirmware/firmware/App/Controllers/DialInFlow.c,1307,style,unusedFunction,The function 'getDialInFlowCalibration' is never used.
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,635,style,unusedFunction,The function 'getDisinfectionDate' is never used.
+hdfirmware/firmware/App/Services/FPGA.c,1131,style,unusedFunction,The function 'getFPGABloodPumpHallSensorStatus' is never used.
+hdfirmware/firmware/App/Services/FPGA.c,1163,style,unusedFunction,The function 'getFPGADialInPumpHallSensorStatus' is never used.
+hdfirmware/firmware/App/Services/FPGA.c,1195,style,unusedFunction,The function 'getFPGADialOutPumpHallSensorStatus' is never used.
+hdfirmware/firmware/App/Controllers/DGInterface.c,449,style,unusedFunction,The function 'getLoadCellWeightInGrams' is never used.
+=======
+hdfirmware/firmware/App/Services/AlarmMgmt.c,537,style,unusedFunction,The function 'getCurrentAlarmStatePriority' is never used.
+hdfirmware/firmware/App/Controllers/DGInterface.c,399,style,unusedFunction,The function 'getDGDrainPumpRPMSetPt' is never used.
+hdfirmware/firmware/App/Controllers/DGInterface.c,345,style,unusedFunction,The function 'getDGPressure' is never used.
+hdfirmware/firmware/App/Controllers/DGInterface.c,384,style,unusedFunction,The function 'getDGROPumpFlowRateMlMin' is never used.
+hdfirmware/firmware/App/Controllers/DGInterface.c,369,style,unusedFunction,The function 'getDGROPumpPressureSetPt' is never used.
+hdfirmware/firmware/App/Controllers/DialInFlow.c,1302,style,unusedFunction,The function 'getDialInFlowCalibration' is never used.
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,635,style,unusedFunction,The function 'getDisinfectionDate' is never used.
+hdfirmware/firmware/App/Services/FPGA.c,1169,style,unusedFunction,The function 'getFPGABloodPumpHallSensorStatus' is never used.
+hdfirmware/firmware/App/Services/FPGA.c,1201,style,unusedFunction,The function 'getFPGADialInPumpHallSensorStatus' is never used.
+hdfirmware/firmware/App/Services/FPGA.c,1233,style,unusedFunction,The function 'getFPGADialOutPumpHallSensorStatus' is never used.
+>>>>>>> staging
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,340,style,unusedFunction,The function 'getMfgData' is never used.
+hdfirmware/firmware/App/Services/PIControllers.c,233,style,unusedFunction,The function 'getPIControllerSignals' is never used.
+hdfirmware/firmware/FWCommon/RTC.c,422,style,unusedFunction,The function 'getRTCTimestamp' is never used.
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,465,style,unusedFunction,The function 'getServiceDate' is never used.
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,558,style,unusedFunction,The function 'getTreatmentTime' is never used.
+hdfirmware/firmware/App/Controllers/Valves.c,343,style,unusedFunction,The function 'getValvePosition' is never used.
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,595,style,unusedFunction,The function 'getWaterConsumption' is never used.
+hdfirmware/firmware/FWCommon/Utilities.c,418,style,unusedFunction,The function 'hexStrToDec' is never used.
+<<<<<<< HEAD
+hdfirmware/firmware/App/Modes/Prime.c,83,style,unusedFunction,The function 'initPrime' is never used.
+hdfirmware/firmware/App/Services/AlarmMgmt.c,372,style,unusedFunction,The function 'isAlarmActive' is never used.
+=======
+hdfirmware/firmware/App/Services/AlarmMgmt.c,522,style,unusedFunction,The function 'isAlarmActive' is never used.
+>>>>>>> staging
+hdfirmware/firmware/App/Controllers/PresOccl.c,137,style,unusedFunction,The function 'isCartridgeLoaded' is never used.
+hdfirmware/firmware/App/Modes/ModeInitPOST.c,212,style,unusedFunction,The function 'isPOSTCompleted' is never used.
+hdfirmware/firmware/App/Modes/ModeInitPOST.c,225,style,unusedFunction,The function 'isPOSTPassed' is never used.
+hdfirmware/firmware/App/Drivers/Comm.c,263,style,unusedFunction,The function 'isSCI2DMATransmitInProgress' is never used.
+hdfirmware/firmware/App/Drivers/SafetyShutdown.c,76,style,unusedFunction,The function 'isSafetyShutdownActivated' is never used.
+hdfirmware/firmware/App/Services/SystemComm.c,233,style,unusedFunction,The function 'isUICommunicating' is never used.
+hdfirmware/firmware/App/Services/Interrupts.c,95,style,unusedFunction,The function 'phantomInterrupt' is never used.
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,511,style,unusedFunction,The function 'readLogData' is never used.
+hdfirmware/firmware/App/Services/Interrupts.c,117,style,unusedFunction,The function 'rtiNotification' is never used.
+hdfirmware/firmware/App/Services/Interrupts.c,245,style,unusedFunction,The function 'sciNotification' is never used.
+hdfirmware/firmware/App/Services/AlarmMgmt.c,566,style,unusedFunction,The function 'setAlarmAudioVolume' is never used.
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,743,style,unusedFunction,The function 'setBootloaderFlag' is never used.
+<<<<<<< HEAD
+hdfirmware/firmware/App/Controllers/DGInterface.c,563,style,unusedFunction,The function 'setDGDialysateTemperatures' is never used.
+=======
+hdfirmware/firmware/App/Controllers/DGInterface.c,455,style,unusedFunction,The function 'setDGDialysateTemperatures' is never used.
+>>>>>>> staging
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,610,style,unusedFunction,The function 'setDisinfectionDate' is never used.
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,323,style,unusedFunction,The function 'setMfgData' is never used.
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,440,style,unusedFunction,The function 'setServiceDate' is never used.
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,534,style,unusedFunction,The function 'setTreatmentTime' is never used.
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,572,style,unusedFunction,The function 'setWaterConsumption' is never used.
+hdfirmware/firmware/App/Services/AlarmMgmt.c,781,style,unusedFunction,The function 'testResetAlarmStatusPublishIntervalOverride' is never used.
+hdfirmware/firmware/App/Services/AlarmMgmt.c,756,style,unusedFunction,The function 'testSetAlarmStatusPublishIntervalOverride' is never used.
+hdfirmware/firmware/FWCommon/NVDataMgmt.c,487,style,unusedFunction,The function 'writeLogData' is never used.
 ,,information,missingInclude,Cppcheck cannot find all the include files (use --check-config for details)