Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -rf5d0c90297a0716e1fb5a5c946436cccd35050e5 -r431de35ec5d48cbcd7f6fdf9b1586616d7ac3c05
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision f5d0c90297a0716e1fb5a5c946436cccd35050e5)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 431de35ec5d48cbcd7f6fdf9b1586616d7ac3c05)
@@ -42,9 +42,9 @@
 #define FPGA_PAGE_SIZE                  256
 #define FPGA_EXPECTED_ID                0x60
 
-#define FPGA_HEADER_START_ADDR          256     // TODO - update these after re-arranging w/ Randy
-#define FPGA_BULK_READ_START_ADDR       262
-#define FPGA_BULK_WRITE_START_ADDR      2
+#define FPGA_HEADER_START_ADDR          0x0000
+#define FPGA_BULK_READ_START_ADDR       0x0100
+#define FPGA_BULK_WRITE_START_ADDR      0x000E
 
 #define FPGA_WRITE_CMD_BUFFER_LEN       (FPGA_PAGE_SIZE+8)
 #define FPGA_READ_CMD_BUFFER_LEN        8
@@ -91,8 +91,8 @@
 
     U32 fpgaCD1Temp; // Conductivity sensor 1 in the mixing area
     U32 fpgaCD2Temp;
-    U32 fpgaTPiTemp;
     U32 fpgaTPoTemp;
+    U32 fpgaTPiTemp;
     U32 fpgaRTDTemp;
 
     U32 fpgaTHDo; // TRo
@@ -490,8 +490,8 @@
 
     // construct read command to read 3 registers starting at address 0
     fpgaReadCmdBuffer[ 0 ] = FPGA_READ_CMD_CODE;
-    fpgaReadCmdBuffer[ 1 ] = 0x06;    // start at FPGA address 6
-    fpgaReadCmdBuffer[ 2 ] = 0x00;
+    fpgaReadCmdBuffer[ 1 ] = GET_LSB_OF_WORD( FPGA_HEADER_START_ADDR );
+    fpgaReadCmdBuffer[ 2 ] = GET_MSB_OF_WORD( FPGA_HEADER_START_ADDR );
     fpgaReadCmdBuffer[ 3 ] = sizeof(FPGA_HEADER_T);
     crc = crc16( fpgaReadCmdBuffer, FPGA_READ_CMD_HDR_LEN );
     fpgaReadCmdBuffer[ 4 ] = GET_MSB_OF_WORD( crc );
@@ -576,17 +576,17 @@
 
     // construct bulk write command to write actuator data registers starting at address 3  (TODO - change address later)
     fpgaWriteCmdBuffer[ 0 ] = FPGA_WRITE_CMD_CODE;
-    fpgaWriteCmdBuffer[ 1 ] = 0x00;    // start at FPGA address 0
-    fpgaWriteCmdBuffer[ 2 ] = 0x00;
+    fpgaWriteCmdBuffer[ 1 ] = GET_LSB_OF_WORD( FPGA_BULK_WRITE_START_ADDR );
+    fpgaWriteCmdBuffer[ 2 ] = GET_MSB_OF_WORD( FPGA_BULK_WRITE_START_ADDR );
     fpgaWriteCmdBuffer[ 3 ] = sizeof(FPGA_ACTUATORS_T);
     memcpy( &( fpgaWriteCmdBuffer[ FPGA_WRITE_CMD_HDR_LEN ] ), &fpgaActuatorSetPoints, sizeof( FPGA_ACTUATORS_T ) );
     crc = crc16( fpgaWriteCmdBuffer, FPGA_WRITE_CMD_HDR_LEN + sizeof( FPGA_ACTUATORS_T ) );
     fpgaWriteCmdBuffer[ FPGA_WRITE_CMD_HDR_LEN + sizeof( FPGA_ACTUATORS_T ) ] = GET_MSB_OF_WORD( crc );
     fpgaWriteCmdBuffer[ FPGA_WRITE_CMD_HDR_LEN + sizeof( FPGA_ACTUATORS_T ) + 1 ] = GET_LSB_OF_WORD( crc );
     // construct bulk read command to read sensor data registers starting at address 8
     fpgaReadCmdBuffer[ 0 ] = FPGA_READ_CMD_CODE;
-    fpgaReadCmdBuffer[ 1 ] = 0x00;    // start at FPGA address 0x100 (256)
-    fpgaReadCmdBuffer[ 2 ] = 0x01;
+    fpgaReadCmdBuffer[ 1 ] = GET_LSB_OF_WORD( FPGA_BULK_READ_START_ADDR );
+    fpgaReadCmdBuffer[ 2 ] = GET_MSB_OF_WORD( FPGA_BULK_READ_START_ADDR );
     fpgaReadCmdBuffer[ 3 ] = sizeof(DG_FPGA_SENSORS_T);
     crc = crc16( fpgaReadCmdBuffer, FPGA_READ_CMD_HDR_LEN );
     fpgaReadCmdBuffer[ 4 ] = GET_MSB_OF_WORD( crc );
@@ -893,9 +893,9 @@
  *      7 - VDr.\n
  *      8 - VPi.\n
  *      9 - VSP.\n
- *      10- VR1.\n
- *      11- VR2.\n
- *      12..15 - reserved or unused.
+ *      10..11 - reserved (spare).\n
+ *      12- VPd.\n
+ *      13..15 - reserved or unused.
  * @details
  * Inputs : none
  * Outputs : fpgaActuatorSetPoints.fpgaValveStates