Index: results/Build_Status_Report.csv
===================================================================
diff -u -r66fb51abe03c81581865171fe03315d48c968f23 -ra35d5e68aad457339f625848809207a9650ad019
--- results/Build_Status_Report.csv	(.../Build_Status_Report.csv)	(revision 66fb51abe03c81581865171fe03315d48c968f23)
+++ results/Build_Status_Report.csv	(.../Build_Status_Report.csv)	(revision a35d5e68aad457339f625848809207a9650ad019)
@@ -1,3 +1,158 @@
+<<<<<<< HEAD
+
+Running Project, hdfirmware
+Date, Mon Sep 14 15:16:29 PDT 2020
+
+VectorCAST Pass/Fail Status, Passed
+
+Unit Test Coverage, Passed
+
+Unit Test Manual Cases
+Module, Function Name
+modetreatment,execTreatmentMode
+modetreatment,handleTreatmentDialysisState
+modetreatment,handleTreatmentStopState
+dginterface,execTreatmentReservoirMgmt
+presoccl,execPresOcclTest
+alarmmgmt,updateAlarmsFlags
+dialinflow,execDialInFlowTest
+alarmlamp,setAlarmLampToPatternStep
+bloodflow,execBloodFlowTest
+dialysis,handleUFPausedState
+dialysis,handleUFRunningState
+
+Integration Test Coverage, Passed
+
+Integration Test Manual Cases
+Module, Function Name
+dialysis,transitionToDialysis
+dialysis,getSalineBolusState
+dialysis,handleDialysisSalineBolusState
+dialysis,handleUFStartState
+dialysis,handleUFPausedState
+dialysis,handleUFOffState
+dialysis,handleUFCompletedState
+systemcommmessages,broadcastAccelData
+systemcommmessages,broadcastHDOperationMode
+nvdatamgmt,setMfgData
+nvdatamgmt,getMfgData
+nvdatamgmt,setCalibrationData
+nvdatamgmt,getCalibrationData
+nvdatamgmt,setServiceDate
+nvdatamgmt,getServiceDate
+nvdatamgmt,writeLogData
+nvdatamgmt,readLogData
+nvdatamgmt,setTreatmentTime
+nvdatamgmt,getTreatmentTime
+nvdatamgmt,setWaterConsumption
+nvdatamgmt,getWaterConsumption
+nvdatamgmt,setDisinfectionDate
+nvdatamgmt,getDisinfectionDate
+nvdatamgmt,setBootloaderFlag
+nvdatamgmt,getBootloaderFlag
+nvdatamgmt,setMemoryOpsStruct
+nvdatamgmt,prepareWriteLogJobAndGetStartAddress
+nvdatamgmt,prepareReadLogJobAndGetStartAddress
+nvdatamgmt,enqueue
+nvdatamgmt,isQueueFull
+nvdatamgmt,getAvailableQueueCount
+nvdatamgmt,enqueueBank7Sector0Records
+nvdatamgmt,eraseDataLogSectors
+accel,getAccelCalibration
+presoccl,setPressureLimits
+presoccl,setOcclusionThreshold
+presoccl,handlePresOcclInitState
+presoccl,getMeasuredArterialPressure
+presoccl,getMeasuredVenousPressure
+presoccl,execPresOcclTest
+safetyshutdown,isSafetyShutdownActivated
+modetreatment,handleTreatmentDialysisState
+modetreatment,handleTreatmentStopState
+buttons,isStopButtonPressed
+cpld,setCPLDLampBlue
+modetreatmentparams,handleWaitForUI2SendState
+modetreatmentparams,setTreatmentParameterS32
+modetreatmentparams,setTreatmentParameterF32
+modetreatmentparams,getTreatmentParameterU32
+modetreatmentparams,getTreatmentParameterS32
+modetreatmentparams,getTreatmentParameterF32
+dialoutflow,signalDialOutPumpHardStop
+dialoutflow,signalDialOutPumpRotorHallSensor
+dialoutflow,homeDialOutPump
+dialoutflow,handleDialOutPumpControlToTargetState
+alarmmgmt,isAlarmActive
+alarmmgmt,getAlarmStartTime
+alarmmgmt,resetAlarmPriorityFIFO
+systemcomm,isDGCommunicating
+systemcomm,isUICommunicating
+systemcomm,clearCANXmitBuffers
+systemcomm,checkTooManyBadMsgCRCs
+systemcomm,matchACKtoPendingACKList
+dginterface,getDGPressure
+dginterface,getDGROPumpPressureSetPt
+dginterface,getDGROPumpFlowRateMlMin
+dginterface,getDGDrainPumpRPMSetPt
+dginterface,setDGDialysateTemperatures
+dginterface,cmdSetDGDialysateTargetTemps
+dginterface,cmdStartDG
+dginterface,cmdStopDG
+dginterface,cmdStopDGTrimmerHeater
+dginterface,cmdSetDGActiveReservoir
+dginterface,cmdStartDGFill
+dginterface,cmdStartDGDrain
+dginterface,cmdDGSampleWater
+dialinflow,signalDialInPumpHardStop
+dialinflow,signalDialInPumpRotorHallSensor
+dialinflow,homeDialInPump
+dialinflow,handleDialInPumpRampingUpState
+dialinflow,handleDialInPumpRampingDownState
+dialinflow,handleDialInPumpControlToTargetState
+dialinflow,execDialInFlowTest
+dialinflow,getDialInFlowCalibration
+fpga,handleFPGAReceiveHeaderState
+fpga,handleFPGAWriteAllActuatorsState
+fpga,handleFPGAReceiveAllSensorsState
+fpga,setupDMAForWriteCmd
+fpga,startDMAWriteCmd
+fpga,setupDMAForWriteResp
+fpga,startDMAReceiptOfWriteResp
+fpga,getFPGABloodFlowSignalStrength
+fpga,getFPGADialysateFlowSignalStrength
+fpga,getFPGABloodPumpHallSensorStatus
+fpga,getFPGADialInPumpHallSensorStatus
+fpga,getFPGADialOutPumpHallSensorStatus
+bloodflow,signalBloodPumpHardStop
+bloodflow,homeBloodPump
+bloodflow,handleBloodPumpRampingUpState
+bloodflow,handleBloodPumpRampingDownState
+bloodflow,handleBloodPumpControlToTargetState
+bloodflow,execBloodFlowTest
+bloodflow,getBloodFlowCalibration
+rtc,getRTCTimestamp
+
+List of Untested Modules
+InternalADC, Missing Unit Test and Integration Test
+Comm, Missing Integration Test 
+Interrupts, Missing Integration Test 
+PIControllers, Missing Integration Test 
+TaskTimer, Missing Unit Test and Integration Test
+TaskBG, Missing Unit Test and Integration Test
+TaskGeneral, Missing Unit Test and Integration Test
+TaskPriority, Missing Unit Test and Integration Test
+ModeInitPOST, Missing Unit Test and Integration Test
+TreatmentStop, Missing Unit Test and Integration Test
+ModeStandby, Missing Unit Test and Integration Test
+ModeService, Missing Unit Test and Integration Test
+ModePreTreat, Missing Unit Test and Integration Test
+ModeFault, Missing Unit Test and Integration Test
+ModePostTreat, Missing Unit Test and Integration Test
+irqDispatch_c, Missing Unit Test and Integration Test
+PersistentAlarm, Missing Unit Test and Integration Test
+
+CppCheck, Passed
+Cppcheck No. of Warnings, 0
+
+=======
 ,,,,,,
 Running Project, hdfirmware,,,,,
 Date, Mon Aug 31 08:03:38 PDT 2020,,,,,
@@ -215,3 +370,4 @@
 ,,,,,,
 CppCheck, Failed,,,,,
 Cppcheck No. of Warnings,0,,,,,
+>>>>>>> DEN-4308-hd-valve-control-1-of-2