Index: firmware/App/Controllers/DialOutFlow.c =================================================================== diff -u -r1fb211e6161cb3df67a0ac6db8743116cb451555 -r6ba3eebfe02e3918402e30e0bd775bcfbcb06443 --- firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision 1fb211e6161cb3df67a0ac6db8743116cb451555) +++ firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision 6ba3eebfe02e3918402e30e0bd775bcfbcb06443) @@ -105,11 +105,11 @@ #define DOP_PWM_ZERO_OFFSET 0.1F ///< 10% PWM duty cycle = zero speed. /// Macro converts a flow rate to an estimated PWM duty cycle %. -#define DOP_PWM_FROM_ML_PER_MIN(rate) ( ( ( rate ) * 0.0009 ) + 0.0972 + DOP_PWM_ZERO_OFFSET ) +#define DOP_PWM_FROM_ML_PER_MIN(rate) ( ( ( rate ) * 0.0009F ) + 0.0972F + DOP_PWM_ZERO_OFFSET ) /// Conversion from PWM duty cycle % to commanded pump motor speed. #define DOP_PWM_TO_MOTOR_SPEED_RPM(pwm) ( ( ( pwm ) - DOP_PWM_ZERO_OFFSET) * 4000.0F ) /// Macro converts a PWM to an estimated flow rate. -#define DOP_ML_PER_MIN_FROM_PWM(pwm) ( ( ( pwm - DOP_PWM_ZERO_OFFSET ) - 0.0972 ) / 0.0009 ) +#define DOP_ML_PER_MIN_FROM_PWM(pwm) ( ( ( pwm - DOP_PWM_ZERO_OFFSET ) - 0.0972F ) / 0.0009F ) #define PUMP_DIR_ERROR_COUNT_MASK 0x3F ///< Bit mask for pump direction error counter. #define DOP_MIN_DIR_CHECK_SPEED_RPM 10.0F ///< Minimum motor speed before we check pump direction. @@ -1647,10 +1647,11 @@ /*********************************************************************//** * @brief - * The testSetDialInPumpTargetDutyCycle function resets the override of the - * measured dialIn pump motor current. + * The testSetBloodPumpTargetDutyCycle function sets the duty cycle of the + * blood pump by calling setDialOutPumpTargetRate. * @details Inputs: none - * @details Outputs: adcDialInPumpMCCurrentmA + * @details Outputs: none + * @param value duty cycle of the dialysate outlet pump (as a percentage). * @return TRUE if reset successful, FALSE if not *************************************************************************/ BOOL testSetDialOutPumpTargetDutyCycle( F32 value ) @@ -1672,5 +1673,4 @@ return result; } - /**@}*/