Index: results/Build_Status_Report.csv
===================================================================
diff -u -rff5f32c407068568c50c2e102078a84a87743f87 -rc282822f36836a8127f447c8ac5b8a50e851be63
--- results/Build_Status_Report.csv	(.../Build_Status_Report.csv)	(revision ff5f32c407068568c50c2e102078a84a87743f87)
+++ results/Build_Status_Report.csv	(.../Build_Status_Report.csv)	(revision c282822f36836a8127f447c8ac5b8a50e851be63)
@@ -1,36 +1,85 @@
 
 Running Project, hdfirmware
-Date, Mon Nov 30 22:22:11 PST 2020
+<<<<<<< HEAD
+Date, Thu Feb 18 13:15:32 PST 2021
 
 VectorCAST Pass/Fail Status, Passed
 
 Unit Test Coverage, Passed
 
+
+Integration Test Coverage, Passed
+
+=======
+Date, Mon Jan  4 13:01:58 PST 2021
+
+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_INT_ACCEL_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_MODETREATMENTPARAMS_management_report.html
+VectorCAST_MinGW_C_LinuxTestSuite_INT_SYSTEMCOMMMESSAGES_management_report.html
+VectorCAST_MinGW_C_LinuxTestSuite_INT_UTILITIES_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_MODETREATMENT_management_report.html,Statement_Cov(%):,86,Branch_Cov(%):,93,Pairs_Cov(%):,98
+VectorCAST_MinGW_C_LinuxTestSuite_AIRTRAP_management_report.html,Statement_Cov(%):,97,Branch_Cov(%):,98,Pairs_Cov(%):,100
+VectorCAST_MinGW_C_LinuxTestSuite_DGINTERFACE_management_report.html,Statement_Cov(%):,99,Branch_Cov(%):,95,Pairs_Cov(%):,91
+VectorCAST_MinGW_C_LinuxTestSuite_ALARMMGMT_management_report.html,Statement_Cov(%):,75,Branch_Cov(%):,71,Pairs_Cov(%):,59
+VectorCAST_MinGW_C_LinuxTestSuite_OPERATIONMODES_management_report.html,Statement_Cov(%):,78,Branch_Cov(%):,85,Pairs_Cov(%):,100
+VectorCAST_MinGW_C_LinuxTestSuite_DIALINFLOW_management_report.html,Statement_Cov(%):,99,Branch_Cov(%):,98,Pairs_Cov(%):,96
+VectorCAST_MinGW_C_LinuxTestSuite_VALVES_management_report.html,Statement_Cov(%):,100,Branch_Cov(%):,99,Pairs_Cov(%):,96
+VectorCAST_MinGW_C_LinuxTestSuite_SYSTEMCOMM_management_report.html,Statement_Cov(%):,97,Branch_Cov(%):,98,Pairs_Cov(%):,98
+VectorCAST_MinGW_C_LinuxTestSuite_MODETREATMENTPARAMS_management_report.html,Statement_Cov(%):,95,Branch_Cov(%):,96,Pairs_Cov(%):,97
+VectorCAST_MinGW_C_LinuxTestSuite_BLOODFLOW_management_report.html,Statement_Cov(%):,99,Branch_Cov(%):,98,Pairs_Cov(%):,96
+VectorCAST_MinGW_C_LinuxTestSuite_ACCEL_management_report.html,Statement_Cov(%):,97,Branch_Cov(%):,99,Pairs_Cov(%):,97
+VectorCAST_MinGW_C_LinuxTestSuite_SYSTEMCOMMMESSAGES_management_report.html,Statement_Cov(%):,94,Branch_Cov(%):,95,Pairs_Cov(%):,94
+VectorCAST_MinGW_C_LinuxTestSuite_DIALYSIS_management_report.html,Statement_Cov(%):,100,Branch_Cov(%):,99,Pairs_Cov(%):,98
+VectorCAST_MinGW_C_LinuxTestSuite_FPGA_management_report.html,Statement_Cov(%):,96,Branch_Cov(%):,95,Pairs_Cov(%):,91
+
 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
+dialysis,handleSalineBolusInProgressState
 
