Index: firmware/App/Drivers/FluidPump.c =================================================================== diff -u -r051cd0430ef8342bd606115c98871e26dc24acf1 -r311c75cc5ac41b4b9ca4983df84e43af910f9be4 --- firmware/App/Drivers/FluidPump.c (.../FluidPump.c) (revision 051cd0430ef8342bd606115c98871e26dc24acf1) +++ firmware/App/Drivers/FluidPump.c (.../FluidPump.c) (revision 311c75cc5ac41b4b9ca4983df84e43af910f9be4) @@ -16,7 +16,7 @@ ***************************************************************************/ #include "FluidPump.h" -#include "FpgaRO.h" +#include "FpgaFP.h" #include "Messaging.h" #include "MessageSupport.h" #include "PersistentAlarm.h" @@ -136,7 +136,7 @@ if ( pumpID < NUM_OF_PUMPS ) { pwmCnt = convertDutyCyclePctToCnt( dutyCyclePct ); - result = setFluidPumpPWMDutyCycle (pumpID, pwmCnt); + result = setFluidPumpPWMDutyCycle(pumpID, pwmCnt); } else { @@ -302,7 +302,21 @@ return pwmCnt; } +/*********************************************************************//** + * @brief + * The convertDutyCycleCntToPct function converts a duty cycle counts + * into percentage to read the PWM magnitude. + * @details Inputs: none + * @details Outputs: none + * @param dutyCyclePct duty cycle count to be converted. + * @return Value (0..0.99) indicating magnitude of PWM duty cycle as a percentage. + *************************************************************************/ +F32 convertDutyCycleCntToPct( U32 dutyCycleCnt ) +{ + F32 pwmCnt = (F32)MAX( ( dutyCycleCnt / MAX_FLUID_PUMP_PWM_DUTY_CYCLE ) , MIN_FLUID_PUMP_PWM_DUTY_CYCLE ); + return pwmCnt; +} /************************************************************************* * TEST SUPPORT FUNCTIONS