Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r39bff5f9647203d9eb86e18048728057dc68b4eb -r5a04a1445b684aedd199e0294311db468635c152
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 39bff5f9647203d9eb86e18048728057dc68b4eb)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 5a04a1445b684aedd199e0294311db468635c152)
@@ -78,6 +78,9 @@
 
 #define FPGA_ADC1_AUTO_READ_ENABLE      0x01                    ///< Auto-read enable bit for ADC1 control register.
 
+#define FPGA_AIRTRAP_LEVEL_LOW_MASK     0x0008                  ///< Bit mask for air trap lower level sensor.
+#define FPGA_AIRTRAP_LEVEL_HIGH_MASK    0x0004                  ///< Bit mask for air trap upper level sensor.
+
 // FPGA Sensors Record
 #pragma pack(push,1)
 /// Record structure for FPGA header read.
@@ -286,9 +289,8 @@
 /*********************************************************************//**
  * @brief
  * The initFPGA function initializes the FPGA module.
- * @details
- * Inputs : none
- * Outputs : FPGA module initialized.
+ * @details Inputs: none
+ * @details Outputs: FPGA module initialized.
  * @return none
  *************************************************************************/
 void initFPGA( void )
@@ -397,9 +399,8 @@
  * @brief
  * The resetFPGACommFlags function resets the various fpga comm flags and
  * counters.
- * @details
- * Inputs : none
- * Outputs : fpga comm flags & counters reset
+ * @details Inputs: none
+ * @details Outputs: fpga comm flags & counters reset
  * @return none
  *************************************************************************/
 static void resetFPGACommFlags( void )
@@ -417,9 +418,8 @@
  * @brief
  * The signalFPGAReceiptCompleted function increments a counter to indicate
  * that another DMA receipt from the FPGA has completed.
- * @details
- * Inputs : none
- * Outputs : fpgaReceiptCounter
+ * @details Inputs: none
+ * @details Outputs: fpgaReceiptCounter
  * @return none
  *************************************************************************/
 void signalFPGAReceiptCompleted( void )
@@ -452,9 +452,8 @@
  * @brief
  * The signalFPGATransmitCompleted function increments a counter to indicate
  * that another DMA transmit to the FPGA has completed.
- * @details
- * Inputs : none
- * Outputs : fpgaReceiptCounter
+ * @details Inputs: none
+ * @details Outputs: fpgaReceiptCounter
  * @return none
  *************************************************************************/
 void signalFPGATransmitCompleted( void )
@@ -465,9 +464,8 @@
 /*********************************************************************//**
  * @brief
  * The execFPGA function manages incoming data exchanges with the FPGA.
- * @details
- * Inputs : fpgaState
- * Outputs : fpgaState
+ * @details Inputs: fpgaState
+ * @details Outputs: fpgaState
  * @return none
  *************************************************************************/
 void execFPGAIn( void )
@@ -524,9 +522,8 @@
 /*********************************************************************//**
  * @brief
  * The execFPGAOut function manages outgoing data exchanges with the FPGA.
- * @details
- * Inputs : fpgaState
- * Outputs : fpgaState
+ * @details Inputs: fpgaState
+ * @details Outputs: fpgaState
  * @return none
  *************************************************************************/
 void execFPGAOut( void )
@@ -571,9 +568,8 @@
  * @brief
  * The handleFPGAReadHeaderState function handles the FPGA state where
  * the read header registers command is sent to the FPGA.
- * @details
- * Inputs : none
- * Outputs : read command sent to FPGA
+ * @details Inputs: none
+ * @details Outputs: read command sent to FPGA
  * @return next FPGA state
  *************************************************************************/
 static FPGA_STATE_T handleFPGAReadHeaderState( void )
@@ -603,9 +599,8 @@
  * @brief
  * The handleFPGAReceiveHeaderState function handles the FPGA state
  * where the header registers read response should be ready to take in.
- * @details
- * Inputs : none
- * Outputs : header register values updated
+ * @details Inputs: none
+ * @details Outputs: header register values updated
  * @return next FPGA state
  *************************************************************************/
 static FPGA_STATE_T handleFPGAReceiveHeaderState( void )
@@ -655,9 +650,8 @@
  * @brief
  * The handleFPGAWriteAllActuatorsState function handles the FPGA state
  * where the bulk write command is sent to the FPGA.
- * @details
- * Inputs : actuator set points
- * Outputs : actuator set points sent to FPGA
+ * @details Inputs: actuator set points
+ * @details Outputs: actuator set points sent to FPGA
  * @return next FPGA state
  *************************************************************************/
 static FPGA_STATE_T handleFPGAWriteAllActuatorsState( void )
