Index: firmware/App/Drivers/ConductivitySensors.h =================================================================== diff -u -rb04db69f541f245e543df343257bcbdb73fbbc3d -r3b64586791accd0b9e8d8978b40e2509bb86dfbe --- firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision b04db69f541f245e543df343257bcbdb73fbbc3d) +++ firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision 3b64586791accd0b9e8d8978b40e2509bb86dfbe) @@ -8,7 +8,7 @@ * @file ConductivitySensors.h * * @author (last) Michael Garthwaite -* @date (last) 14-Apr-2026 +* @date (last) 15-Jun-2026 * * @author (original) Vinayakam Mani * @date (original) 13-Sep-2024 @@ -84,8 +84,8 @@ F32 alpha_low; ///< Temperature correction, low range, default = 0.02, range = [0.005, 0.04] F32 eta_low; ///< Resistance scale factor, low range, default = 1, range = [0.5, 3] F32 zeta_low; ///< Resistance offset, low range, default = 0, range = [-1000, 1000] - F32 beta; ///< Temperature scale factor, default = 1, range = [0.5, 2] - F32 delta; ///< Temperature offset, default = 0, range = [-10, 10] + F32 beta; ///< Temperature scale factor, default = 1, range = [0.2, 1.0] + F32 delta; ///< Temperature offset, default = 0, range = [-300, 300] F32 reserved1; ///< Reserved cal slot. F32 reserved2; ///< Reserved cal slot. } CONDUCTIVITY_COEFFICIENTS_T; @@ -97,6 +97,17 @@ U08 hwSerial[ CONDUCTIVITY_CAL_CHAR_LENGTH ]; ///< HW Serial Number. } CONDUCTIVITY_REVISIONS_T; +typedef struct +{ + U32 sensorID; ///< Sensor ID to request + CONDUCTIVITY_REVISIONS_T sensorVersion; ///< version data for given sensor ID +} CONDUCTIVITY_VERSION_RESPONSE_T; + +typedef struct +{ + U32 sensorID; ///< Sensor ID to request + CONDUCTIVITY_COEFFICIENTS_T sensorCal; ///< Cal data for given sensor ID +} CONDUCTIVITY_CAL_RESPONSE_T; // ********** public function prototypes ********** void initConductivitySensors( void ); @@ -105,6 +116,10 @@ F32 getConductivity( CONDUCTIVITY_SENSORS_T sensor ); F32 getConductivityTemperature( CONDUCTIVITY_SENSORS_T sensor ); +U08 getConductivityReadCount( CONDUCTIVITY_SENSORS_T sensor ); +U08 getConductivityTemperatureReadCount( CONDUCTIVITY_SENSORS_T sensor ); +F32 getConductivityRawResistance( CONDUCTIVITY_SENSORS_T sensor ); +F32 getConductivityRawRTD( CONDUCTIVITY_SENSORS_T sensor ); BOOL testConductivitySensorConductivityReadingsOverride( MESSAGE_T *message ); BOOL testConductivitySensorTemperatureReadingsOverride( MESSAGE_T *message ); @@ -120,6 +135,7 @@ BOOL testFPConductivitySensorTemperatureReadCounterOverride( MESSAGE_T *message ); BOOL testFPConductivitySensorTemperatureErrorCounterOverride( MESSAGE_T *message ); BOOL testHandleConductivitySensorVersionRequest( MESSAGE_T *message ); +BOOL testHandleConductivitySensorCalRequest( MESSAGE_T *message ); /**@}*/