Index: firmware/App/Drivers/ConductivitySensors.h =================================================================== diff -u -rb91d956a773bcf1319f816f36b270b31c68948de -r333baf32e2751b7cf0a7f0584a8a98051e766653 --- firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision b91d956a773bcf1319f816f36b270b31c68948de) +++ firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision 333baf32e2751b7cf0a7f0584a8a98051e766653) @@ -55,6 +55,7 @@ NUM_OF_CONDUCTIVITY_SENSORS ///< Number of conductivity sensors } CONDUCTIVITY_SENSORS_T; +/// Enumeration of calibration data typedef enum ConductivityCalDataIdx { CAL_DATA_1, ///< Cal Data 1. cell coefficient, high range @@ -89,6 +90,7 @@ NUM_OF_CONDUCTIVTY_CAL_IDXS, ///< Number of conductivity cal indexes. } CONDUCTIVITY_CAL_IDX_T; +/// Conductivity sensor calibration struct typedef struct { F32 K_high; ///< (cell coefficient, high range), default = 4, range = [3, 6] F32 alpha_high; ///< (temperature correction, high range), default = 0.02, range = [0.005, 0.04] @@ -117,8 +119,8 @@ void execConductivitySensors( void ); void readConductivitySensorData( void ); -F32 getConductivityValue( CONDUCTIVITY_SENSORS_T sensor ); -F32 getConductivityTemperatureValue( CONDUCTIVITY_SENSORS_T sensor ); +F32 getConductivity( CONDUCTIVITY_SENSORS_T sensor ); +F32 getConductivityTemperature( CONDUCTIVITY_SENSORS_T sensor ); BOOL testDDConductivitySensorReadingsOverride( MESSAGE_T *message ); BOOL testDDConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message );