Index: firmware/App/Controllers/FlowSensors.h =================================================================== diff -u -r696e732c9742535a58b9c65f243df7cd797d1423 -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 --- firmware/App/Controllers/FlowSensors.h (.../FlowSensors.h) (revision 696e732c9742535a58b9c65f243df7cd797d1423) +++ firmware/App/Controllers/FlowSensors.h (.../FlowSensors.h) (revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2022-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2022-2024 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 FlowSensors.h * -* @author (last) Dara Navaei -* @date (last) 01-Aug-2022 +* @author (last) Michael Garthwaite +* @date (last) 03-Aug-2023 * * @author (original) Dara Navaei * @date (original) 21-Jul-2022 @@ -30,9 +30,9 @@ */ // ********** public definitions ********** -#define MAX_FLOWRATE_LPM 2.00F ///< Maximum flow rate in L/min. -#define MIN_DIALYSATE_FLOWRATE_LPM 0.05F ///< Minimum target flow rate in L/min. +#define MAX_FLOWRATE_LPM 2.0F ///< Maximum flow rate in L/min. + /// Flow meters name typedef enum { @@ -51,11 +51,12 @@ F32 getMeasuredFlowRateLPM( FLOW_SENSORS_T sensorId ); F32 getMeasuredROFlowRateWithConcPumpsLPM( void ); +F32 getMeasuredRawFlowRateLPM( FLOW_SENSORS_T sensorId ); BOOL testSetFlowDataPublishIntervalOverride( U32 value ); BOOL testResetFlowDataPublishIntervalOverride( void ); -BOOL testSetMeasuredFlowRateOverride( U32 sensorId, F32 flowLPM ); +BOOL testSetMeasuredFlowRateOverride( U32 sensorId, F32 flowLPM, BOOL raw ); BOOL testResetMeasuredFlowRateOverride( U32 sensorId ); /**@}*/