-Integration Test Coverage, Passed
+Integration Test Coverage, Failed
+The following test(s) failed:
+VectorCAST_MinGW_C_LinuxTestSuite_INT_DIALYSIS_management_report.html,Coverage(%):,96
+VectorCAST_MinGW_C_LinuxTestSuite_INT_SYSTEMCOMMMESSAGES_management_report.html,Coverage(%):,96
+VectorCAST_MinGW_C_LinuxTestSuite_INT_MODETREATMENT_management_report.html,Coverage(%):,93
+VectorCAST_MinGW_C_LinuxTestSuite_INT_OPERATIONMODES_management_report.html,Coverage(%):,87
+VectorCAST_MinGW_C_LinuxTestSuite_INT_MODETREATMENTPARAMS_management_report.html,Coverage(%):,91
+VectorCAST_MinGW_C_LinuxTestSuite_INT_ALARMMGMT_management_report.html,Coverage(%):,75
+VectorCAST_MinGW_C_LinuxTestSuite_INT_ALARMLAMP_management_report.html,Coverage(%):,44
+VectorCAST_MinGW_C_LinuxTestSuite_INT_DGINTERFACE_management_report.html,Coverage(%):,89
+VectorCAST_MinGW_C_LinuxTestSuite_INT_AIRTRAP_management_report.html,Coverage(%):,90
+VectorCAST_MinGW_C_LinuxTestSuite_INT_FPGA_management_report.html,Coverage(%):,98
 
 Integration Test Manual Cases
 Module, Function Name
 dialysis,transitionToDialysis
-dialysis,getSalineBolusState
 dialysis,handleDialysisSalineBolusState
 dialysis,handleUFStartState
 dialysis,handleUFPausedState
 dialysis,handleUFOffState
 dialysis,handleUFCompletedState
+dialysis,handleSalineBolusIdleState
+dialysis,handleSalineBolusWait4Pumps2Stop
+dialysis,handleSalineBolusInProgressState
 systemcommmessages,broadcastAccelData
 systemcommmessages,broadcastHDOperationMode
 nvdatamgmt,setMfgData
@@ -59,6 +108,7 @@
 nvdatamgmt,enqueueBank7Sector0Records
 nvdatamgmt,eraseDataLogSectors
 accel,getAccelCalibration
+utilities,hexStrToDec
 presoccl,isCartridgeLoaded
 presoccl,handlePresOcclInitState
 presoccl,execPresOcclTest
@@ -78,14 +128,16 @@
 dialoutflow,homeDialOutPump
 dialoutflow,handleDialOutPumpControlToTargetState
 alarmmgmt,isAlarmActive
+alarmmgmt,getCurrentAlarmStatePriority
 alarmmgmt,isAlarmRecoverable
-alarmmgmt,getAlarmStartTime
 alarmmgmt,resetAlarmPriorityFIFO
 systemcomm,isDGCommunicating
 systemcomm,isUICommunicating
 systemcomm,clearCANXmitBuffers
 systemcomm,checkTooManyBadMsgCRCs
 systemcomm,matchACKtoPendingACKList
+valves,getValvePosition
+valves,getValveAirTrapStatus
 dginterface,getDGPressure
 dginterface,getDGROPumpPressureSetPt
 dginterface,getDGROPumpFlowRateMlMin
@@ -97,7 +149,6 @@
 dginterface,cmdStopDGTrimmerHeater
 dginterface,cmdSetDGActiveReservoir
 dginterface,cmdStartDGFill
-dginterface,cmdStartDGDrain
 dginterface,cmdDGSampleWater
 dialinflow,signalDialInPumpHardStop
 dialinflow,signalDialInPumpRotorHallSensor
@@ -108,26 +159,29 @@
 dialinflow,getTargetDialInFlowRate
 dialinflow,execDialInFlowTest
 dialinflow,getDialInFlowCalibration
+airtrap,startAirTrapControl
+airtrap,handleAirTrapValveClosedState
+airtrap,handleAirTrapValveOpenState
 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,getBloodPumpRotorCount
 bloodflow,handleBloodPumpRampingUpState
 bloodflow,handleBloodPumpRampingDownState
 bloodflow,handleBloodPumpControlToTargetState
 bloodflow,execBloodFlowTest
 bloodflow,getBloodFlowCalibration
 rtc,getRTCTimestamp
+>>>>>>> staging
 
 List of Untested Modules
 InternalADC, Missing Unit Test and Integration Test
@@ -140,6 +194,7 @@
 TaskPriority, Missing Unit Test and Integration Test
 ModeInitPOST, Missing Unit Test and Integration Test
 TreatmentStop, Missing Unit Test and Integration Test
+Prime, 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