Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r784b7a236acff547afd6de08a17294e419a80416 -r719751a981f23c2beb68b9b3eeaf31a0aa1fe212 --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 784b7a236acff547afd6de08a17294e419a80416) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 719751a981f23c2beb68b9b3eeaf31a0aa1fe212) @@ -85,7 +85,7 @@ #define MAX_ALLOWED_MEASURED_PRESSURE_PSI 135 ///< Maximum allowed pressure that the sensor measures. RO pump shut off pressure is 140psi. #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_ROPUMP_PWM_PERCENT ( 0.95F ) ///< Maximum allowed RO Pump PWM . +#define MAX_ALLOWED_RO_PUMP_PWM_PERCENT ( 0.95F ) ///< Maximum allowed RO Pump PWM . #define MAX_ROPUMP_PWM_PERSISTENT_INTERVAL ( MS_PER_SECOND ) ///< Maximum allowed time that ROPump PWM can be high 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. @@ -811,8 +811,8 @@ etpwmSetCmpB( etpwmREG2, (U32)( (S32)( ( dutyCycle * (F32)(etpwmREG2->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) ); // See if the maximum PWM alarm has occurred - bool isMaxPWM = dutyCycle > MAX_ALLOWED_ROPUMP_PWM_PERCENT ? TRUE : FALSE; - checkPersistentAlarm( ALARM_ID_DG_RO_PUMP_PRESSURE_OUT_OF_RANGE, isMaxPWM, dutyCycle, MAX_ALLOWED_ROPUMP_PWM_PERCENT ); + bool isMaxPWM = dutyCycle > MAX_ALLOWED_RO_PUMP_PWM_PERCENT ? TRUE : FALSE; + checkPersistentAlarm( ALARM_ID_DG_MAX_RO_PUMP_PWM_EXCEEDED, isMaxPWM, dutyCycle, MAX_ALLOWED_RO_PUMP_PWM_PERCENT ); }