Index: firmware/App/Controllers/FlowSensors.h =================================================================== diff -u -r0f4fbb2a56cdbe35dcedd9cad23867fd7248f86e -r696e732c9742535a58b9c65f243df7cd797d1423 --- firmware/App/Controllers/FlowSensors.h (.../FlowSensors.h) (revision 0f4fbb2a56cdbe35dcedd9cad23867fd7248f86e) +++ firmware/App/Controllers/FlowSensors.h (.../FlowSensors.h) (revision 696e732c9742535a58b9c65f243df7cd797d1423) @@ -1,5 +1,20 @@ +/************************************************************************** +* +* Copyright (c) 2022-2022 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 (original) Dara Navaei +* @date (original) 21-Jul-2022 +* +***************************************************************************/ - #ifndef _FLOW_SENSORS_H_ #define _FLOW_SENSORS_H_ @@ -15,7 +30,7 @@ */ // ********** public definitions ********** -#define MAX_DIALYSATE_FLOWRATE_LPM 2.00F ///< Maximum target flow rate in L/min. +#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. /// Flow meters name @@ -26,23 +41,16 @@ NUM_OF_FLOW_SENSORS, ///< Number of flow sensors. } FLOW_SENSORS_T; -/// Flow meters data struct. -typedef struct -{ - F32 ROFlowRateLPM; ///< RO flow rate in L/min. - F32 ROFlowRateWithCPsLPM; ///< RO flow rate with concentrate pumps in L/min. - F32 dialysateFlowRateLPM; ///< Dialysate flow rate L/min. -} FLOW_SENSORS_DATA_T; - // ********** public function prototypes ********** void initFlowSensors( void ); SELF_TEST_STATUS_T execFlowSensorsSelfTest( void ); -void execFlowSesnorsMonitor( void ); +void execFlowSensorsMonitor( void ); -F32 getMeasuredFlowRateLPM( FLOW_SENSORS_T sensorId ); +F32 getMeasuredFlowRateLPM( FLOW_SENSORS_T sensorId ); +F32 getMeasuredROFlowRateWithConcPumpsLPM( void ); BOOL testSetFlowDataPublishIntervalOverride( U32 value ); BOOL testResetFlowDataPublishIntervalOverride( void );