Index: firmware/App/Drivers/ConductivityTeensy.h
===================================================================
diff -u -rf6c8ce1cc681f87467cdb4dc1685df74f39e2740 -r4dd3ecab3dfd82b339e4e8575e672b6dd88554e7
--- firmware/App/Drivers/ConductivityTeensy.h	(.../ConductivityTeensy.h)	(revision f6c8ce1cc681f87467cdb4dc1685df74f39e2740)
+++ firmware/App/Drivers/ConductivityTeensy.h	(.../ConductivityTeensy.h)	(revision 4dd3ecab3dfd82b339e4e8575e672b6dd88554e7)
@@ -75,7 +75,7 @@
 /// Enumeration of Initialization status of all the sensors connected to Teensy
 typedef enum Conductivity_Init_Status
 {
-    COND_INIT_STATUS_UNITIALIZED = 0,               ///< The initialization process has not started.
+    COND_INIT_STATUS_UNINITIALIZED = 0,               ///< The initialization process has not started.
     COND_INIT_STATUS_IN_PROGRESS,                   ///< The initialization process has started.
     COND_INIT_STATUS_INITIALIZED,                   ///< Initialization process completed and all the sensors were initialized successfully.
     COND_INIT_STATUS_FAILED                         ///< Initialization process completed but one or more sensor was not initialized properly.
@@ -104,7 +104,7 @@
 /// Enumeration of update EEPROM status
 typedef enum Conductivity_Update_Eeprom_Status
 {
-    COND_UPDATE_EEPROM_STATUS_UNITIALIZED = 0,      ///< The initialization process has not started.
+    COND_UPDATE_EEPROM_STATUS_UNINITIALIZED = 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.
@@ -171,19 +171,15 @@
     F32 rtdRzMag;                                     ///< Value of rtd_resistance
     F32 rtdRzPhase;                                   ///< RTD Rz Phase. Hard coded to 0.0
 } COND_SENSOR_DATA_T;
-#pragma pack(pop)
 
-/// Structure to receive EEPROM data from Teensy. These are coefficient values to calculate conductivity and temperature.
-#pragma pack(push, 1)
+/// Structure to receive EEPROM data from Teensy. These are coefficient values to calculate conductivity and temperature.)
 typedef struct
 {
     F64 doubleValue[DOUBLE_COUNT];                    ///< Double Values stored in the EEPROM
     F32 floatValue[FLOAT_COUNT];                      ///< Float Values stored in the EEPROM
 } COND_EEPROM_DATA_T;
-#pragma pack(pop)
 
 ///  Structure to receive conductivity measurement settings from Teensy
-#pragma pack(push, 1)
 typedef struct
 {
     F32 SinFreq;                                      ///< SinFreq : Frequency of excitation signal