Index: firmware/App/Drivers/ConductivitySensors.h =================================================================== diff -u -rd47b9bcbd4796a8c51d9e87436422c5868292ac6 -r1158d9e342ab00e93e264b8f161696c012302751 --- firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision d47b9bcbd4796a8c51d9e87436422c5868292ac6) +++ firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision 1158d9e342ab00e93e264b8f161696c012302751) @@ -55,7 +55,9 @@ CAL_DATA_10, ///< Cal Data 10. Temperature scale factor CAL_DATA_11, ///< Cal Data 11. Reserved. CAL_DATA_12, ///< Cal Data 12. Reserved - LAST_CAL_DATA = CAL_DATA_12, ///< Last index of calibration data + CAL_DATA_13, ///< Cal Data 13. Calibration time + CAL_DATA_14, ///< Cal Data 14. CRC + LAST_CAL_DATA = CAL_DATA_14, ///< Last index of calibration data SW_REV_LOWER_WORD, ///< SW Revision. 3 - 0 bytes FIRST_SW_REV = SW_REV_LOWER_WORD, ///< First index of SW revision SW_REV_MID_WORD, ///< SW Revision. 7 - 4 bytes @@ -88,6 +90,8 @@ F32 delta; ///< Temperature offset, default = 0, range = [-300, 300] F32 reserved1; ///< Reserved cal slot. F32 reserved2; ///< Reserved cal slot. + U32 calibrationTime; ///< Calibration time. + U16 crc; ///< CRC } CONDUCTIVITY_COEFFICIENTS_T; typedef struct @@ -112,7 +116,7 @@ void initConductivitySensors( void ); void execConductivitySensors( void ); -void readConductivitySensorData( void ); +void readConductivitySensorData( CONDUCTIVITY_SENSORS_T sensor ); F32 getConductivity( CONDUCTIVITY_SENSORS_T sensor ); F32 getConductivityTemperature( CONDUCTIVITY_SENSORS_T sensor ); @@ -122,6 +126,10 @@ F32 getConductivityRawRTD( CONDUCTIVITY_SENSORS_T sensor ); F32 getUncompensatedConductivity( CONDUCTIVITY_SENSORS_T sensor ); +CONDUCTIVITY_COEFFICIENTS_T getConductivityCalibrationData( CONDUCTIVITY_SENSORS_T sensorIdx ); +BOOL setConductivityCalibrationData( CONDUCTIVITY_SENSORS_T sensorIdx, + CONDUCTIVITY_COEFFICIENTS_T record); + BOOL testConductivitySensorConductivityReadingsOverride( MESSAGE_T *message ); BOOL testConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message ); BOOL testConductivitySensorConductivityReadCounterOverride( MESSAGE_T *message );