Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -rb92c26da32bed791d9836391080eacf19f221de6 -r27566fb95c3865851e3b0b4bd4668474bfdbfcde --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision b92c26da32bed791d9836391080eacf19f221de6) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 27566fb95c3865851e3b0b4bd4668474bfdbfcde) @@ -53,8 +53,8 @@ #define DATA_PUBLISH_COUNTER_START_COUNT 10 ///< Data publish counter start count. -#define ROP_FLOW_TO_PWM_PCT(flow) ( ( ROP_FLOW_TO_PWM_SLOPE * flow + ROP_FLOW_TO_PWM_INTERCEPT ) / MAX_FLUID_PUMP_PWM_DUTY_CYCLE ) ///< PWM line equation for flow. -#define ROP_PRESSURE_TO_PWM_PCT(pres) ( ( ROP_PRESSURE_TO_PWM_SLOPE * pres + ROP_PRESSURE_TO_PWM_INTERCEPT ) / MAX_FLUID_PUMP_PWM_DUTY_CYCLE ) ///< PWM line equation for pressure. +#define ROP_FLOW_TO_PWM_PCT(flow) ( ( ROP_FLOW_TO_PWM_SLOPE * flow + ROP_FLOW_TO_PWM_INTERCEPT ) / MAX_FLUID_PUMP_PWM_DUTY_CYCLE ) ///< PWM line equation for flow converted to percentage. +#define ROP_PRESSURE_TO_PWM_PCT(pres) ( ( ROP_PRESSURE_TO_PWM_SLOPE * pres + ROP_PRESSURE_TO_PWM_INTERCEPT ) / MAX_FLUID_PUMP_PWM_DUTY_CYCLE ) ///< PWM line equation for pressure. converted to percentage // ********** private data ********** @@ -534,7 +534,7 @@ *************************************************************************/ static F32 roPumpPresToPWM( F32 targetPressure ) { - F32 dutyCyclePct = ROP_PRESSURE_TO_PWM( targetPressure ); + F32 dutyCyclePct = ROP_PRESSURE_TO_PWM_PCT( targetPressure ); return dutyCyclePct; } @@ -550,7 +550,7 @@ *************************************************************************/ static F32 roPumpFlowToPWM( U32 targetFlow ) { - F32 dutyCyclePct = ROP_FLOW_TO_PWM( targetFlow ); + F32 dutyCyclePct = ROP_FLOW_TO_PWM_PCT( targetFlow ); return dutyCyclePct; }