Index: firmware/App/Controllers/DialysatePumps.h =================================================================== diff -u -r8736efaf98697bd9b2e4c52587469b5c634b1fb6 -rc07917caced76b53a0ed8f35167fac6f9d8310a4 --- firmware/App/Controllers/DialysatePumps.h (.../DialysatePumps.h) (revision 8736efaf98697bd9b2e4c52587469b5c634b1fb6) +++ firmware/App/Controllers/DialysatePumps.h (.../DialysatePumps.h) (revision c07917caced76b53a0ed8f35167fac6f9d8310a4) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2024-2025 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 DialysatePumps.h * * @author (last) Vinayakam Mani -* @date (last) 02-Sep-2024 +* @date (last) 13-May-2025 * * @author (original) Vinayakam Mani -* @date (original) 02-Sep-2024 +* @date (original) 07-Oct-2024 * ***************************************************************************/ @@ -24,17 +24,21 @@ * @defgroup DialysatePumps DialysatePumps * @brief Dialysate Pumps monitor/controller module. Controls and monitors the dialysate pumps. * Dialysate pump manufacturer: Diener Silencer Series Gear Pumps, PN: 01483-PM-3-RA. - * The pump shall produce flow rates of 50-4500 ml/min. + * The pump shall produce flow rates of 350-2700 ml/min. * * @addtogroup DialysatePumps * @{ */ // ********** public definitions ********** -#define MIN_DIALYSATE_PUMP_RPM 350 ///< Minimum RPM target for dialysate pump (though zero is allowed if turning pump off). -#define MAX_DIALYSATE_PUMP_RPM 2650 ///< Maximum RPM target for dialysate pump. +#define MIN_DIALYSATE_PUMP_RPM 350 ///< Minimum RPM target for dialysate pump (though zero is allowed if turning pump off). +#define MAX_DIALYSATE_PUMP_RPM 2650 ///< Maximum RPM target for dialysate pump. +#define DEGAS_PUMP_TARGET_PRES_ADJ_THRESHOLD -1.0F ///< Dialysate Pump(D12) target pressure threshold adjustment factor. +#define MIN_DIALYSATE_FLOW_RATE ( 100.0F ) ///< Minimum dialysate flow rate +#define MAX_DIALYSATE_FLOW_RATE ( 600.0F ) ///< Maximum dialysate flow rate + /// Enumeration of dialysate pumps. typedef enum DialysatePumps { @@ -83,7 +87,7 @@ U32 getDialysatePumpMeasuredDirection( DIALYSATE_PUMPS_T pumpId ); BOOL isDialysatePumpOn( DIALYSATE_PUMPS_T pumpId ); void signalDialysatePumpHardStop( DIALYSATE_PUMPS_T pumpId ); -BOOL setDialysatePumpTargetRPM( DIALYSATE_PUMPS_T pumpId, U32 rpm ); +BOOL setDialysatePumpTargetRPM( DIALYSATE_PUMPS_T pumpId, U32 rpm, BOOL isOpenLoopControlEnabled ); BOOL testDialysatePumpsDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testDialysatePumpTargetSpeedOverride( MESSAGE_T *message );