Index: firmware/App/Controllers/DialOutFlow.h =================================================================== diff -u -r5c7b301b677c60519a9d89f4624c6020958de752 -rcd5be724d5a3ba7457e761191d82f278654d7f5c --- firmware/App/Controllers/DialOutFlow.h (.../DialOutFlow.h) (revision 5c7b301b677c60519a9d89f4624c6020958de752) +++ firmware/App/Controllers/DialOutFlow.h (.../DialOutFlow.h) (revision cd5be724d5a3ba7457e761191d82f278654d7f5c) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2020-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-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 DialOutFlow.h * -* @author (last) Michael Garthwaite -* @date (last) 20-Sep-2022 +* @author (last) Dara Navaei +* @date (last) 05-Sep-2023 * * @author (original) Sean * @date (original) 24-Jan-2020 @@ -47,6 +47,8 @@ F32 dopCorrOffset; ///< Latest correction offset for calculated DPo flow rate. F32 dopCalcRate; ///< Latest calculated DPo flow rate. F32 ufCalcRate; ///< Latest calculated UF rate. + U32 rotorHall; ///< Latest rotor hall sensor state (1=home, 0=not home) + F32 currentSetUFRate; ///< Latest UF set rate. } DIAL_OUT_FLOW_DATA_T; #pragma pack(pop) @@ -57,11 +59,13 @@ void execDialOutFlowController( void ); BOOL setDialOutPumpTargetRate( U32 flowRate, MOTOR_DIR_T dir, PUMP_CONTROL_MODE_T mode ); +BOOL setDialOutPumpTargetRPM( U32 rpm, MOTOR_DIR_T dir ); void setDialOutUFVolumes( F32 refVol, F32 totVol ); void signalDialOutPumpHardStop( void ); void signalDialOutPumpRotorHallSensor( void ); void signalDialOutControl( void ); +void resetDialOutRateOffset( void ); BOOL homeDialOutPump( void ); BOOL isDialOutPumpRunning( void ); BOOL isDialOutPumpRampComplete( void );