Index: firmware/App/Controllers/SubstitutionPump.h =================================================================== diff -u -r84b30e2da7c4374d06ef068d3cb2b5c0c4fabccd -rf90c1eef73251d75ce49645eb05deb492a486ff0 --- firmware/App/Controllers/SubstitutionPump.h (.../SubstitutionPump.h) (revision 84b30e2da7c4374d06ef068d3cb2b5c0c4fabccd) +++ firmware/App/Controllers/SubstitutionPump.h (.../SubstitutionPump.h) (revision f90c1eef73251d75ce49645eb05deb492a486ff0) @@ -10,8 +10,8 @@ * @author (last) Sameer Kalliadan Poyil * @date (last) 15-Apr-2026 * -* @author (original) Vinayakam Mani -* @date (original) 19-Sep-2024 +* @author (original) Michael Garthwaite +* @date (original) 5-May-2026 * ***************************************************************************/ @@ -31,7 +31,7 @@ // ********** public definitions ********** -#define SUB_PUMP_CONT_VOLUME 0xFFFFFFFF ///< Volume set to 0xFFFFFFFF enables continuous delivery based on the speed set. +#define SUB_PUMP_CONT_VOLUME 0xFFFFFFFF ///< Volume set to 0xFFFFFFFF enables continuous delivery based on the speed set. #define PARK_CONC_PUMPS TRUE ///< For park parameter to requestConcentratePumpOff(). #define NO_PARK_CONC_PUMPS FALSE ///< For park parameter to requestConcentratePumpOff(). @@ -47,10 +47,9 @@ /// Substitution pump data struct. typedef struct { - F32 d92_PumpTargetSpeed; ///< substitution pump D92_Pump target speed - F32 d92_PumpCurrentSetSpeed; ///< substitution pump D92_Pump current set speed - U32 d92_PumpTargetRevCount; ///< substitution pump D92_Pump target revolution count - U32 d92_PumpState; ///< substitution pump D92_Pump current state + F32 d92_PumpTargetSpeed; ///< Substitution pump D92_Pump target speed + F32 d92_PumpCurrentSetSpeed; ///< Substitution pump D92_Pump current set speed + U32 d92_PumpState; ///< Substitution pump D92_Pump current state } SUBSTITUTION_PUMP_DATA_T; // ********** public function prototypes ********** @@ -62,12 +61,12 @@ void requestSubstitutionPumpOn( SUBSTITUTION_PUMPS_T pumpId ); void requestSubstitutionPumpOff( SUBSTITUTION_PUMPS_T pumpId ); F32 getSubstitutionPumpTargetSpeed( SUBSTITUTION_PUMPS_T pumpId ); +void setSubstitutionPumpTargetSpeed( SUBSTITUTION_PUMPS_T pumpId, F32 targetSpeed_ml_min ); BOOL testSubstitutionPumpDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testSubstitutionPumpTargetSpeedOverride( MESSAGE_T *message ); -BOOL testSubstitutionPumpStartStopOverride( MESSAGE_T *message ); // Concentrate pump start/stop request - +BOOL testSubstitutionPumpStartStopOverride( MESSAGE_T *message ); /**@}*/ #endif