Index: results/Build_Status_Report.csv
===================================================================
diff -u -r2d5157c59ced0866aaa32d9722d6f1ba28b0b18d -rbd37de9f5836bbb46d90ee639cc60e6375614f1b
--- results/Build_Status_Report.csv	(.../Build_Status_Report.csv)	(revision 2d5157c59ced0866aaa32d9722d6f1ba28b0b18d)
+++ results/Build_Status_Report.csv	(.../Build_Status_Report.csv)	(revision bd37de9f5836bbb46d90ee639cc60e6375614f1b)
@@ -1,14 +1,7 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
 
 Running Project, hdfirmware
-Date, Mon Sep 14 15:16:29 PDT 2020
-=======
+Date, Tue Oct 13 18:35:31 PDT 2020
 
-Running Project, hdfirmware
-Date, Thu Oct  8 17:09:52 PDT 2020
->>>>>>> DEN-4308-hd-valve-control-1-of-2
-
 VectorCAST Pass/Fail Status, Passed
 
 Unit Test Coverage, Passed
@@ -18,20 +11,23 @@
 modetreatment,execTreatmentMode
 modetreatment,handleTreatmentDialysisState
 modetreatment,handleTreatmentStopState
+airtrap,execAirTrapMonitorPriming
+airtrap,execAirTrapTest
 dginterface,execTreatmentReservoirMgmt
 presoccl,execPresOcclTest
 alarmmgmt,updateAlarmsFlags
 dialinflow,execDialInFlowTest
 alarmlamp,setAlarmLampToPatternStep
-<<<<<<< HEAD
-=======
 valves,handleValveStateHomingNotStarted
->>>>>>> DEN-4308-hd-valve-control-1-of-2
 bloodflow,execBloodFlowTest
 dialysis,handleUFPausedState
 dialysis,handleUFRunningState
 
-Integration Test Coverage, Passed
+Integration Test Coverage, Failed
+The following test(s) failed:
+VectorCAST_MinGW_C_LinuxTestSuite_INT_SYSTEMCOMMMESSAGES_management_report.html,Coverage(%):,96
+VectorCAST_MinGW_C_LinuxTestSuite_INT_ALARMMGMT_management_report.html,Coverage(%):,95
+VectorCAST_MinGW_C_LinuxTestSuite_INT_FPGA_management_report.html,Coverage(%):,98
 
 Integration Test Manual Cases
 Module, Function Name
@@ -98,11 +94,8 @@
 systemcomm,clearCANXmitBuffers
 systemcomm,checkTooManyBadMsgCRCs
 systemcomm,matchACKtoPendingACKList
-<<<<<<< HEAD
-=======
 valves,getValvePosition
 valves,getValveAirTrapStatus
->>>>>>> DEN-4308-hd-valve-control-1-of-2
 dginterface,getDGPressure
 dginterface,getDGROPumpPressureSetPt
 dginterface,getDGROPumpFlowRateMlMin
@@ -124,6 +117,10 @@
 dialinflow,handleDialInPumpControlToTargetState
 dialinflow,execDialInFlowTest
 dialinflow,getDialInFlowCalibration
+airtrap,execAirTrapMonitorPriming
+airtrap,handleAirTrapValveClosedState
+airtrap,handleAirTrapValveOpenState
+airtrap,execAirTrapTest
 fpga,handleFPGAReceiveHeaderState
 fpga,handleFPGAWriteAllActuatorsState
 fpga,handleFPGAReceiveAllSensorsState
@@ -167,225 +164,3 @@
 CppCheck, Passed
 Cppcheck No. of Warnings, 0
 
