Index: firmware/App/Monitors/Conductivity.h =================================================================== diff -u -r3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546 -rc07917caced76b53a0ed8f35167fac6f9d8310a4 --- firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision 3b6bf2cb6d15da8cb273cff109d2c4b1ee99d546) +++ firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision c07917caced76b53a0ed8f35167fac6f9d8310a4) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2024-2025 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file Conductivity.h * * @author (last) Vinayakam Mani -* @date (last) 10-Sep-2024 +* @date (last) 09-Sep-2025 * * @author (original) Vinayakam Mani -* @date (original) 10-Sep-2024 +* @date (original) 13-Sep-2024 * ***************************************************************************/ @@ -40,14 +40,29 @@ F32 d27Cond; ///< CD2 conductivity sensor value F32 d29Cond; ///< CD3 conductivity sensor value F32 d43Cond; ///< CD4 conductivity sensor value -} CONDUCTIVITY_DATA_T; + F32 d74Cond; ///< CD5 conductivity sensor value +} DD_CONDUCTIVITY_DATA_T; +/// Conductivity data struct. +typedef struct +{ + F32 p9Conductivity; ///< (P9) conductivity sensor value + F32 p18Conductivity; ///< (P18) conductivity sensor value +} FP_CONDUCTIVITY_DATA_T; + // ********** public function prototypes ********** void initConductivity( void ); void execConductivity( void ); +F32 getFilteredConductivity( CONDUCTIVITY_SENSORS_T sensor ); +F32 getFilteredConductivitySensorTemperature( CONDUCTIVITY_SENSORS_T sensor ); -BOOL testConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message ); +BOOL testDDConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message ); +BOOL testDDConductivitySensorFilteredReadingsOverride( MESSAGE_T *message ); +BOOL testDDConductivitySensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); +BOOL testFPConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message ); +BOOL testFPConductivitySensorFilteredReadingsOverride( MESSAGE_T *message ); +BOOL testFPConductivitySensorFilteredTemperatureReadingsOverride( MESSAGE_T *message ); /**@}*/