Index: firmware/App/Controllers/RinsePump.h =================================================================== diff -u -r711ff90b0aab45c4acde333f4c9f11be9b62f383 -rd7c545dff2f13dd75ebab0af997c45047c844f7a --- firmware/App/Controllers/RinsePump.h (.../RinsePump.h) (revision 711ff90b0aab45c4acde333f4c9f11be9b62f383) +++ firmware/App/Controllers/RinsePump.h (.../RinsePump.h) (revision d7c545dff2f13dd75ebab0af997c45047c844f7a) @@ -1,17 +1,17 @@ /************************************************************************** * -* Copyright (c) 2024-2025 Diality Inc. - All Rights Reserved. +* Copyright (c) 2025-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 RinsePump.h * -* @author (last) Vinayakam Mani -* @date (last) 22-Oct-2025 +* @author (last) Jashwant Gantyada +* @date (last) 02-Apr-2026 * * @author (original) Vinayakam Mani -* @date (original) 22-Oct-2025 +* @date (original) 02-Oct-2025 * ***************************************************************************/ @@ -37,9 +37,18 @@ typedef struct { U32 d79State; ///< Rinse pump state status + F32 d79PumpPWM; ///< Rinse pump PWM value + U32 d79PumpRPM; ///< Rinse pump RPM value } RINSE_PUMP_PAYLOAD_T; #pragma pack(pop) +/// Enumeration of rinse pump instances +typedef enum RinsePumpIds +{ + D79_RINSE_PUMP = 0, ///< Rinse pump driven by D79 FPGA control + NUM_OF_RINSE_PUMPS ///< Number of rinse pumps +} RINSE_PUMP_ID_T; + /// Enumeration of air pump states. typedef enum RinsePumpControllerStates { @@ -53,12 +62,16 @@ void initRinsePump(void); void execRinsePumpController(void); +void execRinsePumpMonitor( void ); +U32 getRinsePumpMeasuredSpeed( void ); +U32 getRinsePumpTargetSpeedRPM( void ); void setRinsePumpState( RINSE_PUMP_STATE_T state ); RINSE_PUMP_STATE_T getRinsePumpState( void ); BOOL testRinsePumpDataPublishIntervalOverride( MESSAGE_T *message ); +BOOL testRinsePumpPWMPercentOverride( MESSAGE_T *message ); +BOOL testRinsePumpTurnOnOffRequest( MESSAGE_T *message ); // TODO remove when the PWM is implemented /**@}*/ #endif -