Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -rb20421d84b9049977c04f4752f4fc5697425f25c -r6ba3eebfe02e3918402e30e0bd775bcfbcb06443 --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision b20421d84b9049977c04f4752f4fc5697425f25c) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 6ba3eebfe02e3918402e30e0bd775bcfbcb06443) @@ -111,7 +111,7 @@ /// Conversion from PWM duty cycle % to commanded pump motor speed. PWM range is 10% to 90%. RPM range is 0 to 3200. 3200 / 0.8 = 4000. #define DIP_PWM_TO_MOTOR_SPEED_RPM(pwm) ( ((pwm) - DIP_PWM_ZERO_OFFSET) * 4000.0F ) // Macro converts PWM to estimate flow rate needed to achieve it. -#define DIP_ML_PER_MIN_FROM_PWM(pwm) ( (( pwm - DIP_PWM_ZERO_OFFSET) * 684.73 ) + 49.121 ) +#define DIP_ML_PER_MIN_FROM_PWM(pwm) ( (( pwm - DIP_PWM_ZERO_OFFSET) * 684.73F ) + 49.121F ) /// Measured dialIn flow is filtered w/ moving average. @@ -264,11 +264,10 @@ * @details Outputs: targetDialInFlowRate, dialInPumpdirection, dialInPumpPWMDutyCyclePct * @param flowRate new target dialIn flow rate * @param dir new dialIn flow direction - * @param mode new control mode - * @param pwm PWM duty cycle to set pump controller to (optional for open loop) + * @param mode new control mode * @return TRUE if new flow rate & dir are set, FALSE if not *************************************************************************/ -BOOL setDialInPumpTargetFlowRate( U32 flowRate, MOTOR_DIR_T dir, PUMP_CONTROL_MODE_T mode) +BOOL setDialInPumpTargetFlowRate( U32 flowRate, MOTOR_DIR_T dir, PUMP_CONTROL_MODE_T mode ) { BOOL result = FALSE; @@ -1646,10 +1645,11 @@ /*********************************************************************//** * @brief - * The testSetDialInPumpTargetDutyCycle function resets the override of the - * measured dialIn pump motor current. + * The testSetDialInPumpTargetDutyCycle function sets the duty cycle of the + * dialysate inlet pump by calling setDialInPumpTargetFlowRate. * @details Inputs: none - * @details Outputs: adcDialInPumpMCCurrentmA + * @details Outputs: none + * @param value duty cycle of the dialysate inlet pump (as a percentage). * @return TRUE if reset successful, FALSE if not *************************************************************************/ BOOL testSetDialInPumpTargetDutyCycle( F32 value )