Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -ra04e9df50b7cdd4e56481fc37703710fe5ca8995 -r7462b03d6159cb3cd5ffc20ef2914222d69af13c --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision a04e9df50b7cdd4e56481fc37703710fe5ca8995) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 7462b03d6159cb3cd5ffc20ef2914222d69af13c) @@ -7,8 +7,8 @@ * * @file ROPump.c * -* @author (last) Bill Bracken -* @date (last) 24-Oct-2022 +* @author (last) Dara Navaei +* @date (last) 03-Nov-2022 * * @author (original) Sean * @date (original) 04-Apr-2020 @@ -36,6 +36,7 @@ #include "TaskGeneral.h" #include "TaskPriority.h" #include "Timers.h" +#include "Utilities.h" #include "Valves.h" /** @@ -53,6 +54,7 @@ #define ROP_CONTROL_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the RO pump is controlled. #define ROP_FLOW_CONTROL_P_COEFFICIENT 0.15F ///< P term for RO pump flow control. #define ROP_FLOW_CONTROL_I_COEFFICIENT 0.65F ///< I term for RO pump flow control. + #define ROP_MAX_PRESSURE_P_COEFFICIENT 0.01F ///< P term for RO pump max pressure control. #define ROP_MAX_PRESSURE_I_COEFFICIENT 0.01F ///< I term for RO pump max pressure control. #define ROP_PWM_STEP_LIMIT 0.50F ///< Current maximum PWM step limit used in RO Profiles. @@ -388,7 +390,7 @@ } #ifndef _RELEASE_ - if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) != SW_CONFIG_ENABLE_VALUE ) + if ( getHardwareConfigStatus() != HW_CONFIG_BETA ) #endif { // The feedback voltage is on the 0V line so when the duty cycle is 0, the feedback is 2.5V