Index: firmware/App/Drivers/ConductivityTeensy.h
===================================================================
diff -u -r9ccc651bf491c37bc202ad8d80f0e4063523320d -r7aafdc16c133bcd4cb0ce5fe08079c1969cc67d2
--- firmware/App/Drivers/ConductivityTeensy.h	(.../ConductivityTeensy.h)	(revision 9ccc651bf491c37bc202ad8d80f0e4063523320d)
+++ firmware/App/Drivers/ConductivityTeensy.h	(.../ConductivityTeensy.h)	(revision 7aafdc16c133bcd4cb0ce5fe08079c1969cc67d2)
@@ -22,16 +22,16 @@
 
 // ********** public definitions **********
 #define DOUBLE_COUNT                8                                    ///< Number of double values in Teensy EEPROM data
-#define FLOAT_COUNT                 ((128 - (DOUBLE_COUNT * 8)) / 4)     ///< Number of float values in Teensy EEPROM data
+#define FLOAT_COUNT                 16                                   ///< Number of float values in Teensy EEPROM data
 
 typedef enum TeensySensorIndex
 {
-    TEENSY_SENSOR_0 = 0,                            ///< Maps to D17_COND
-    TEENSY_SENSOR_1,                                ///< Maps to D27_COND
-    TEENSY_SENSOR_2,                                ///< Maps to D43_COND
-    TEENSY_SENSOR_3,                                ///< Maps to D74_COND
-    TEENSY_SENSOR_4,                                ///< Maps to P9_COND
-    TEENSY_SENSOR_5,                                ///< Maps to P18_COND
+    TEENSY_SENSOR_0 = 0,                            ///< Maps to P9_COND
+    TEENSY_SENSOR_1,                                ///< Maps to P18_COND
+    TEENSY_SENSOR_2,                                ///< Maps to D17_COND
+    TEENSY_SENSOR_3,                                ///< Maps to D27_COND
+    TEENSY_SENSOR_4,                                ///< Maps to D29_COND
+    TEENSY_SENSOR_5,                                ///< Maps to D43_COND
     MAX_TEENSY_SENSOR                               ///< Total number of mapped sensors
 } TEENSY_SENSOR_INDEX_T;
 
@@ -84,21 +84,34 @@
 {
     COND_UPDATE_EEPROM_STATUS_UNITIALIZED = 0,       ///< The initialization process has not started.
     COND_UPDATE_EEPROMSTATUS_IN_PROGRESS,           ///< The initialization process has started.
-    COND_UPDATE_EEPROM_STATUS_INITIALIZED,           ///< Initialization process completed and all the sensors were initialized successfully.
-    COND_UPDATE_EEPROM_STATUS_FAILED                 ///< Initialization process completed but one or more sensor was not initialized properly.
+    COND_UPDATE_EEPROM_STATUS_INITIALIZED,          ///< Initialization process completed and all the sensors were initialized successfully.
+    COND_UPDATE_EEPROM_STATUS_FAILED                ///< Initialization process completed but one or more sensor was not initialized properly.
 }CONDUCTIVITY_UPDATE_EEPROM_STATUS_T;
 
 // Update Measurement Settings Status
 typedef enum Update_mst_Status
 {
-    COND_MST_STATUS_ERR_UNRECOGNIZED_PARAM = 0,       //  Invalid parameter was passed with the command
-    COND_MST_STATUS_ERR_UPDATED_TO_DEFAULT_TIA,       //  Invalid value of "rtia" was passed with the command. So it was updated to its default value.
-    COND_MST_STATUS_ERR_UPDATED_TO_DEFAULT_PGA,       //  Invalid value of "pga" was passed with the command. So it was updated to its default value.
-    COND_MST_STATUS_ERR_UPDATED_TO_DEFAULT_DFT_NUM,   //  Invalid value of "dftnum" was passed with the command. So it was updated to its default value.
-    COND_MST_STATUS_ERR_UPDATED_TO_DEFAULT_AVG_NUM,   //  Invalid value of "avgnum" was passed with the command. So it was updated to its default value.
+    COND_MST_STATUS_ERR_UNRECOGNIZED_PARAM = 0,       ///<  Invalid parameter was passed with the command
+    COND_MST_STATUS_ERR_UPDATED_TO_DEFAULT_TIA,       ///<  Invalid value of "rtia" was passed with the command. So it was updated to its default value.
+    COND_MST_STATUS_ERR_UPDATED_TO_DEFAULT_PGA,       ///<  Invalid value of "pga" was passed with the command. So it was updated to its default value.
+    COND_MST_STATUS_ERR_UPDATED_TO_DEFAULT_DFT_NUM,   ///<  Invalid value of "dftnum" was passed with the command. So it was updated to its default value.
+    COND_MST_STATUS_ERR_UPDATED_TO_DEFAULT_AVG_NUM,   ///<  Invalid value of "avgnum" was passed with the command. So it was updated to its default value.
     COND_MST_STATUS_SUCCESS
-}CONDUCTIVITY_UPDATE_MST_STATUS_T;;
+}CONDUCTIVITY_UPDATE_MST_STATUS_T;
 
+// Update Measurement Settings Status
+typedef enum mst_param_idx
+{
+    CONDUCTIVITY_MST_PARAM_IDX_SINFREQ = 0,       ///< SinFreq : Frequency of excitation signal
+    CONDUCTIVITY_MST_PARAM_IDX_DACPP,             ///< DacVoltPP : DAC output voltage in mV peak to peak. Maximum value is 800mVpp. Peak to peak voltage
+    CONDUCTIVITY_MST_PARAM_IDX_BIAS,              ///< BiasVolt : The excitation signal is DC+AC. This parameter decides the DC value in mV unit. 0.0mV means no DC bias.
+    CONDUCTIVITY_MST_PARAM_IDX_RTIA,              ///< HstiaRtiaSel : Valid param values ( 0, 1, 2, 3, 4, 5, 6, 7 )
+    CONDUCTIVITY_MST_PARAM_IDX_PGA,               ///< AdcPgaGain : Valid param values ( 1, 1.5, 2, 4, 9 ) i.e interpreted as ( 0, 1, 2, 3, 4 ) respectively in Teensy.
+    CONDUCTIVITY_MST_PARAM_IDX_DFTNUM,            ///< DftNum : DFT number  Valid param values ( 4096, 2048, 1024, 512, 256 ) i.e interpreted as ( 10, 9, 8, 7, 6 ) respectively in Teensy.
+    CONDUCTIVITY_MST_PARAM_IDX_AVGNUM,            ///< ADCAvgNum : Valid param values ( 2, 4, 8, 16 )i.e interpreted as ( 0, 1, 2, 3 ) respectively in Teensy.
+    MAX_CONDUCTIVITY_MST_PARAM_IDX                ///< Total number of Measurement settings parameters
+}CONDUCTIVITY_MST_PARAM_IDX_T;
+
 typedef struct
 {
     F64 A0;