Index: firmware/App/Services/PIControllers.h =================================================================== diff -u -rea6ff77291eee02f351953b76c6720cf860c8be7 -ra97e98d0f53f5825c5bc400f87f096f418e110cf --- firmware/App/Services/PIControllers.h (.../PIControllers.h) (revision ea6ff77291eee02f351953b76c6720cf860c8be7) +++ firmware/App/Services/PIControllers.h (.../PIControllers.h) (revision a97e98d0f53f5825c5bc400f87f096f418e110cf) @@ -1,54 +1,53 @@ -/************************************************************************** - * - * Copyright (c) 2019-2019 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 PIControllers.h - * - * @date 12-Dec-2019 - * @author L. Baloa - * - * @brief Header file for the PI controllers service (PIControllers.c). - * - **************************************************************************/ - -#ifndef __PICONTROLLERS_H__ -#define __PICONTROLLERS_H__ - -#include "Common.h" - -// ********** public definitions ********** - -typedef enum ControllerList -{ - PI_CONTROLLER_ID_LOAD_CELL = 0, - PI_CONTROLLER_ID_BLOOD_FLOW, - PI_CONTROLLER_ID_DIALYSATE_FLOW, - NUM_OF_PI_CONTROLLERS_IDS -} PI_CONTROLLER_ID_T; - -typedef enum ControllerSignals -{ - CONTROLLER_SIGNAL_REFERENCE = 0, - CONTROLLER_SIGNAL_MEASURED, - CONTROLLER_SIGNAL_ERROR, - CONTROLLER_SIGNAL_ERROR_SUM, - CONTROLLER_SIGNAL_ERROR_SUM_AFTER_WINDUP, - CONTROLLER_SIGNAL_PROPORTIONAL_OUTPUT, - CONTROLLER_SIGNAL_INTEGRAL_OUTPUT, - CONTROLLER_SIGNAL_CONTROL, - NUM_OF_CONTROLLER_SIGNAL -} PI_CONTROLLER_SIGNALS_ID; - -// ********** public function prototypes ********** - -void initializePIController( PI_CONTROLLER_ID_T controllerID, F32 initialControlSignal, - F32 kP, F32 kI, F32 controlMin, F32 controlMax, F32 iMin, F32 iMax ); -void resetPIController( PI_CONTROLLER_ID_T controllerID, F32 initialControlSignal ); -F32 runPIController( PI_CONTROLLER_ID_T controllerID, F32 referenceSignal, F32 measuredSignal ); -F32 getPIControllerSignals( PI_CONTROLLER_ID_T controllerID, PI_CONTROLLER_SIGNALS_ID signalID ); - -#endif - +/************************************************************************** + * + * Copyright (c) 2019-2019 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 PIControllers.h + * + * @date 12-Dec-2019 + * @author L. Baloa + * + * @brief Header file for the PI controllers service (PIControllers.c). + * + **************************************************************************/ + +#ifndef __PICONTROLLERS_H__ +#define __PICONTROLLERS_H__ + +#include "Common.h" + +// ********** public definitions ********** + +typedef enum ControllerList +{ + PI_CONTROLLER_ID_LOAD_CELL = 0, + PI_CONTROLLER_ID_BLOOD_FLOW, + PI_CONTROLLER_ID_DIALYSATE_FLOW, + NUM_OF_PI_CONTROLLERS_IDS +} PI_CONTROLLER_ID_T; + +typedef enum ControllerSignals +{ + CONTROLLER_SIGNAL_REFERENCE = 0, + CONTROLLER_SIGNAL_MEASURED, + CONTROLLER_SIGNAL_ERROR, + CONTROLLER_SIGNAL_ERROR_SUM, + CONTROLLER_SIGNAL_ERROR_SUM_AFTER_WINDUP, + CONTROLLER_SIGNAL_PROPORTIONAL_OUTPUT, + CONTROLLER_SIGNAL_INTEGRAL_OUTPUT, + CONTROLLER_SIGNAL_CONTROL, + NUM_OF_CONTROLLER_SIGNAL +} PI_CONTROLLER_SIGNALS_ID; + +// ********** public function prototypes ********** + +void initializePIController( PI_CONTROLLER_ID_T controllerID, F32 initialControlSignal, + F32 kP, F32 kI, F32 controlMin, F32 controlMax, F32 iMin, F32 iMax ); +void resetPIController( PI_CONTROLLER_ID_T controllerID, F32 initialControlSignal ); +F32 runPIController( PI_CONTROLLER_ID_T controllerID, F32 referenceSignal, F32 measuredSignal ); +F32 getPIControllerSignals( PI_CONTROLLER_ID_T controllerID, PI_CONTROLLER_SIGNALS_ID signalID ); + +#endif