Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r7965487decd9984a22f4d9ec56d1fb2590d1583b -r62236181e6a9693a619d01967b00496c1d36e146
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 7965487decd9984a22f4d9ec56d1fb2590d1583b)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 62236181e6a9693a619d01967b00496c1d36e146)
@@ -34,8 +34,8 @@
 #define COND_SENSOR_REFERENCE_TEMPERATURE           25                                      ///< Reference temperature for conductivity sensor
 #define COND_SENSOR_REPORT_PERIOD                   (1000 / TASK_PRIORITY_INTERVAL)         ///< Broadcast conductivity values message every 1000 ms.
 
-#define COND_SENSOR_CPi_CPo_MAX_VALUE               2000                                    ///< TBD
-#define COND_SENSOR_CPi_CPo_MIN_VALUE               100                                     ///< TBD
+#define COND_SENSOR_CPI_CPO_MAX_VALUE               2000                                    ///< TBD
+#define COND_SENSOR_CPI_CPO_MIN_VALUE               100                                     ///< TBD
 
 #define MAX_ALLOWED_UNCHANGED_CONDUCTIVITY_READS    100                                     ///< New reading every 640 ms, expect to get new reading in 1s
 
@@ -124,12 +124,12 @@
  *************************************************************************/
 void checkWaterConductivity( F32 conductivity, U32 state )
 {
-    if ( conductivity > COND_SENSOR_CPi_CPo_MAX_VALUE )
+    if ( conductivity > COND_SENSOR_CPI_CPO_MAX_VALUE )
     {
         SET_ALARM_WITH_2_F32_DATA( ALARM_ID_INLET_WATER_HIGH_CONDUCITIVY, conductivity, state );
     }
 
-    if ( conductivity < COND_SENSOR_CPi_CPo_MIN_VALUE )
+    if ( conductivity < COND_SENSOR_CPI_CPO_MIN_VALUE )
     {
         SET_ALARM_WITH_2_F32_DATA( ALARM_ID_INLET_WATER_LOW_CONDUCITIVY, conductivity, state );
     }
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -r05e516dc17597cee29c89e5eee25caed055f1151 -r62236181e6a9693a619d01967b00496c1d36e146
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 05e516dc17597cee29c89e5eee25caed055f1151)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 62236181e6a9693a619d01967b00496c1d36e146)
@@ -44,7 +44,7 @@
 #define FPGA_HEADER_START_ADDR          0x0000
 #define FPGA_BULK_READ_START_ADDR       0x0100
 
-#define FPGA_BULK_WRITE_START_ADDR      0x000C
+#define FPGA_BULK_WRITE_START_ADDR      0x000E
 
 #define FPGA_WRITE_CMD_BUFFER_LEN       (FPGA_PAGE_SIZE+8)
 #define FPGA_READ_CMD_BUFFER_LEN        8