Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -r58c80a59c771c57ba9047ef4d6da2aa74430a0e3 -r25b2d5e091ddc83b0483f535e440ce232b7219dd --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 58c80a59c771c57ba9047ef4d6da2aa74430a0e3) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 25b2d5e091ddc83b0483f535e440ce232b7219dd) @@ -793,12 +793,12 @@ } else { //Use blended or calculated flow rate - F32 motorRPM = getMeasuredDialInPumpRotorSpeed(); - U32 r = getDialInPumpRotorCount(); - U32 rotCount = CAP( r, DIAL_IN_MAX_ROTOR_COUNT_FOR_WEAR ); - F32 wearFactor = DIAL_IN_FLOW_WEAR_A_TERM * (F32)rotCount + DIAL_IN_FLOW_WEAR_B_TERM; - F32 Pest = DIAL_IN_FLOW_PEST_A_TERM * ( QdTarget * QdTarget ) + DIAL_IN_FLOW_PEST_B_TERM * QdTarget + DIAL_IN_FLOW_PEST_C_TERM; - F32 alphaTerm = wearFactor * Pest + DIAL_IN_FLOW_A_ZERO; + F32 motorRPM = getMeasuredDialInPumpRotorSpeed(); + U32 r = getDialInPumpRotorCount(); + U32 rotCount = CAP( r, DIAL_IN_MAX_ROTOR_COUNT_FOR_WEAR ); + F32 wearFactor = DIAL_IN_FLOW_WEAR_A_TERM * (F32)rotCount + DIAL_IN_FLOW_WEAR_B_TERM; + F32 Pest = DIAL_IN_FLOW_PEST_A_TERM * ( QdTarget * QdTarget ) + DIAL_IN_FLOW_PEST_B_TERM * QdTarget + DIAL_IN_FLOW_PEST_C_TERM; + F32 alphaTerm = wearFactor * Pest + DIAL_IN_FLOW_A_ZERO; F32 calculatedFlow = ( motorRPM * 2 * DIAL_IN_STROKE_VOLUME/DIAL_IN_GEAR_RATIO ) * alphaTerm; @@ -835,7 +835,7 @@ F32 Pest = DIAL_IN_FLOW_PEST_A_TERM * ( QdTarget * QdTarget ) + DIAL_IN_FLOW_PEST_B_TERM * QdTarget + DIAL_IN_FLOW_PEST_C_TERM; F32 alphaTerm = wearFactor * Pest + DIAL_IN_FLOW_A_ZERO; - F32 correctedPWM = ( QdTarget * DIAL_IN_GEAR_RATIO/ ( 2 * DIAL_IN_STROKE_VOLUME * alphaTerm ); + F32 correctedPWM = QdTarget * DIAL_IN_GEAR_RATIO / ( 2 * DIAL_IN_STROKE_VOLUME * alphaTerm ); return correctedPWM; }