Index: firmware/App/Controllers/PermeateTank.c =================================================================== diff -u -rb110edbfea44736075d89212a7529df6df64e521 -r44dbba513dffd7b1a997f873426407dbfc4163d1 --- firmware/App/Controllers/PermeateTank.c (.../PermeateTank.c) (revision b110edbfea44736075d89212a7529df6df64e521) +++ firmware/App/Controllers/PermeateTank.c (.../PermeateTank.c) (revision 44dbba513dffd7b1a997f873426407dbfc4163d1) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2025-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 PermeateTank.c * -* @author (last) Sean Nash -* @date (last) 12-Nov-2024 +* @author (last) Michael Garthwaite +* @date (last) 03-Sep-2025 * -* @author (original) Sean Nash -* @date (original) 12-Nov-2024 +* @author (original) Michael Garthwaite +* @date (original) 25-Jul-2025 * ***************************************************************************/ Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -rbb1b5860c4a87ee17537ae9f6ca690a4d74bc925 -r44dbba513dffd7b1a997f873426407dbfc4163d1 --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision bb1b5860c4a87ee17537ae9f6ca690a4d74bc925) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 44dbba513dffd7b1a997f873426407dbfc4163d1) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2020-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 ROPump.c * -* @author (last) Sean Nash -* @date (last) 12-Nov-2024 +* @author (last) “Raghu +* @date (last) 04-Sep-2025 * * @author (original) Sean Nash -* @date (original) 12-Nov-2024 +* @date (original) 15-Nov-2024 * ***************************************************************************/ #include // for log() Index: firmware/App/Drivers/FluidPump.c =================================================================== diff -u -r7957cce4e8b23b7d15b9623ff7c6d20432eab4e1 -r44dbba513dffd7b1a997f873426407dbfc4163d1 --- firmware/App/Drivers/FluidPump.c (.../FluidPump.c) (revision 7957cce4e8b23b7d15b9623ff7c6d20432eab4e1) +++ firmware/App/Drivers/FluidPump.c (.../FluidPump.c) (revision 44dbba513dffd7b1a997f873426407dbfc4163d1) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2025-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 FluidPump.c * -* @author (last) Sean Nash -* @date (last) 12-Nov-2024 +* @author (last) “Raghu +* @date (last) 26-Aug-2025 * -* @author (original) Sean Nash -* @date (original) 12-Nov-2024 +* @author (original) Michael Garthwaite +* @date (original) 18-Jun-2025 * ***************************************************************************/ Index: firmware/App/Modes/FPModeStandby.c =================================================================== diff -u -r74be2e300c7b0ad2a069cea4b1dc2cff06ec0d3e -r44dbba513dffd7b1a997f873426407dbfc4163d1 --- firmware/App/Modes/FPModeStandby.c (.../FPModeStandby.c) (revision 74be2e300c7b0ad2a069cea4b1dc2cff06ec0d3e) +++ firmware/App/Modes/FPModeStandby.c (.../FPModeStandby.c) (revision 44dbba513dffd7b1a997f873426407dbfc4163d1) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2025-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 FPModeStandby.c * * @author (last) Michael Garthwaite -* @date (last) 28-Feb-2025 +* @date (last) 01-Aug-2025 * * @author (original) Michael Garthwaite -* @date (original) 28-Feb-2025 +* @date (original) 29-Jul-2025 * ***************************************************************************/ Index: firmware/App/Modes/FlushConcentrate.c =================================================================== diff -u -rb110edbfea44736075d89212a7529df6df64e521 -r44dbba513dffd7b1a997f873426407dbfc4163d1 --- firmware/App/Modes/FlushConcentrate.c (.../FlushConcentrate.c) (revision b110edbfea44736075d89212a7529df6df64e521) +++ firmware/App/Modes/FlushConcentrate.c (.../FlushConcentrate.c) (revision 44dbba513dffd7b1a997f873426407dbfc4163d1) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2025-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 FlushConcentrate.c * -* @author (last) Michael Garthwaite -* @date (last) 28-Feb-2025 +* @author (last) “Raghu +* @date (last) 04-Sep-2025 * * @author (original) Michael Garthwaite -* @date (original) 28-Feb-2025 +* @date (original) 02-Jul-2025 * ***************************************************************************/ Index: firmware/App/Modes/FlushFilter.c =================================================================== diff -u -rb110edbfea44736075d89212a7529df6df64e521 -r44dbba513dffd7b1a997f873426407dbfc4163d1 --- firmware/App/Modes/FlushFilter.c (.../FlushFilter.c) (revision b110edbfea44736075d89212a7529df6df64e521) +++ firmware/App/Modes/FlushFilter.c (.../FlushFilter.c) (revision 44dbba513dffd7b1a997f873426407dbfc4163d1) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2025-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 FlushFilter.c * * @author (last) Michael Garthwaite -* @date (last) 28-Feb-2025 +* @date (last) 30-Jul-2025 * * @author (original) Michael Garthwaite -* @date (original) 28-Feb-2025 +* @date (original) 02-Jul-2025 * ***************************************************************************/ Index: firmware/App/Modes/FlushPermeate.c =================================================================== diff -u -rb6b45de61b9f011263147c7313134198fa83725f -r44dbba513dffd7b1a997f873426407dbfc4163d1 --- firmware/App/Modes/FlushPermeate.c (.../FlushPermeate.c) (revision b6b45de61b9f011263147c7313134198fa83725f) +++ firmware/App/Modes/FlushPermeate.c (.../FlushPermeate.c) (revision 44dbba513dffd7b1a997f873426407dbfc4163d1) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2025-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 FlushPermeate.c * -* @author (last) Michael Garthwaite -* @date (last) 28-Feb-2025 +* @author (last) “Raghu +* @date (last) 04-Sep-2025 * * @author (original) Michael Garthwaite -* @date (original) 28-Feb-2025 +* @date (original) 02-Jul-2025 * ***************************************************************************/ Index: firmware/App/Modes/ModeGenPermeate.c =================================================================== diff -u -rc0c217faf415f9acd61dcc9a13932fbc7088339e -r44dbba513dffd7b1a997f873426407dbfc4163d1 --- firmware/App/Modes/ModeGenPermeate.c (.../ModeGenPermeate.c) (revision c0c217faf415f9acd61dcc9a13932fbc7088339e) +++ firmware/App/Modes/ModeGenPermeate.c (.../ModeGenPermeate.c) (revision 44dbba513dffd7b1a997f873426407dbfc4163d1) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2025-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 ModeGenPermeate.c * -* @author (last) Michael Garthwaite -* @date (last) 28-Feb-2025 +* @author (last) “Raghu +* @date (last) 26-Aug-2025 * * @author (original) Michael Garthwaite -* @date (original) 28-Feb-2025 +* @date (original) 04-Mar-2025 * ***************************************************************************/ Index: firmware/App/Modes/ModePreGenPermeate.c =================================================================== diff -u -rb6b45de61b9f011263147c7313134198fa83725f -r44dbba513dffd7b1a997f873426407dbfc4163d1 --- firmware/App/Modes/ModePreGenPermeate.c (.../ModePreGenPermeate.c) (revision b6b45de61b9f011263147c7313134198fa83725f) +++ firmware/App/Modes/ModePreGenPermeate.c (.../ModePreGenPermeate.c) (revision 44dbba513dffd7b1a997f873426407dbfc4163d1) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2020-2025 Diality Inc. - All Rights Reserved. +* Copyright (c) 2025-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 ModePreGenPermeate.c * -* @author (last) Michael Garthwaite -* @date (last) 28-Feb-2025 +* @author (last) “Raghu +* @date (last) 04-Sep-2025 * * @author (original) Michael Garthwaite -* @date (original) 28-Feb-2025 +* @date (original) 02-Jul-2025 * ***************************************************************************/ Index: firmware/App/Monitors/Conductivity.c =================================================================== diff -u -rb110edbfea44736075d89212a7529df6df64e521 -r44dbba513dffd7b1a997f873426407dbfc4163d1 --- firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision b110edbfea44736075d89212a7529df6df64e521) +++ firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision 44dbba513dffd7b1a997f873426407dbfc4163d1) @@ -1,14 +1,14 @@ /************************************************************************** * -* 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.c * -* @author (last) Sean Nash -* @date (last) 09-Nov-2024 +* @author (last) Michael Garthwaite +* @date (last) 30-Jul-2025 * * @author (original) Sean Nash * @date (original) 09-Nov-2024 Index: firmware/App/Monitors/Conductivity.h =================================================================== diff -u -rca95dc70d5ef02c5c40b67d095e9a4d56783d967 -r44dbba513dffd7b1a997f873426407dbfc4163d1 --- firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision ca95dc70d5ef02c5c40b67d095e9a4d56783d967) +++ firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision 44dbba513dffd7b1a997f873426407dbfc4163d1) @@ -31,21 +31,39 @@ // ********** public definitions ********** +#define RO_REJECTION_RATIO_OUT_OF_RANGE_VALUE 100.0F ///< Out of range value for RO rejection ratio when CPi conductivity is zero. + /// Conductivity data struct. typedef struct { F32 p9Conductivity; ///< (P9) conductivity sensor value F32 p18Conductivity; ///< (P18) conductivity sensor value } CONDUCTIVITY_DATA_T; +/// RO rejection ratio data struct. +typedef struct +{ + F32 rawRORejectionRatio; ///< RO rejection ratio during tank full and fill state + F32 rawRORejectionRatioTankFill; ///< RO rejection ratio during tank fill state + F32 avgRORejectionRatio; ///< RO rejection ratio average during tank full and fill state + F32 avgRORejectionRatioTankFill; ///< RO rejection ratio average during tank fill state + U32 genPermeateState; ///< Permeate tank state +} RO_REJECTION_RATIO_DATA_T; + // ********** public function prototypes ********** void initConductivity( void ); void execConductivity( void ); F32 getFilteredConductivity( CONDUCTIVITY_SENSORS_T sensor ); F32 getFilteredConductivitySensorTemperature( CONDUCTIVITY_SENSORS_T sensor ); +F32 getRORejectonRatio( void ); +F32 getTankFillRORejectionRatio( void ); +F32 getRORRAverage( void ); +F32 getTankFillRORRAverage( void ); BOOL testConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message ); +BOOL testRORejectionRatioDataPublishIntervalOverride( MESSAGE_T *message ); +BOOL testRORejectionRatioFilteredOverride( MESSAGE_T *message ); /**@}*/ Index: firmware/App/Monitors/WaterQualityMonitor.c =================================================================== diff -u -ra87112233634fca4d9950c3ed05d2c55fa5f9c65 -r44dbba513dffd7b1a997f873426407dbfc4163d1 --- firmware/App/Monitors/WaterQualityMonitor.c (.../WaterQualityMonitor.c) (revision a87112233634fca4d9950c3ed05d2c55fa5f9c65) +++ firmware/App/Monitors/WaterQualityMonitor.c (.../WaterQualityMonitor.c) (revision 44dbba513dffd7b1a997f873426407dbfc4163d1) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2025-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 WaterQualityMonitor.c * -* @author (last) Sean Nash -* @date (last) 21-Nov-2024 +* @author (last) Michael Garthwaite +* @date (last) 01-Aug-2025 * -* @author (original) Sean Nash -* @date (original) 21-Nov-2024 +* @author (original) Michael Garthwaite +* @date (original) 25-Jul-2025 * ***************************************************************************/ Index: firmware/App/Monitors/WaterQualityMonitor.h =================================================================== diff -u -ra87112233634fca4d9950c3ed05d2c55fa5f9c65 -r44dbba513dffd7b1a997f873426407dbfc4163d1 --- firmware/App/Monitors/WaterQualityMonitor.h (.../WaterQualityMonitor.h) (revision a87112233634fca4d9950c3ed05d2c55fa5f9c65) +++ firmware/App/Monitors/WaterQualityMonitor.h (.../WaterQualityMonitor.h) (revision 44dbba513dffd7b1a997f873426407dbfc4163d1) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2025-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 WaterQualityMonitor.h * * @author (last) Michael Garthwaite -* @date (last) 21-Nov-2024 +* @date (last) 30-Jul-2025 * * @author (original) Michael Garthwaite -* @date (original) 21-Nov-2024 +* @date (original) 25-Jul-2025 * ***************************************************************************/ #ifndef __WATER_QUALITY_MONITOR_H Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r55bc131a0df5b1cd485eb6d1d1fbff8559317f21 -r44dbba513dffd7b1a997f873426407dbfc4163d1 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 55bc131a0df5b1cd485eb6d1d1fbff8559317f21) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 44dbba513dffd7b1a997f873426407dbfc4163d1) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2025 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 Messaging.c * -* @author (last) Vinayakam Mani -* @date (last) 06-Aug-2024 +* @author (last) Shyam Kumar Mathamala +* @date (last) 03-Sep-2025 * -* @author (original) Vinayakam Mani -* @date (original) 06-Aug-2024 +* @author (original) Dara Navaei +* @date (original) 06-Oct-2024 * ***************************************************************************/