-<<<<<<< HEAD
-=======
-,,,,,,
-Running Project, hdfirmware,,,,,
-Date, Mon Aug 31 08:03:38 PDT 2020,,,,,
-,,,,,,
-VectorCAST Pass/Fail Status, Failed,,,,,
-The following test(s) failed:,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_ACCEL_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_ALARMLAMP_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_ALARMMGMT_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_BLOODFLOW_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_COMMBUFFERS_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_DIALINFLOW_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_DIALOUTFLOW_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_DIALYSIS_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_FPGA_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_INT_ALARMLAMP_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_INT_ALARMMGMT_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_INT_BLOODFLOW_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_INT_COMMBUFFERS_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_INT_DIALINFLOW_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_INT_FPGA_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_INT_MSGQUEUES_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_INT_NVDATAMGMT_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_INT_SYSTEMCOMM_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_INT_SYSTEMCOMMMESSAGES_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_OPERATIONMODES_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_PRESOCCL_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_SYSTEMCOMM_management_report.html,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_SYSTEMCOMMMESSAGES_management_report.html,,,,,,
-,,,,,,
-Unit Test Coverage, Failed,,,,,
-The following test(s) failed:,,,,,,
-./VectorCAST_MinGW_C_LinuxTestSuite_INTERRUPTS_management_report.html,Statement_Cov(%):,77,Branch_Cov(%):,86,Pairs_Cov(%):,68
-./VectorCAST_MinGW_C_LinuxTestSuite_ALARMMGMT_management_report.html,Statement_Cov(%):,100,Branch_Cov(%):,98,Pairs_Cov(%):,96
-./VectorCAST_MinGW_C_LinuxTestSuite_COMMBUFFERS_management_report.html,Statement_Cov(%):,100,Branch_Cov(%):,96,Pairs_Cov(%):,92
-./VectorCAST_MinGW_C_LinuxTestSuite_NVDATAMGMT_management_report.html,Statement_Cov(%):,99,Branch_Cov(%):,99,Pairs_Cov(%):,98
-./VectorCAST_MinGW_C_LinuxTestSuite_DIALINFLOW_management_report.html,Statement_Cov(%):,94,Branch_Cov(%):,95,Pairs_Cov(%):,95
-./VectorCAST_MinGW_C_LinuxTestSuite_SYSTEMCOMM_management_report.html,Statement_Cov(%):,87,Branch_Cov(%):,87,Pairs_Cov(%):,84
-./VectorCAST_MinGW_C_LinuxTestSuite_BLOODFLOW_management_report.html,Statement_Cov(%):,94,Branch_Cov(%):,95,Pairs_Cov(%):,95
-./VectorCAST_MinGW_C_LinuxTestSuite_ACCEL_management_report.html,Statement_Cov(%):,100,Branch_Cov(%):,99,Pairs_Cov(%):,97
-./VectorCAST_MinGW_C_LinuxTestSuite_SYSTEMCOMMMESSAGES_management_report.html,Statement_Cov(%):,83,Branch_Cov(%):,82,Pairs_Cov(%):,81
-./VectorCAST_MinGW_C_LinuxTestSuite_DIALOUTFLOW_management_report.html,Statement_Cov(%):,96,Branch_Cov(%):,93,Pairs_Cov(%):,92
-./VectorCAST_MinGW_C_LinuxTestSuite_FPGA_management_report.html,Statement_Cov(%):,89,Branch_Cov(%):,83,Pairs_Cov(%):,90
-VectorCAST Pass/Fail Status, Failed,,,,,
-The following test(s) failed:,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_NVDATAMGMT_management_report.html,,,,,,
-,,,,,,
-Unit Test Coverage, Failed,,,,,
-The following test(s) failed:,,,,,,
-./VectorCAST_MinGW_C_LinuxTestSuite_NVDATAMGMT_management_report.html,Statement_Cov(%):,99,Branch_Cov(%):,99,Pairs_Cov(%):,98
-VectorCAST Pass/Fail Status, Failed,,,,,
-The following test(s) failed:,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_NVDATAMGMT_management_report.html,,,,,,
-,,,,,,
-Unit Test Coverage, Failed,,,,,
-The following test(s) failed:,,,,,,
-./VectorCAST_MinGW_C_LinuxTestSuite_NVDATAMGMT_management_report.html,Statement_Cov(%):,99,Branch_Cov(%):,99,Pairs_Cov(%):,98
-VectorCAST Pass/Fail Status, Failed,,,,,
-The following test(s) failed:,,,,,,
-VectorCAST_MinGW_C_LinuxTestSuite_NVDATAMGMT_management_report.html,,,,,,
-,,,,,,
-Unit Test Coverage, Failed,,,,,
-The following test(s) failed:,,,,,,
-./VectorCAST_MinGW_C_LinuxTestSuite_NVDATAMGMT_management_report.html,Statement_Cov(%):,99,Branch_Cov(%):,99,Pairs_Cov(%):,98
-Integration Test Coverage, Failed,,,,,
-The following test(s) failed:,,,,,,
-./VectorCAST_MinGW_C_LinuxTestSuite_INT_SYSTEMCOMMMESSAGES_management_report.html,,,,,,
-./VectorCAST_MinGW_C_LinuxTestSuite_INT_DIALOUTFLOW_management_report.html,,,,,,
-./VectorCAST_MinGW_C_LinuxTestSuite_INT_ALARMMGMT_management_report.html,,,,,,
-./VectorCAST_MinGW_C_LinuxTestSuite_INT_ALARMLAMP_management_report.html,,,,,,
-./VectorCAST_MinGW_C_LinuxTestSuite_INT_SYSTEMCOMM_management_report.html,,,,,,
-./VectorCAST_MinGW_C_LinuxTestSuite_INT_DIALINFLOW_management_report.html,,,,,,
-./VectorCAST_MinGW_C_LinuxTestSuite_INT_FPGA_management_report.html,,,,,,
-./VectorCAST_MinGW_C_LinuxTestSuite_INT_BLOODFLOW_management_report.html,,,,,,
-Integration Test Manual Cases,,,,,,
-Module, Function Name,,,,,
-dialysis,transitionToDialysis,,,,,
-dialysis,handleDialysisSolutionInfusionState,,,,,
-dialysis,handleUFStartState,,,,,
-dialysis,handleUFPausedState,,,,,
-dialysis,handleUFOffState,,,,,
-dialysis,handleUFCompletedState,,,,,
-dialysis,setStartReservoirVolume,,,,,
-dialysis,signalReservoirsSwitched,,,,,
-dialysis,setFinalReservoirVolume,,,,,
-systemcommmessages,sendDialysateTempTargetsToDG,,,,,
-systemcommmessages,sendDGSwitchReservoirCommand,,,,,
-systemcommmessages,sendDGFillCommand,,,,,
-systemcommmessages,sendDGDrainCommand,,,,,
-systemcommmessages,sendDGStartStopCommand,,,,,
-systemcommmessages,sendDGSampleWaterCommand,,,,,
-systemcommmessages,broadcastAlarmCleared,,,,,
-systemcommmessages,broadcastHDOperationMode,,,,,
-systemcommmessages,handleTestArterialPressureOverrideRequest,,,,,
-systemcommmessages,handleTestVenousPressureOverrideRequest,,,,,
-systemcommmessages,handleTestBloodPumpOcclusionOverrideRequest,,,,,
-systemcommmessages,handleTestDialysateInletPumpOcclusionOverrideRequest,,,,,
-systemcommmessages,handleTestDialysateOutletPumpOcclusionOverrideRequest,,,,,
-systemcommmessages,handleTestPresOcclBroadcastIntervalOverrideRequest,,,,,
-systemcommmessages,handleSetRTCTimestamp,,,,,
-systemcommmessages,handleTestDialOutFlowBroadcastIntervalOverrideRequest,,,,,
-systemcommmessages,handleTestDialOutUFReferenceVolumeOverrideRequest,,,,,
-systemcommmessages,handleTestDialOutUFMeasuredVolumeOverrideRequest,,,,,
-systemcommmessages,handleTestDialOutPumpMCMeasuredSpeedOverrideRequest,,,,,
-systemcommmessages,handleTestDialOutPumpMCMeasuredCurrentOverrideRequest,,,,,
-systemcommmessages,handleTestDialOutPumpMeasuredSpeedOverrideRequest,,,,,
-systemcommmessages,handleTestDialOutPumpMeasuredRotorSpeedOverrideRequest,,,,,
-systemcommmessages,handleTestDialOutLoadCellWeightOverrideRequest,,,,,
-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,,,,,
-dialoutflow,signalDialOutPumpHardStop,,,,,
-dialoutflow,signalDialOutPumpRotorHallSensor,,,,,
-dialoutflow,homeDialOutPump,,,,,
-dialoutflow,handleDialOutPumpControlToTargetState,,,,,
-alarmmgmt,isAlarmActive,,,,,
-alarmmgmt,resetAlarmPriorityFIFO,,,,,
-systemcomm,isUICommunicating,,,,,
-systemcomm,checkTooManyBadMsgCRCs,,,,,
-systemcomm,matchACKtoPendingACKList,,,,,
-dginterface,execTreatmentReservoirMgmt,,,,,
-dginterface,getDGOpMode,,,,,
-dginterface,getDGSubMode,,,,,
-dginterface,getDGPressure,,,,,
-dginterface,getDGROPumpPressureSetPt,,,,,
-dginterface,getDGROPumpFlowRateMlMin,,,,,
-dginterface,getDGDrainPumpRPMSetPt,,,,,
-dginterface,setDGDialysateTemperatures,,,,,
-dginterface,cmdSetDGDialysateTargetTemps,,,,,
-dginterface,cmdStartDG,,,,,
-dginterface,cmdStopDG,,,,,
-dginterface,cmdStartDGTrimmerHeater,,,,,
-dginterface,cmdStopDGTrimmerHeater,,,,,
-dginterface,cmdSetDGActiveReservoir,,,,,
-dginterface,cmdStartDGFill,,,,,
-dginterface,cmdStartDGDrain,,,,,
-dginterface,cmdDGSampleWater,,,,,
-dialinflow,signalDialInPumpHardStop,,,,,
-dialinflow,signalDialInPumpRotorHallSensor,,,,,
-dialinflow,homeDialInPump,,,,,
-dialinflow,handleDialInPumpRampingUpState,,,,,
-dialinflow,handleDialInPumpRampingDownState,,,,,
-dialinflow,handleDialInPumpControlToTargetState,,,,,
-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,,,,,
-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,,,,,
-ModeTreatmentParams, 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,,,,,
-Accel, Missing Unit Test and Integration Test,,,,,
-PersistentAlarm, Missing Unit Test and Integration Test,,,,,
-,,,,,,
-CppCheck, Failed,,,,,
-Cppcheck No. of Warnings,0,,,,,
->>>>>>> DEN-4308-hd-valve-control-1-of-2
-=======
->>>>>>> DEN-4308-hd-valve-control-1-of-2