Index: firmware/App/Drivers/ConductivityTeensy.c
===================================================================
diff -u -rd9c77cf6cde58aba425b8df3de610eb0c533b70e -r3fa7efb8799333684f48d5a894a703db2e3aa945
--- firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision d9c77cf6cde58aba425b8df3de610eb0c533b70e)
+++ firmware/App/Drivers/ConductivityTeensy.c	(.../ConductivityTeensy.c)	(revision 3fa7efb8799333684f48d5a894a703db2e3aa945)
@@ -2283,12 +2283,12 @@
     {
         if ( sizeof( U32 ) == message->hdr.payloadLen )
         {
-            COND_MODELS_T newCondModel;
+            U32 newCondModel;
 
             memcpy( &newCondModel, &message->payload[0], sizeof( U32 ) );
             if ( newCondModel < NUM_OF_MODELS )
             {
-                currentConductivityModel = newCondModel;
+                currentConductivityModel = (COND_MODELS_T)newCondModel;
                 result = TRUE;
             }
         }