Index: firmware/App/Drivers/ConductivitySensors.c =================================================================== diff -u -rbc7dad193df69c64cf213db463e5115b1ba8a5f0 -r06ac22ce57b9e06588efc5e19f23ff33ddfe3b75 --- firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision bc7dad193df69c64cf213db463e5115b1ba8a5f0) +++ firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 06ac22ce57b9e06588efc5e19f23ff33ddfe3b75) @@ -172,16 +172,44 @@ 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 ].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 ].zeta_low = -76.4F; conductivitySensorCoefficients[ sensor ].beta = 0.25F; conductivitySensorCoefficients[ sensor ].delta = -250.0F; conductivitySensorCoefficients[ sensor ].reserved1 = 0.0F; conductivitySensorCoefficients[ sensor ].reserved2 = 0.0F; + // Beta 2 - Unit 04 + if ( ( P9_COND == sensor ) || ( P18_COND == sensor ) || ( D74_COND == sensor ) ) + { + conductivitySensorCoefficients[ sensor ].zeta_high = -6.42F; + } + else if ( ( D17_COND == sensor ) || ( D27_COND == sensor ) || ( D29_COND == sensor ) ) + { + conductivitySensorCoefficients[ sensor ].zeta_high = -14.4F; + } + else + { + conductivitySensorCoefficients[ sensor ].zeta_high = -6.65F; + } + + // Beta 2 - Unit 05 + if ( ( P9_COND == sensor ) || ( P18_COND == sensor ) || ( D74_COND == sensor ) ) + { + conductivitySensorCoefficients[ sensor ].zeta_high = -28.6F; + } + else if ( ( D17_COND == sensor ) || ( D27_COND == sensor ) || ( D29_COND == sensor ) ) + { + conductivitySensorCoefficients[ sensor ].zeta_high = -38.35F; + } + else + { + conductivitySensorCoefficients[ sensor ].zeta_high = -6.65F; + } + memset( conductivitySensorRevisions[ sensor ].swRev, 0, sizeof( U08 ) * CONDUCTIVITY_CAL_CHAR_LENGTH ); memset( conductivitySensorRevisions[ sensor ].hwRev, 0, sizeof( U08 ) * CONDUCTIVITY_CAL_CHAR_LENGTH ); memset( conductivitySensorRevisions[ sensor ].hwSerial, 0, sizeof( U08 ) * CONDUCTIVITY_CAL_CHAR_LENGTH );