Index: firmware/App/Drivers/ConductivitySensors.h =================================================================== diff -u -ree9c8a27ccb6a9f1f5e18faf9f684935ccf118f4 -rd7abd9c0c214ec3b7704e7f89b6de83c341b9b0e --- firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision ee9c8a27ccb6a9f1f5e18faf9f684935ccf118f4) +++ firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision d7abd9c0c214ec3b7704e7f89b6de83c341b9b0e) @@ -55,7 +55,6 @@ 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 @@ -90,7 +89,6 @@ 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] @@ -119,8 +117,8 @@ void execConductivitySensors( void ); void readConductivitySensorData( void ); -F32 getConductivity( CONDUCTIVITY_SENSORS_T sensor ); -F32 getConductivityTemperature( CONDUCTIVITY_SENSORS_T sensor ); +F32 getConductivityValue( CONDUCTIVITY_SENSORS_T sensor ); +F32 getConductivityTemperatureValue( CONDUCTIVITY_SENSORS_T sensor ); BOOL testDDConductivitySensorReadingsOverride( MESSAGE_T *message ); BOOL testDDConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message );