Index: results/Build_Status_Report.csv
===================================================================
diff -u -re13152777df58456a873789fbfc3f889813109c9 -r1a685471524555a374854c0c9ec8e208e71fe2df
--- results/Build_Status_Report.csv	(.../Build_Status_Report.csv)	(revision e13152777df58456a873789fbfc3f889813109c9)
+++ results/Build_Status_Report.csv	(.../Build_Status_Report.csv)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
@@ -1,6 +1,10 @@
 
 Running Project, hdfirmware
+<<<<<<< HEAD
+Date, Fri Nov 13 11:48:25 PST 2020
+=======
 Date, Wed Oct 14 09:03:18 PDT 2020
+>>>>>>> master
 
 VectorCAST Pass/Fail Status, Passed
 
@@ -16,24 +20,31 @@
 dginterface,execTreatmentReservoirMgmt
 presoccl,execPresOcclTest
 alarmmgmt,updateAlarmsFlags
+dialinflow,checkDialInFlowSensorSignalStrength
 dialinflow,execDialInFlowTest
 alarmlamp,setAlarmLampToPatternStep
 valves,handleValveStateHomingNotStarted
+bloodflow,checkBloodFlowSensorSignalStrength
 bloodflow,execBloodFlowTest
+dialysis,transitionToDialysis
 dialysis,handleUFPausedState
 dialysis,handleUFRunningState
+dialysis,handleSalineBolusInProgressState
 
 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
+dialysis,handleSalineBolusIdleState
+dialysis,handleSalineBolusWait4Pumps2Stop
+dialysis,handleSalineBolusInProgressState
+dialysis,handleSalineBolusMaxDeliveredState
 systemcommmessages,broadcastAccelData
 systemcommmessages,broadcastHDOperationMode
 nvdatamgmt,setMfgData
@@ -61,7 +72,6 @@
 nvdatamgmt,enqueueBank7Sector0Records
 nvdatamgmt,eraseDataLogSectors
 accel,getAccelCalibration
-presoccl,setPressureLimits
 presoccl,setOcclusionThreshold
 presoccl,handlePresOcclInitState
 presoccl,getMeasuredArterialPressure
@@ -74,7 +84,6 @@
 cpld,setCPLDLampBlue
 modetreatmentparams,handleWaitForUI2SendState
 modetreatmentparams,setTreatmentParameterS32
-modetreatmentparams,setTreatmentParameterF32
 modetreatmentparams,getTreatmentParameterU32
 modetreatmentparams,getTreatmentParameterS32
 modetreatmentparams,getTreatmentParameterF32
@@ -83,7 +92,11 @@
 dialoutflow,homeDialOutPump
 dialoutflow,handleDialOutPumpControlToTargetState
 alarmmgmt,isAlarmActive
+<<<<<<< HEAD
+alarmmgmt,getCurrentAlarmStatePriority
+=======
 alarmmgmt,isAlarmRecoverable
+>>>>>>> master
 alarmmgmt,getAlarmStartTime
 alarmmgmt,resetAlarmPriorityFIFO
 systemcomm,isDGCommunicating
@@ -125,13 +138,13 @@
 fpga,startDMAWriteCmd
 fpga,setupDMAForWriteResp
 fpga,startDMAReceiptOfWriteResp
-fpga,getFPGABloodFlowSignalStrength
-fpga,getFPGADialysateFlowSignalStrength
 fpga,getFPGABloodPumpHallSensorStatus
 fpga,getFPGADialInPumpHallSensorStatus
 fpga,getFPGADialOutPumpHallSensorStatus
+fpga,getFPGAAirTrapLevels
 bloodflow,signalBloodPumpHardStop
 bloodflow,homeBloodPump
+bloodflow,getBloodPumpRotorCount
 bloodflow,handleBloodPumpRampingUpState
 bloodflow,handleBloodPumpRampingDownState
 bloodflow,handleBloodPumpControlToTargetState