Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -rf639bbc47806ddcefdbdce78a377cd87050872e5 -rf1cb4be5fb8201cec188589e683c8bf20d895ec0
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision f639bbc47806ddcefdbdce78a377cd87050872e5)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision f1cb4be5fb8201cec188589e683c8bf20d895ec0)
@@ -233,6 +233,7 @@
     if ( ++condDataPublishCounter >= getU32OverrideValue( &conductivityDataPublishInterval ) )
     {
         CONDUCTIVITY_DATA_T data;
+
         calcRORejectionRatio();
         data.roRejectionRatio  = roRejectionRatio;
         data.cpi               = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
@@ -262,10 +263,9 @@
  *************************************************************************/
 SELF_TEST_STATUS_T execConductivitySensorsSelfTest( void )
 {
-    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
     BOOL calStatus            = getNVRecord2Driver( GET_CAL_CONDUCTIVITY_SENSORS, (U08*)&condSensorsCalRecord, sizeof( condSensorsCalRecord ),
                                          NUM_OF_CAL_DATA_COND_SENSORS, ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD );
-    result                    = ( TRUE == calStatus ? SELF_TEST_STATUS_PASSED : SELF_TEST_STATUS_FAILED );
+    SELF_TEST_STATUS_T result = ( TRUE == calStatus ? SELF_TEST_STATUS_PASSED : SELF_TEST_STATUS_FAILED );
 
     return result;
 }
@@ -398,6 +398,7 @@
 {
     F32 cpi          = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR );
     F32 cpo          = getConductivityValue( CONDUCTIVITYSENSORS_CPO_SENSOR );
+
     roRejectionRatio = RO_REJECTION_RATIO_OUT_OF_RANGE_VALUE;
 
     if ( fabs(cpi) >= NEARLY_ZERO )
@@ -526,8 +527,7 @@
             break;
 
         default:
-            // Do nothing
-            // Software fault?
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_EMSTAT_CONDUCTIVITY_BOARD_SELECTED, board );
             break;
     }
 }