Index: firmware/App/Drivers/ConductivityTeensy.c
===================================================================
diff -u -r0bb2512f5a49b16b8c19e07e3dd34610129a07e3 -reff029546b54e512bd6bdb8f24aea58b04ed1e7f
--- firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision 0bb2512f5a49b16b8c19e07e3dd34610129a07e3)
+++ firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision eff029546b54e512bd6bdb8f24aea58b04ed1e7f)
@@ -52,7 +52,7 @@
 #define RX_SIZE_SELECT_SENSOR               1                                          ///< Expected response bytes length of select sensor cmd.
 #define RX_SIZE_GET_SINGLE_MEASUREMENT      ( sizeof( COND_SENSOR_DATA_T ) )           ///< Expected response bytes length of get single sensor measurement cmd.
 
-#define COND_INIT_TIMEOUT_MS                ( 1 * MS_PER_SECOND )                      ///< Timeout before which we should transition to idle state.
+#define COND_INIT_TIMEOUT_MS                ( 3 * MS_PER_SECOND )                      ///< Timeout before which we should transition to idle state.
 #define COND_STATUS_TIMEOUT_MS              ( 10 * MS_PER_SECOND )                     ///< Timeout before which we should receive acknowledgment from teensy
 #define COND_DATA_TIMEOUT_MS                ( 10 * MS_PER_SECOND )                     ///< Timeout before which we should receive data from teensy
 #define COND_TEMP_OFFSET                    25                                         ///< Temperature offset constant used in RTD calculations.