Index: firmware/App/Controllers/DialInFlow.h =================================================================== diff -u -rd7b793881e8414f2daf75825d5de4e25a25d10ac -rcd5be724d5a3ba7457e761191d82f278654d7f5c --- firmware/App/Controllers/DialInFlow.h (.../DialInFlow.h) (revision d7b793881e8414f2daf75825d5de4e25a25d10ac) +++ firmware/App/Controllers/DialInFlow.h (.../DialInFlow.h) (revision cd5be724d5a3ba7457e761191d82f278654d7f5c) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved. +* Copyright (c) 2019-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 DialInFlow.h * -* @author (last) Dara Navaei -* @date (last) 18-Oct-2022 +* @author (last) Sean Nash +* @date (last) 06-Jun-2023 * * @author (original) Sean * @date (original) 16-Dec-2019 @@ -33,7 +33,7 @@ #define MAX_DIAL_IN_FLOW_RATE 600 ///< Maximum dialysate inlet flow rate (in mL/min). #define MIN_DIAL_IN_FLOW_RATE 100 ///< Minimum dialysate inlet flow rate (in mL/min). -#define DIALYSATE_FLOW_RATE_FOR_RECIRC 100 ///< Dialysate recirculation flow rate (in mL/min). +#define DIALYSATE_FLOW_RATE_FOR_RECIRC 250 ///< Dialysate recirculation flow rate (in mL/min). /// Payload record structure for a dialysate inlet pump data message. typedef struct @@ -46,6 +46,8 @@ F32 measMCCurr; F32 pwmDC; U32 rotorCount; + U32 presFlow; + U32 rotorHall; } DIALIN_PUMP_STATUS_PAYLOAD_T; // ********** public function prototypes ********** @@ -55,6 +57,7 @@ void execDialInFlowController( void ); BOOL setDialInPumpTargetFlowRate( U32 flowRate, MOTOR_DIR_T dir, PUMP_CONTROL_MODE_T mode ); +BOOL setDialInPumpTargetRPM( U32 rpm, MOTOR_DIR_T dir ); void signalDialInPumpHardStop( void ); void signalDialInPumpRotorHallSensor( void ); BOOL homeDialInPump( void );