Index: firmware/App/Drivers/ConductivitySensors.c =================================================================== diff -u -r44d7a987b5c6b91396ddb2cc8163b36c21f59bde -r14277e7c55fbb8407612572aca191ffae0835796 --- firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 44d7a987b5c6b91396ddb2cc8163b36c21f59bde) +++ firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 14277e7c55fbb8407612572aca191ffae0835796) @@ -126,7 +126,6 @@ static U32 getTemperatureSensorErrorCount( CONDUCTIVITY_SENSORS_T sensor ); static BOOL monitorCalDataReads( CONDUCTIVITY_SENSORS_T sensorId ); static BOOL checkConductivityCoefficientRanges( CONDUCTIVITY_SENSORS_T sensorId ); -static void calculateConductivityUpdatedStandard( CONDUCTIVITY_SENSORS_T sensorNum, BOOL isFPSensor ); static void calculateConductivityUpdatedStandardTempCompensated( CONDUCTIVITY_SENSORS_T sensorNum, BOOL isFPSensor ); static void calculateTemperature( CONDUCTIVITY_SENSORS_T sensorNum ); static void calculateResistance( CONDUCTIVITY_SENSORS_T sensorNum, BOOL isFPSensor ); @@ -558,7 +557,6 @@ { isFPSensor = TRUE; } - calculateConductivityUpdatedStandard( sensor, isFPSensor ); calculateConductivityUpdatedStandardTempCompensated( sensor, isFPSensor ); } @@ -1004,40 +1002,6 @@ /*********************************************************************//** * @brief - * The calculateConductivityUpdatedStandard function calculates the conductivity value. - * @details \b Inputs: conductivitySensorCoefficients - Conductivity Coefficients - * @details \b Inputs: conductivitySensorStatus - Raw measurement values - * @details \b Outputs: conductivitySensorStatus - calculated conductivity value - * @param sensorNum - Conductivity sensor index value. - * @param isFPSensor - T/F if sensor is on FP hardware. - * @return - *************************************************************************/ -static void calculateConductivityUpdatedStandard( CONDUCTIVITY_SENSORS_T sensorNum, BOOL isFPSensor ) -{ - F64 calculatedConductivity = 0.0; - F64 alpha = 0.0; - F64 k = 0.0; - - if ( TRUE == isFPSensor ) - { - alpha = conductivitySensorCoefficients[ sensorNum ].alpha_low; - k = conductivitySensorCoefficients[ sensorNum ].K_low; - } - else - { - alpha = conductivitySensorCoefficients[ sensorNum ].alpha_high; - k = conductivitySensorCoefficients[ sensorNum ].K_high; - } - calculateResistance( sensorNum, isFPSensor ); - calculateTemperature( sensorNum ); - - calculatedConductivity = ( ( k / conductivitySensorStatus[ sensorNum ].calculatedResistance ) * - ( 1 + ( alpha * ( COND_TEMP_OFFSET - conductivitySensorStatus[ sensorNum ].calculatedTemperature ) ) ) ); - currentConductivityReadings[ sensorNum ].data = calculatedConductivity * SIEMENS_TO_MICROSIEMENS_CONVERSION; -} - -/*********************************************************************//** - * @brief * The calculateConductivityUpdatedStandardTempCompensated function calculates the conductivity value with temperature compensation. * @details \b Inputs: conductivitySensorCoefficients - Conductivity Coefficients * @details \b Inputs: conductivitySensorStatus - Raw measurement values