Index: firmware/App/Controllers/DialysatePumps.h =================================================================== diff -u -rf6022e86136c821709ce24b61e11e8e2bdf0b11e -rb2e7c9194acd84783d2bbad64c5720410493e199 --- firmware/App/Controllers/DialysatePumps.h (.../DialysatePumps.h) (revision f6022e86136c821709ce24b61e11e8e2bdf0b11e) +++ firmware/App/Controllers/DialysatePumps.h (.../DialysatePumps.h) (revision b2e7c9194acd84783d2bbad64c5720410493e199) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2024 Diality Inc. - All Rights Reserved. +* Copyright (c) 2024-2026 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 +* @author (last) Jashwant Gantyada +* @date (last) 12-Mar-2026 * * @author (original) Vinayakam Mani -* @date (original) 02-Sep-2024 +* @date (original) 07-Oct-2024 * ***************************************************************************/ @@ -24,16 +24,20 @@ * @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 350-2700 ml/min. + * The pump shall run at 200(10%) -2700(90%)RPM. * * @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 200 ///< Minimum RPM target for D12 pump and D48 Diener 2000 pump. +#define MAX_DIALYSATE_PUMP_RPM 2650 ///< Maximum RPM target for D12 pump and D48 Diener 2000 pump. + +#define D48_DIENER_1000_MIN_RPM 134 ///< Minimum RPM for D48 Diener 1000 pump (test config enabled). +#define D48_DIENER_1000_MAX_RPM 2770 ///< Maximum RPM for D48 Diener 1000 pump (test config enabled). + #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 @@ -80,6 +84,8 @@ void execDialysatePumpController( void ); SELF_TEST_STATUS_T execDialysatePumpSelfTest( void ); +U32 getDialysatePumpMinRPM( DIALYSATE_PUMPS_T pumpId ); +U32 getDialysatePumpMaxRPM( DIALYSATE_PUMPS_T pumpId ); F32 getDialysatePumpTargetSpeed( DIALYSATE_PUMPS_T pumpId ); F32 getDialysatePumpMeasuredSpeed( DIALYSATE_PUMPS_T pumpId ); F32 getDialysatePumpTargetPressure( DIALYSATE_PUMPS_T pumpId );