Index: firmware/App/Controllers/DialInFlow.h =================================================================== diff -u -r8466e63f95f65a3ffb18c3af85ac99328e41167b -r8bd1ae47aa13a843aa8abd6321ddc050deacb4a6 --- firmware/App/Controllers/DialInFlow.h (.../DialInFlow.h) (revision 8466e63f95f65a3ffb18c3af85ac99328e41167b) +++ firmware/App/Controllers/DialInFlow.h (.../DialInFlow.h) (revision 8bd1ae47aa13a843aa8abd6321ddc050deacb4a6) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-2021 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) Sean Nash +* @date (last) 13-Aug-2021 * -* @author (original) Sean -* @date (original) 16-Dec-2019 +* @author (original) Sean +* @date (original) 16-Dec-2019 * ***************************************************************************/ @@ -56,20 +56,19 @@ BOOL setDialInPumpTargetFlowRate( U32 flowRate, MOTOR_DIR_T dir, PUMP_CONTROL_MODE_T mode ); void signalDialInPumpHardStop( void ); -void signalDialInPumpRotorHallSensor( void ); +void signalDialInPumpRotorHallSensor( void ); BOOL homeDialInPump( void ); BOOL isDialInPumpRunning( void ); SELF_TEST_STATUS_T execDialInFlowTest( void ); S32 getTargetDialInFlowRate( void ); -F32 getMeasuredDialInFlowRate( void ); -F32 getMeasuredDialInFlowSignalStrength( void ); +F32 getMeasuredDialInFlowRate( void ); F32 getMeasuredDialInPumpRotorSpeed( void ); F32 getMeasuredDialInPumpSpeed( void ); F32 getMeasuredDialInPumpMCSpeed( void ); F32 getMeasuredDialInPumpMCCurrent( void ); -F32 getDialInPumpPWMDutyCyclePct( void ); +F32 getDialInPumpPWMDutyCyclePct( BOOL init ); BOOL testSetDialInFlowDataPublishIntervalOverride( U32 value ); BOOL testResetDialInFlowDataPublishIntervalOverride( void ); @@ -84,8 +83,6 @@ BOOL testResetMeasuredDialInPumpMCSpeedOverride( void ); BOOL testSetMeasuredDialInPumpMCCurrentOverride( F32 value ); BOOL testResetMeasuredDialInPumpMCCurrentOverride( void ); -BOOL testSetMeasuredDialInFlowSignalStrengthOverride( F32 value ); -BOOL testResetMeasuredDialInFlowSignalStrengthOverride( void ); /**@}*/