Index: firmware/App/Drivers/ConductivityTeensy.c
===================================================================
diff -u -rf6c8ce1cc681f87467cdb4dc1685df74f39e2740 -r4dd3ecab3dfd82b339e4e8575e672b6dd88554e7
--- firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision f6c8ce1cc681f87467cdb4dc1685df74f39e2740)
+++ firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision 4dd3ecab3dfd82b339e4e8575e672b6dd88554e7)
@@ -103,7 +103,7 @@
 static COND_EEPROM_DATA_T eePromDataTX;                                                ///< Transmitted EEPROM data to Teensy for update EEPROM cmd.
 static COND_MEASUREMENT_SETTINGS_T measurementSettingsTX;                              ///< Transmitted measurement settings to Teensy for update measurement settings cmd.
 static COND_MEASUREMENT_SETTINGS_T measurementSettingsRX;                              ///< Received measurement settings by get measurement settings cmd.
-static COND_MODELS_T currentConductivityModel = STANDARD;
+static COND_MODELS_T currentConductivityModel;
 static BOOL eepromInit;
 
 // Command Map
@@ -227,11 +227,12 @@
     queueFrontIndex = 0;
     currentCmd = TEENSY_CMD_INIT_SENSOR;
     eepromInit = TRUE;
-    condInitStatus = COND_INIT_STATUS_UNITIALIZED;
-    condUpdateEEPROMstatus = COND_UPDATE_EEPROM_STATUS_UNITIALIZED;
+    condInitStatus = COND_INIT_STATUS_UNINITIALIZED;
+    condUpdateEEPROMstatus = COND_UPDATE_EEPROM_STATUS_UNINITIALIZED;
     condStopMeasurementSatus = 0;
     condSelectSensorStatus = 0;
     currentSelectedSensor = TEENSY_SENSOR_0;
+    currentConductivityModel = STANDARD;
 
     initCondDMAchannels();
 
@@ -496,7 +497,7 @@
             state = txSelectSensor();
             break;
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTED, currentCmd )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_TEENSY_CONDUCTIVITY_SENOR_INVALID_STATE, currentCmd )
             break;
     }
 
@@ -552,7 +553,7 @@
             state = rxSelectSensor();
             break;
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTED, currentCmd )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_TEENSY_CONDUCTIVITY_SENOR_INVALID_STATE, currentCmd )
             break;
 
     }
@@ -597,7 +598,7 @@
         case TEENSY_CMD_SELECT_SENSOR:
             break;
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, FP_FAULT_ID_FP_INVALID_PUMP_DUTY_CYCLE_SELECTED, currentCmd )
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_TEENSY_CONDUCTIVITY_SENOR_INVALID_STATE, currentCmd )
             break;
     }
 
@@ -947,7 +948,7 @@
 
         switch ( condInitStatus )
         {
-            case COND_INIT_STATUS_UNITIALIZED:
+            case COND_INIT_STATUS_UNINITIALIZED:
                 break;
 
             case COND_INIT_STATUS_IN_PROGRESS:
@@ -1034,7 +1035,7 @@
 
         switch ( condInitStatus )
         {
-            case COND_INIT_STATUS_UNITIALIZED:
+            case COND_INIT_STATUS_UNINITIALIZED:
                 break;
 
             case COND_INIT_STATUS_IN_PROGRESS:
@@ -1918,10 +1919,10 @@
             condRawMeasurement[ tempSensor.sensorNum - 1 ] = tempSensor;
 
             // Calculate and store Conductivity from raw values
-            calculateConductivity( (TEENSY_SENSOR_INDEX_T)tempSensor.sensorNum - 1 );
+            calculateConductivity( tempSensor.sensorNum - 1 );
 
             // Calculate and store Temperature from raw values.
-            calculateTemperature( (TEENSY_SENSOR_INDEX_T)tempSensor.sensorNum - 1 );
+            calculateTemperature( tempSensor.sensorNum - 1 );
 
             parseStatus = COND_PARSE_SUCCESS;
         }