Index: firmware/App/Controllers/DialInFlow.h =================================================================== diff -u -r5af49574b5f8e99aa9ea451033213dcd765ea837 -r29b65975bb4d6a5720ef39119a9af49fafc902fa --- firmware/App/Controllers/DialInFlow.h (.../DialInFlow.h) (revision 5af49574b5f8e99aa9ea451033213dcd765ea837) +++ firmware/App/Controllers/DialInFlow.h (.../DialInFlow.h) (revision 29b65975bb4d6a5720ef39119a9af49fafc902fa) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-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 DialInFlow.h +* @file DialInFlow.h * -* @author (last) Sean Nash -* @date (last) 03-Aug-2020 +* @author (last) Dara Navaei +* @date (last) 18-Oct-2022 * -* @author (original) Sean -* @date (original) 16-Dec-2019 +* @author (original) Sean +* @date (original) 16-Dec-2019 * ***************************************************************************/ @@ -59,19 +59,18 @@ void signalDialInPumpRotorHallSensor( void ); BOOL homeDialInPump( void ); BOOL isDialInPumpRunning( void ); +BOOL isDialInPumpRampComplete( void ); SELF_TEST_STATUS_T execDialInFlowTest( void ); S32 getTargetDialInFlowRate( void ); F32 getMeasuredDialInFlowRate( void ); -#ifdef USE_FMD_FLOW_SENSOR -F32 getMeasuredDialInFlowSignalStrength( void ); -#endif F32 getMeasuredDialInPumpRotorSpeed( void ); F32 getMeasuredDialInPumpSpeed( void ); F32 getMeasuredDialInPumpMCSpeed( void ); F32 getMeasuredDialInPumpMCCurrent( void ); F32 getDialInPumpPWMDutyCyclePct( BOOL init ); +U32 getPumpRotorErrorPersistTime( F32 mtr_speed, F32 gear_ratio ); BOOL testSetDialInFlowDataPublishIntervalOverride( U32 value ); BOOL testResetDialInFlowDataPublishIntervalOverride( void ); @@ -85,11 +84,8 @@ BOOL testSetMeasuredDialInPumpMCSpeedOverride( F32 value ); BOOL testResetMeasuredDialInPumpMCSpeedOverride( void ); BOOL testSetMeasuredDialInPumpMCCurrentOverride( F32 value ); -BOOL testResetMeasuredDialInPumpMCCurrentOverride( void ); -#ifdef USE_FMD_FLOW_SENSOR -BOOL testSetMeasuredDialInFlowSignalStrengthOverride( F32 value ); -BOOL testResetMeasuredDialInFlowSignalStrengthOverride( void ); -#endif +BOOL testResetMeasuredDialInPumpMCCurrentOverride( void ); +BOOL testSetDialInPumpTargetDutyCycle( F32 value ); /**@}*/