Index: firmware/App/Controllers/DialOutFlow.c =================================================================== diff -u -r3f97bee8c0d90048910ba7a79935bb751cc46c85 -rae1bfe66844d660e3228c5d99e99149bd1884f1a --- firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision 3f97bee8c0d90048910ba7a79935bb751cc46c85) +++ firmware/App/Controllers/DialOutFlow.c (.../DialOutFlow.c) (revision ae1bfe66844d660e3228c5d99e99149bd1884f1a) @@ -103,11 +103,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. @@ -1645,10 +1645,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 ) @@ -1670,5 +1671,4 @@ return result; } - /**@}*/