Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r5a7668973976b88515dbff4d533dbf6b2576cc0f -r758a99a0d337b57b20887a90661f9712f071a45a --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 5a7668973976b88515dbff4d533dbf6b2576cc0f) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 758a99a0d337b57b20887a90661f9712f071a45a) @@ -88,7 +88,8 @@ #define MAX_PRESSURE_OUT_OF_RANGE_PERSISTENT_INTERVAL MS_PER_SECOND ///< Maximum allowed time that the pressure can be very high. #define MAX_ALLOWED_RAMP_UP_TIME ( 10 * MS_PER_SECOND ) ///< Maximum allowed ramp up time to a flow rate in ms. #define MAX_ALLOWED_RO_PUMP_PWM_PERCENT ( 0.95F ) ///< Maximum allowed RO Pump PWM . -#define MAX_RO_PUMP_PWM_PERSISTENT_INTERVAL ( 30 * MS_PER_SECOND ) ///< Maximum allowed time that ROPump PWM can be high in ms. +#define MAX_RO_PUMP_PWM_PERSISTENT_INTERVAL ( 30 * MS_PER_SECOND ) ///< Maximum allowed time that ROPump PWM exceeded max in ms. +#define MAX_RO_PUMP_PWM_CLEAR_INTERVAL ( MS_PER_SECOND ) ///< Maximum clear time for ROPump PWM max exceeded in ms. #define ROP_PSI_TO_PWM_DC(p) ( 0.2F + ( (F32)((p) - 100) * 0.01F ) ) ///< Conversion factor from target PSI to PWM duty cycle estimate. #define SAFETY_SHUTDOWN_TIMEOUT ( 3 * MS_PER_SECOND ) ///< RO pump safety shutdown activation timeout in ms. @@ -200,7 +201,7 @@ initPersistentAlarm( ALARM_ID_DG_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE, SAFETY_SHUTDOWN_TIMEOUT, SAFETY_SHUTDOWN_TIMEOUT ); // Initialize the persistent alarm for maximum RO PWM exceeded - initPersistentAlarm( ALARM_ID_DG_MAX_RO_PUMP_PWM_EXCEEDED, 0, MAX_RO_PUMP_PWM_PERSISTENT_INTERVAL ); + initPersistentAlarm( ALARM_ID_DG_MAX_RO_PUMP_PWM_EXCEEDED, MAX_RO_PUMP_PWM_CLEAR_INTERVAL, MAX_RO_PUMP_PWM_PERSISTENT_INTERVAL ); // Initialize the variables roControlTimerCounter = 0;