Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rad6b3443575d3f6bbac52237866e19a212d36bc1 -rf192234d80556802fa42e62f8c1b20d1474f82f1
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision ad6b3443575d3f6bbac52237866e19a212d36bc1)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision f192234d80556802fa42e62f8c1b20d1474f82f1)
@@ -84,19 +84,20 @@
 /// Emstat pico measurement data package structure
 typedef struct
 {
-    U16 type;                                                                                       ///< Measurement variable type
-    U08 value[7];                                                                                   ///< Measurement value
-    U08 prefix;                                                                                     ///< Prefix character for SI prefixes
-    U08 reserved1;                                                                                  ///< Comma separator
-    U16 status;                                                                                     ///< Status for measurement data package
-    U08 reserved2[4];                                                                               ///< Comma separator and index of current range
+    U16 type;                                                                                       ///< Measurement variable type.
+    U08 value[7];                                                                                   ///< Measurement value.
+    U08 prefix;                                                                                     ///< Prefix character for SI prefixes.
+    U08 reserved1;                                                                                  ///< Comma separator.
+    U16 status;                                                                                     ///< Status for measurement data package.
+    U08 reserved2[4];                                                                               ///< Comma separator and index of current range.
 } EMSTAT_VARIABLE_T;
 
 /// Emstat conductivity sensor and its corresponding temperature sensor
 typedef struct
 {
     CONDUCTIVITY_SENSORS_T condSnsr;                                                                ///< Emstat conductivity sensor 1 on the board.
     TEMPERATURE_SENSORS_T  condSnsrTempSnsr;                                                        ///< Emstat conductivity sensor 1 temperature sensor.
+    ALARM_ID_T condSnsrHex2StrAlarm;                                                                ///< Emstat conductivity sensor 1 hex to string alarm.
 } EMSTAT_COND_AND_TEMP_T;
 
 /// Emstat board structure
@@ -105,15 +106,13 @@
     BOOL packageStarted;                                                                            ///< Emstat package started flag.
     U08 packageIndex;                                                                               ///< Emstat package index number.
     U08 package[ 50 ];                                                                              ///< Emstat read buffer package.