@@ -704,9 +698,8 @@
  * @brief
  * The handleFPGAReceiveAllSensorsState function handles the FPGA state
  * where the bulk read response should be ready to parse.
- * @details
- * Inputs : none
- * Outputs : sensor values updated
+ * @details Inputs: none
+ * @details Outputs: sensor values updated
  * @return next FPGA state
  *************************************************************************/
 static FPGA_STATE_T handleFPGAReceiveAllSensorsState( void )
@@ -767,9 +760,8 @@
  * @brief
  * The handleFPGAReadAllSensorsAsyncState function handles the FPGA state where
  * the read async sensors command is sent to the FPGA.
- * @details
- * Inputs : none
- * Outputs : read async sensors command sent to FPGA
+ * @details Inputs: none
+ * @details Outputs: read async sensors command sent to FPGA
  * @return next FPGA state
  *************************************************************************/
 static FPGA_STATE_T handleFPGAReadAllSensorsAsyncState( void )
@@ -799,9 +791,8 @@
  * @brief
  * The handleFPGAReceiveAllSensorsAsyncState function handles the FPGA state
  * where the bulk async read response should be ready to parse.
- * @details
- * Inputs : none
- * Outputs : async sensor values updated
+ * @details Inputs: none
+ * @details Outputs: async sensor values updated
  * @return next FPGA state
  *************************************************************************/
 static FPGA_STATE_T handleFPGAReceiveAllSensorsAsyncState( void )
@@ -851,9 +842,8 @@
 /*********************************************************************//**
  * @brief
  * The execFPGATest function executes the FPGA self-test.
- * @details
- * Inputs : fpgaHeader
- * Outputs : none
+ * @details Inputs: fpgaHeader
+ * @details Outputs: none
  * @return passed, or failed
  *************************************************************************/
 SELF_TEST_STATUS_T execFPGATest( void )
