Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r52863cba9685f31136ab3f4b4764a17ccf34fc05 -rf7e3018ec6ab762fe08efb42b21fb2ca970174b0
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 52863cba9685f31136ab3f4b4764a17ccf34fc05)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision f7e3018ec6ab762fe08efb42b21fb2ca970174b0)
@@ -80,24 +80,32 @@
 
 typedef struct  // TODO - add all sensor readings to this structure per FPGA register map
 {
-    U08 bloodFlowMeterCommStatus;
-    U08 bloodFlowMeterFrameCount;
-    U16 bloodFlowMeterDeviceStatus;
+    U08 bloodFlowMeterDataPktCount;
+    U08 bloodFlowMeterSlowPktCounts;
+    U08 bloodFlowMeterDeviceStatus;
+    U08 bloodFlowMeterResponse;
     F32 bloodFlowLast;
-    F32 bloodFlowAvg;
-    F32 bloodFlowMeterSoundSpeed;
-    F32 bloodFlowMeterAccFlowData;
-    F32 bloodFlowMeterSignalStrength;
-    U32 bloodFlowMeterSensorID;
-    U08 dialysateFlowMeterCommStatus;
-    U08 dialysateFlowMeterFrameCount;
-    U16 dialysateFlowMeterDeviceStatus;
+    U08 dialysateFlowMeterDataPktCount;
+    U08 dialysateFlowMeterSlowPckCounts;
+    U08 dialysateFlowMeterDeviceStatus;
+    U08 dialysateFlowMeterResponse;
     F32 dialysateFlowLast;
-    F32 dialysateFlowAvg;
-    F32 dialysateFlowMeterSoundSpeed;
-    F32 dialysateFlowMeterAccFlowData;
-    F32 dialysateFlowMeterSignalStrength;
-    U32 dialysateFlowMeterSensorID;
+    U08 bloodFlowMeterErrorCount;
+    U08 dialysateFlowMeterErrorCount;
+    U16 bloodOcclusionData;
+    U08 bloodOcclusionReadCount;
+    U08 bloodOcclusionErrorCount;
+    U16 dialysateInOcclusionData;
+    U08 dialysateInOcclusionReadCount;
+    U08 dialysateInOcclusionErrorCount;
+    U16 dialysateOutOcclusionData;
+    U08 dialysateOutOcclusionReadCount;
+    U08 dialysateOutOcclusionErrorCount;
+    U16 arterialPressureData;
+    U08 arterialPressureReadCount;
+    U08 arterialPressureErrorCount;
+    U16 dialysateTempPrimaryData;
+    U16 dialysateTempBackupData;
 } FPGA_SENSORS_T;
 
 typedef struct  // TODO - add all actuator set points to this structure per FPGA register map
@@ -920,7 +928,7 @@
     // clear any errors
     sciRxError( scilinREG );
     // if a byte is pending read, read it
-    if ( 0 != sciIsRxReady( scilinREG ) )
+    if ( sciIsRxReady( scilinREG ) != 0 )
     {
         sciReceiveByte( scilinREG );
     }