Index: firmware/App/Controllers/ConcentratePumps.h =================================================================== diff -u -r5126b79e4970ffe2ed9db4cccea18a1216c78570 -r3cc784af591b14e5d292f92c796db70bcbd5a40b --- firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision 5126b79e4970ffe2ed9db4cccea18a1216c78570) +++ firmware/App/Controllers/ConcentratePumps.h (.../ConcentratePumps.h) (revision 3cc784af591b14e5d292f92c796db70bcbd5a40b) @@ -30,8 +30,13 @@ */ // ********** public definitions ********** - +#ifdef __DIENER_CONC_PUMP__ +// For 100 RPM, Diener pump delivers 40ml/min,so restricing 300 RPM for now to maintain accuracy. We may allow up to 500 RPM +// that yields 200 ml/min, but as speed increases, accuracy may drop. +#define CONCENTRATE_PUMP_MAX_SPEED 120.0F ///< Optimal speed for concentrate pump in mL/min +#else #define CONCENTRATE_PUMP_MAX_SPEED 48.0F ///< Maximum speed for concentrate pump in mL/min +#endif #define DEFAULT_ACID_VOLUME_ML 0.67F ///< Acid concentrate volume in ml. #define DEFAULT_BICARB_VOLUME_ML 1.15F ///< Bicarb concentrate volume in ml. @@ -44,6 +49,7 @@ D11_PUMP = 0, ///< Acid concentrate pump CONCENTRATEPUMPS_FIRST = D11_PUMP, ///< First concentrate pump in list D10_PUMP, ///< Bicarbonate concentrate pump + D76_PUMP, ///< Ultrafilteration pump NUM_OF_CONCENTRATE_PUMPS ///< Number of concentrate pumps } CONCENTRATE_PUMPS_T; @@ -68,6 +74,13 @@ BOOL d10_PumpParked; ///< Concentrate pump D10_Pump parked status BOOL d11_PumpParkFault; ///< Concentrate pump D11_Pump park fault status BOOL d10_PumpParkFault; ///< Concentrate pump D10_Pump park fault status + F32 d76_PumpTargetSpeed; ///< Concentrate pump D76_Pump target speed + F32 d76_PumpCurrentSetSpeed; ///< Concentrate pump D76_Pump current set speed + F32 d76_PumpMeasuredSpeed; ///< Concentrate pump D76_Pump measured speed + U32 d76_PumpTargetRevCount; ///< Concentrate pump D76_Pump target revolution count + U32 d76_PumpMeasuredRevCount; ///< Concentrate pump D76_Pump measured revolution count + U32 d76_PumpState; ///< Concentrate pump D76_Pump current state + F32 d76_PumpPulseUS; ///< Concentrate pump D76_Pump pulse in microseconds } CONCENTRATE_PUMP_DATA_T; // ********** public function prototypes **********