@@ -880,11 +870,30 @@
 
 /*********************************************************************//**
  * @brief
+ * The consumeUnexpectedData function checks to see if a byte is sitting in
+ * the SCI2 received data register.
+ * @details Inputs: fpgaHeader
+ * @details Outputs: none
+ * @return fpgaDiag
+ *************************************************************************/
+static void consumeUnexpectedData( void )
+{
+    // clear any errors
+    sciRxError( scilinREG );
+
+    // if a byte is pending read, read it
+    if ( sciIsRxReady( scilinREG ) != 0 )
+    {
+        sciReceiveByte( scilinREG );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
  * The setupDMAForWriteCmd function sets the byte count for the next DMA
  * write command to the FPGA.
- * @details
- * Inputs : none
- * Outputs : number of bytes for next FPGA write command is set
+ * @details Inputs: none
+ * @details Outputs: number of bytes for next FPGA write command is set
  * @param bytes2Transmit number of bytes to be transmitted via DMA to the FPGA
  * @return none
  *************************************************************************/
@@ -905,9 +914,8 @@
  * @brief
  * The startDMAWriteCmd function initiates the DMA transmit for the next
  * DMA write command to the FPGA.
- * @details
- * Inputs : none
- * Outputs : DMA write command to FPGA is initiated
+ * @details Inputs: none
+ * @details Outputs: DMA write command to FPGA is initiated
  * @return none
  *************************************************************************/
 static void startDMAWriteCmd( void )
@@ -921,9 +929,8 @@
  * @brief
  * The setupDMAForWriteResp function sets the expected byte count for the
  * next DMA write command response from the FPGA.
- * @details
- * Inputs : none
- * Outputs : number of expected bytes for next FPGA write command response is set
+ * @details Inputs: none
+ * @details Outputs: number of expected bytes for next FPGA write command response is set
  * @param bytes2Receive number of bytes expected to be transmitted via DMA from the FPGA
  * @return none
  *************************************************************************/
@@ -944,9 +951,8 @@
  * @brief
  * The startDMAReceiptOfWriteResp function initiates readiness of the DMA
  * receiver for the next DMA write command response from the FPGA.
- * @details
- * Inputs : none
- * Outputs : DMA write command response is ready to be received from the FPGA
+ * @details Inputs: none
+ * @details Outputs: DMA write command response is ready to be received from the FPGA
  * @return none
  *************************************************************************/
 static void startDMAReceiptOfWriteResp( void )
@@ -960,9 +966,8 @@
  * @brief
  * The setupDMAForReadCmd function sets the byte count for the next DMA
  * read command to the FPGA.
- * @details
- * Inputs : none
- * Outputs : number of bytes for next FPGA read command is set
+ * @details Inputs: none
+ * @details Outputs: number of bytes for next FPGA read command is set
  * @param bytes2Transmit number of bytes to be transmitted via DMA to the FPGA
  * @return none
  *************************************************************************/
@@ -983,9 +988,8 @@
  * @brief
  * The startDMAReadCmd function initiates the DMA transmit for the next
  * DMA read command to the FPGA.
- * @details
- * Inputs : none
- * Outputs : DMA read command to FPGA is initiated
+ * @details Inputs: none
+ * @details Outputs: DMA read command to FPGA is initiated
  * @return none
  *************************************************************************/
 static void startDMAReadCmd( void )
@@ -999,9 +1003,8 @@
  * @brief
  * The setupDMAForReadResp function sets the expected byte count for the
  * next DMA read command response from the FPGA.
- * @details
- * Inputs : none
- * Outputs : number of expected bytes for next FPGA read command response is set
+ * @details Inputs: none
+ * @details Outputs: number of expected bytes for next FPGA read command response is set
  * @param bytes2Receive number of expected bytes to be transmitted via DMA from the FPGA
  * @return none
  *************************************************************************/
@@ -1022,9 +1025,8 @@
  * @brief
  * The startDMAReceiptOfReadResp function initiates readiness of the DMA
  * receiver for the next DMA read command response from the FPGA.
- * @details
- * Inputs : none
- * Outputs : DMA read command response is ready to be received from the FPGA
+ * @details Inputs: none
+ * @details Outputs: DMA read command response is ready to be received from the FPGA
  * @return none
  *************************************************************************/
 static void startDMAReceiptOfReadResp( void )
@@ -1037,9 +1039,8 @@
 /*********************************************************************//**
  * @brief
  * The getFPGAVersions function gets the fpga version numbers.
- * @details
- * Inputs : fpgaHeader
- * Outputs : none
+ * @details Inputs: fpgaHeader
+ * @details Outputs: none
  * @return none
  *************************************************************************/
 void getFPGAVersions( U08 *Id, U08 *Maj, U08 *Min, U08 *Lab )
@@ -1054,9 +1055,8 @@
  * @brief
  * The getFPGABloodFlowSignalStrength function gets the latest blood flow
  * signal strength reading.
- * @details
- * Inputs : fpgaSensorReadings2
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings2
+ * @details Outputs: none
  * @return last blood flow signal strength reading
  *************************************************************************/
 F32 getFPGABloodFlowSignalStrength( void )
@@ -1068,9 +1068,8 @@
  * @brief
  * The getFPGADialysateFlowSignalStrength function gets the latest dialysate
  * flow signal strength reading.
- * @details
- * Inputs : fpgaSensorReadings2
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings2
+ * @details Outputs: none
  * @return last dialysate flow signal strength reading
  *************************************************************************/
 F32 getFPGADialysateFlowSignalStrength( void )
@@ -1081,9 +1080,8 @@
 /*********************************************************************//**
  * @brief
  * The getFPGABloodFlow function gets the latest blood flow reading.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
  * @return last blood flow reading
  *************************************************************************/
 F32 getFPGABloodFlow( void )
@@ -1094,9 +1092,8 @@
 /*********************************************************************//**
  * @brief
  * The getFPGADialysateFlow function gets the latest dialysate flow reading.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
  * @return last dialysate flow reading
  *************************************************************************/
 F32 getFPGADialysateFlow( void )
@@ -1111,9 +1108,8 @@
  * counting up, indicates motor is running in forward direction.  If counter is
  * counting down, indicates motor is running in reverse direction.  Counter will
  * wrap at 0/65535.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
  * @return last blood pump hall sensor count reading.
  *************************************************************************/
 U16 getFPGABloodPumpHallSensorCount( void )
@@ -1128,9 +1124,8 @@
  *    Bit 0 - Derived direction of the blood pump motor (0=Fwd, 1=Rev)
  *    Bit 1 - A direction error was detected in the current hall sensor phase
  *    Bit 2 - A direction error was detected since the last read of this register
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
  * @return last blood pump hall sensor status reading.
  *************************************************************************/
 U08 getFPGABloodPumpHallSensorStatus( void )
@@ -1145,9 +1140,8 @@
  * counting up, indicates motor is running in forward direction.  If counter is
  * counting down, indicates motor is running in reverse direction.  Counter will
  * wrap at 0/65535.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
  * @return last dialysate inlet pump hall sensor count reading.
  *************************************************************************/
 U16 getFPGADialInPumpHallSensorCount( void )
@@ -1162,9 +1156,8 @@
  *    Bit 0 - Derived direction of the dialyste inlet pump motor (0=Fwd, 1=Rev)
  *    Bit 1 - A direction error was detected in the current hall sensor phase
  *    Bit 2 - A direction error was detected since the last read of this register
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
  * @return last dialysate inlet pump hall sensor status reading.
  *************************************************************************/
 U08 getFPGADialInPumpHallSensorStatus( void )
@@ -1179,9 +1172,8 @@
  * counting up, indicates motor is running in forward direction.  If counter is
  * counting down, indicates motor is running in reverse direction.  Counter will
  * wrap at 0/65535.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
  * @return last dialysate outlet pump hall sensor count reading.
  *************************************************************************/
 U16 getFPGADialOutPumpHallSensorCount( void )
@@ -1196,9 +1188,8 @@
  *    Bit 0 - Derived direction of the dialysate outlet pump motor (0=Fwd, 1=Rev)
  *    Bit 1 - A direction error was detected in the current hall sensor phase
  *    Bit 2 - A direction error was detected since the last read of this register
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
  * @return last dialysate outlet pump hall sensor status reading.
  *************************************************************************/
 U08 getFPGADialOutPumpHallSensorStatus( void )
@@ -1209,9 +1200,8 @@
 /*********************************************************************//**
  * @brief
  * The getFPGABloodPumpOcclusion function gets the latest blood occlusion reading.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
  * @return last blood occlusion reading
  *************************************************************************/
 U16 getFPGABloodPumpOcclusion( void )
@@ -1223,9 +1213,8 @@
  * @brief
  * The getFPGADialInPumpOcclusion function gets the latest dialysate
  * inlet occlusion reading.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
  * @return last dialysate inlet occlusion reading
  *************************************************************************/
 U16 getFPGADialInPumpOcclusion( void )
@@ -1237,9 +1226,8 @@
  * @brief
  * The getFPGADialOutPumpOcclusion function gets the latest dialysate
  * outlet occlusion reading.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
  * @return last dialysate outlet occlusion reading
  *************************************************************************/
 U16 getFPGADialOutPumpOcclusion( void )
@@ -1250,9 +1238,8 @@
 /*********************************************************************//**
  * @brief
  * The getFPGAArterialPressure function gets the latest arterial pressure reading.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
  * @return last arterial pressure reading
  *************************************************************************/
 S32 getFPGAArterialPressure( void )
@@ -1263,9 +1250,8 @@
 /*********************************************************************//**
  * @brief
  * The getFPGAVenousPressure function gets the venous arterial pressure reading.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
  * @return last venous pressure reading
  *************************************************************************/
 U16 getFPGAVenousPressure( void )
@@ -1278,9 +1264,8 @@
  * @brief
  * The getFPGAAccelAxes function gets the accelerometer axis readings.
  * Axis readings are in ADC counts.  0.004 g per LSB.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
  * @param x Populate this param with X axis reading
  * @param y Populate this param with Y axis reading
  * @param z Populate this param with Z axis reading
@@ -1298,9 +1283,8 @@
  * The getFPGAAccelMaxes function gets the maximum accelerometer axis readings.
  * from last FPGA read (every 10ms).
  * Axis readings are in ADC counts.  0.004 g per LSB.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
  * @param x Populate this param with maximum X axis reading
  * @param y Populate this param with maximum Y axis reading
  * @param z Populate this param with maximum Z axis reading
@@ -1317,9 +1301,8 @@
  * @brief
  * The getFPGAAccelStatus function gets the accelerometer reading count
  * and error register values.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
+ * @details Inputs: fpgaSensorReadings
+ * @details Outputs: none
  * @param cnt Populate this param with latest sample counter value
  * @param err Populate this param with latest error
  * @return none
@@ -1652,20 +1635,18 @@
  * @brief
  * The consumeUnexpectedData function checks to see if a byte is sitting in
  * the SCI2 received data register.
- * @details
- * Inputs : fpgaHeader
- * Outputs : none
+ * @details Inputs: fpgaHeader
+ * @details Outputs: none
  * @return fpgaDiag
  *************************************************************************/
-static void consumeUnexpectedData( void )
+void getFPGAAirTrapLevels( BOOL *airAtLower, BOOL *airAtUpper )
 {
-    // clear any errors
-    sciRxError( scilinREG );
-    // if a byte is pending read, read it
-    if ( sciIsRxReady( scilinREG ) != 0 )
-    {
-        sciReceiveByte( scilinREG );
-    }
+    U16 fpgaGPIO = fpgaSensorReadings.fpgaGPIO;
+    U16 lower = fpgaGPIO & FPGA_AIRTRAP_LEVEL_LOW_MASK;
+    U16 upper = fpgaGPIO & FPGA_AIRTRAP_LEVEL_HIGH_MASK;
+
+    *airAtLower = ( 0 == lower ? FALSE : TRUE );
+    *airAtUpper = ( 0 == upper ? FALSE : TRUE );
 }
 
 /**@}*/