-    EMSTAT_COND_AND_TEMP_T sensors[ EMSTAT_NUM_OF_SENSORS_PER_BOARD ];                              ///< Emstat conductivity and corresponding temperature sensors
-    U16 fpgaPreviousCount;                                                                          ///< Emstat FPGA previous count.
-    U08 fpgaPreviousErrorCount;                                                                     ///< Emstat FPGA previous error count.
+    EMSTAT_COND_AND_TEMP_T sensors[ EMSTAT_NUM_OF_SENSORS_PER_BOARD ];                              ///< Emstat conductivity and corresponding temperature sensors.
 } EMSTAT_READ_T;
 
 /// Conductivity sensors structure
 typedef struct
 {
-    U08 readCount;                                                                                  ///< Conductivity sensor FPGA read count.
+    U08 readCount;                                                                                  ///< Conductivity sensor FPGA read count (For V3).
     U32 internalErrorCount;                                                                         ///< Conductivity sensor internal error count.
     OVERRIDE_F32_T compensatedCondValue;                                                            ///< Conductivity sensor compensated value
     F32 rawCondValue;                                                                               ///< Conductivity sensor raw value.
@@ -161,7 +160,7 @@
 void initConductivitySensors( void )
 {
     U08 i;
-    roRejectionRatio       = 0.0;
+    roRejectionRatio       = 0.0F;
     condDataPublishCounter = DATA_PUBLISH_COUNTER_START_COUNT;
 
     for ( i = 0; i < NUM_OF_CONDUCTIVITY_SENSORS; i++ )
@@ -355,7 +354,7 @@
  *************************************************************************/
 F32 getConductivityValue( U32 sensorId )
 {
-    F32 result = 0.0;
+    F32 result = 0.0F;
 
     if ( sensorId < NUM_OF_CONDUCTIVITY_SENSORS )
     {
@@ -386,7 +385,7 @@
 static F32 calcCompensatedConductivity( F32 conductivity, F32 temperature )
 {
     // EC = EC_25 * (1 + temp_coef * ( temperature - 25 ))
-    F32 compensatedCoef  = ( 1.0 + ( COND_SENSOR_TEMPERATURE_COEF * ( temperature - COND_SENSOR_REFERENCE_TEMPERATURE ) ) );
+    F32 compensatedCoef  = ( 1.0F + ( COND_SENSOR_TEMPERATURE_COEF * ( temperature - COND_SENSOR_REFERENCE_TEMPERATURE ) ) );
 
     return conductivity / compensatedCoef;
 }
@@ -595,16 +594,17 @@
  *************************************************************************/
 static void processEmstatMeasurementDataPackets( U08 boardSensorIndex, EMSTAT_READ_T* readPackage, EMSTAT_VARIABLE_T* receivedPackets )
 {
-    CONDUCTIVITY_SENSORS_T sensorId           = readPackage->sensors[ boardSensorIndex ].condSnsr;
-    condSensorStatus[ sensorId ].sensorStatus = hexStrToDec( (U08*)&receivedPackets->status, sizeof( receivedPackets->status ) );
-    BOOL isSensorStatusBad                    = ( EMSTAT_PICO_STATUS_TIMING_NOT_MET == condSensorStatus[ sensorId ].sensorStatus ? TRUE : FALSE );
+    CONDUCTIVITY_SENSORS_T sensorId = readPackage->sensors[ boardSensorIndex ].condSnsr;
+    BOOL isConvValid                = hexStrToDec( (U08*)&receivedPackets->status, &condSensorStatus[ sensorId ].sensorStatus, sizeof( receivedPackets->status ) );
+    BOOL isSensorStatusBad          = ( EMSTAT_PICO_STATUS_TIMING_NOT_MET == condSensorStatus[ sensorId ].sensorStatus ? TRUE : FALSE );
 
     if ( FALSE == isSensorStatusBad )
     {
         U32 prefix          = prefixStrToSIFactor( receivedPackets->prefix );
-        F32 resistance      = ( ( F32 )( hexStrToDec( receivedPackets->value, sizeof( receivedPackets->value ) ) - EMSTAT_PICO_MEASUREMENT_OFFSET ) / prefix );
+        isConvValid         = hexStrToDec( receivedPackets->value, &condSensorStatus[ sensorId ].sensorStatus, sizeof( receivedPackets->value ) );
+        F32 resistance      = ( ( F32 )( condSensorStatus[ sensorId ].sensorStatus - EMSTAT_PICO_MEASUREMENT_OFFSET ) / prefix );
         F32 temperature     = getTemperatureValue( readPackage->sensors[ boardSensorIndex ].condSnsrTempSnsr );
-        F32 conductivity    = ( 1.0 / resistance ) * SIEMENS_TO_MICROSIEMENS_CONVERSION;
+        F32 conductivity    = ( 1.0F / resistance ) * SIEMENS_TO_MICROSIEMENS_CONVERSION;
         F32 compensatedCond = calcCompensatedConductivity( conductivity, temperature );
 
         condSensorStatus[ sensorId ].internalErrorCount        = 0;
@@ -642,11 +642,11 @@
  *************************************************************************/
 static F32 getCalibrationAppliedConductivityValue( U32 sensorId, F32 compensatedValue )
 {
-    F32 conductivity = pow(compensatedValue, 4) * condSensorsCalRecord.condSensors[ (CAL_DATA_DG_COND_SENSORS_T)sensorId ].fourthOrderCoeff +
-                       pow(compensatedValue, 3) * condSensorsCalRecord.condSensors[ (CAL_DATA_DG_COND_SENSORS_T)sensorId ].thirdOrderCoeff  +
-                       pow(compensatedValue, 2) * condSensorsCalRecord.condSensors[ (CAL_DATA_DG_COND_SENSORS_T)sensorId ].secondOrderCoeff +
-                           compensatedValue     * condSensorsCalRecord.condSensors[ (CAL_DATA_DG_COND_SENSORS_T)sensorId ].gain             +
-                                                  condSensorsCalRecord.condSensors[ (CAL_DATA_DG_COND_SENSORS_T)sensorId ].offset;
+    F32 conductivity = pow( compensatedValue, 4 ) * condSensorsCalRecord.condSensors[ (CAL_DATA_DG_COND_SENSORS_T)sensorId ].fourthOrderCoeff +
+                       pow( compensatedValue, 3 ) * condSensorsCalRecord.condSensors[ (CAL_DATA_DG_COND_SENSORS_T)sensorId ].thirdOrderCoeff  +
+                       pow( compensatedValue, 2 ) * condSensorsCalRecord.condSensors[ (CAL_DATA_DG_COND_SENSORS_T)sensorId ].secondOrderCoeff +
+                            compensatedValue      * condSensorsCalRecord.condSensors[ (CAL_DATA_DG_COND_SENSORS_T)sensorId ].gain             +
+                                                    condSensorsCalRecord.condSensors[ (CAL_DATA_DG_COND_SENSORS_T)sensorId ].offset;
     return conductivity;
 }