Index: firmware/App/Services/PIControllers.h =================================================================== diff -u -ra7bf3ca23ea37a61000379facae628a31b3ecc59 -rd00ad426d849083922332f832e88e7137a1cad60 --- firmware/App/Services/PIControllers.h (.../PIControllers.h) (revision a7bf3ca23ea37a61000379facae628a31b3ecc59) +++ firmware/App/Services/PIControllers.h (.../PIControllers.h) (revision d00ad426d849083922332f832e88e7137a1cad60) @@ -7,8 +7,8 @@ * * @file PIControllers.h * -* @author (last) Sean -* @date (last) 22-Apr-2020 +* @author (last) Quang Nguyen +* @date (last) 24-Aug-2020 * * @author (original) Sean * @date (original) 04-Feb-2020 @@ -22,37 +22,39 @@ /** * @defgroup PIControllers PIControllers - * @brief PIControllers service module. Provides PI controllers for various actuators.. + * @brief PIControllers service module. Provides PI controllers for various actuators. * * @addtogroup PIControllers * @{ */ // ********** public definitions ********** -/// Enumeration of PI controllers +/// Enumeration of PI controllers. typedef enum ControllerList { PI_CONTROLLER_ID_RO_PUMP = 0, ///< RO Pump controller. PI_CONTROLLER_ID_PRIMARY_HEATER, ///< Primary Heater controller. - PI_CONTROLLER_ID_TRIMMER_HEATER, ///< Trimmer Heater controller. + PI_CONTROLLER_ID_TRIMMER_HEATER, ///< Trimmer Heater controller. + I_CONTROLLER_ID_RO_PUMP_RAMP_UP, ///< RO Pump controller during ramp up time. + PI_CONTROLLER_ID_DRAIN_PUMP, ///< Drain Pump controller. NUM_OF_PI_CONTROLLERS_IDS ///< Number of PI controllers. } PI_CONTROLLER_ID_T; -/// Enumeration of PI controller signals +/// Enumeration of PI controller signals. typedef enum ControllerSignals { - CONTROLLER_SIGNAL_REFERENCE = 0, ///< Reference value. - CONTROLLER_SIGNAL_MEASURED, ///< Measured value. - CONTROLLER_SIGNAL_ERROR, ///< Error value. - CONTROLLER_SIGNAL_ERROR_SUM, ///< Error sum before anti-windup. - CONTROLLER_SIGNAL_ERROR_SUM_AFTER_WINDUP, ///< Error sum after anti-windup. - CONTROLLER_SIGNAL_PROPORTIONAL_OUTPUT, ///< P portion of controller output signal. - CONTROLLER_SIGNAL_INTEGRAL_OUTPUT, ///< I portion of controller output signal. - CONTROLLER_SIGNAL_CONTROL, ///< Controller output signal. - NUM_OF_CONTROLLER_SIGNAL ///< Number of PI controller signals. -} PI_CONTROLLER_SIGNALS_ID; - + CONTROLLER_SIGNAL_REFERENCE = 0, ///< Reference value + CONTROLLER_SIGNAL_MEASURED, ///< Measured value + CONTROLLER_SIGNAL_ERROR, ///< Error value + CONTROLLER_SIGNAL_ERROR_SUM, ///< Error sum before anti-windup + CONTROLLER_SIGNAL_ERROR_SUM_AFTER_WINDUP, ///< Error sum after anti-windup + CONTROLLER_SIGNAL_PROPORTIONAL_OUTPUT, ///< P portion of controller output signal + CONTROLLER_SIGNAL_INTEGRAL_OUTPUT, ///< I portion of controller output signal + CONTROLLER_SIGNAL_CONTROL, ///< Controller output signal + NUM_OF_CONTROLLER_SIGNAL ///< Number of PI controller signals +} PI_CONTROLLER_SIGNALS_ID; + // ********** public function prototypes ********** void initializePIController( PI_CONTROLLER_ID_T controllerID, F32 initialControlSignal, @@ -64,4 +66,3 @@ /**@}*/ #endif -