Index: firmware/App/Drivers/ConductivitySensors.c =================================================================== diff -u -r4643a4b7f7ecaca8e07a809af6b218fac1c74799 -r91692efede9091e29a112cc663ae668d0d4034b1 --- firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 4643a4b7f7ecaca8e07a809af6b218fac1c74799) +++ firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 91692efede9091e29a112cc663ae668d0d4034b1) @@ -123,7 +123,8 @@ *************************************************************************/ void initConductivitySensors( void ) { - currentConductivityState = CONDUCTIVITY_INIT_STATE; + /// TODO: Revert back to init state. + currentConductivityState = CONDUCTIVITY_READ_DATA_STATE; CONDUCTIVITY_SENSORS_T sensor; // Initialize override structures for each conductivity sensor @@ -166,18 +167,19 @@ conductivitySensorStatus[ sensor ].haveAllCalSlotsBeenRead = FALSE; memset( conductivitySensorStatus[ sensor ].hasCalSlotBeenRead, 0 ,sizeof( conductivitySensorStatus[ sensor ].hasCalSlotBeenRead ) ); - conductivitySensorCoefficients[ sensor ].K_high = 0; - conductivitySensorCoefficients[ sensor ].alpha_high = 0.0F; - conductivitySensorCoefficients[ sensor ].eta_high = 0.0F; - conductivitySensorCoefficients[ sensor ].zeta_high = 0; - conductivitySensorCoefficients[ sensor ].K_low = 0; - conductivitySensorCoefficients[ sensor ].alpha_low = 0.0F; - conductivitySensorCoefficients[ sensor ].eta_low = 0.0F; - conductivitySensorCoefficients[ sensor ].zeta_low = 0; - conductivitySensorCoefficients[ sensor ].beta = 0.0F; - conductivitySensorCoefficients[ sensor ].delta = 0; - conductivitySensorCoefficients[ sensor ].reserved1 = 0; - conductivitySensorCoefficients[ sensor ].reserved2 = 0; + // TODO: Remove temp values. Sensors do not have calibrated values. + conductivitySensorCoefficients[ sensor ].K_high = 4.1F; + conductivitySensorCoefficients[ sensor ].alpha_high = 0.02F; + conductivitySensorCoefficients[ sensor ].eta_high = 1.0F; + conductivitySensorCoefficients[ sensor ].zeta_high = 0.0F; + conductivitySensorCoefficients[ sensor ].K_low = 4.1F; + conductivitySensorCoefficients[ sensor ].alpha_low = 0.02F; + conductivitySensorCoefficients[ sensor ].eta_low = 1.0F; + conductivitySensorCoefficients[ sensor ].zeta_low = 0.0F; + conductivitySensorCoefficients[ sensor ].beta = 0.25F; + conductivitySensorCoefficients[ sensor ].delta = -250.0F; + conductivitySensorCoefficients[ sensor ].reserved1 = 0.0F; + conductivitySensorCoefficients[ sensor ].reserved2 = 0.0F; memset( conductivitySensorRevisions[ sensor ].swRev, 0, sizeof( U08 ) * CONDUCTIVITY_CAL_CHAR_LENGTH ); memset( conductivitySensorRevisions[ sensor ].hwRev, 0, sizeof( U08 ) * CONDUCTIVITY_CAL_CHAR_LENGTH );