Index: firmware/App/Controllers/BloodFlow.c =================================================================== diff -u -r2a368aaf6d568f021e1bba806bf46e1174250f56 -r0a0417a975dc931b8eb05c1e4dc0599aab07492c --- firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision 2a368aaf6d568f021e1bba806bf46e1174250f56) +++ firmware/App/Controllers/BloodFlow.c (.../BloodFlow.c) (revision 0a0417a975dc931b8eb05c1e4dc0599aab07492c) @@ -57,7 +57,7 @@ #define BP_P_COEFFICIENT 0.0001F ///< P term for blood pump control #define BP_I_COEFFICIENT 0.00075F ///< I term for blood pump control -#define BP_HOME_RATE 100 ///< Target pump speed (in estimate mL/min) for homing. +#define BP_HOME_SPEED 400 ///< Target pump speed (in RPM) for homing. #define BP_HOME_TIMEOUT_MS 10000 ///< Maximum time (in ms) allowed for homing to complete. #define BP_MAX_ROTOR_HALL_INTERVAL_MS 20000 ///< Maximum time (in ms) allowed between rotor hall sensor detects (50 mL/min worst case). @@ -111,6 +111,8 @@ #define BP_PWM_FROM_ML_PER_MIN(rate) ( (rate) * BP_ML_PER_MIN_TO_PUMP_RPM_FACTOR * BP_GEAR_RATIO * BP_MOTOR_RPM_TO_PWM_DC_FACTOR + BP_PWM_ZERO_OFFSET ) /// Conversion from PWM duty cycle % to commanded pump motor speed. #define BP_PWM_TO_MOTOR_SPEED_RPM(pwm,dir) ( ( ((pwm) - BP_PWM_ZERO_OFFSET) * 4000.0F ) * ( dir == MOTOR_DIR_FORWARD ? 1.0F : -1.0F ) ) +/// Conversion from RPM to PWM duty cycle %. +#define BP_MOTOR_SPEED_RPM_TO_PWM(rpm) ( ( (F32)(rpm) / 4000.0F ) + BP_PWM_ZERO_OFFSET ) /// Conversion macro from mL/min to estimated PWM duty cycle %. #define BP_ML_PER_MIN_FROM_PWM(pwm) ( ( ( pwm - BP_PWM_ZERO_OFFSET ) / ( BP_ML_PER_MIN_TO_PUMP_RPM_FACTOR * BP_GEAR_RATIO * BP_MOTOR_RPM_TO_PWM_DC_FACTOR ) ) ) @@ -351,6 +353,26 @@ } return result; +} + +/*********************************************************************//** + * @brief + * The setBloodPumpTargetRPM function sets a new target pump speed and pump + * direction. Pump is set to open loop control. + * @details Inputs: none + * @details Outputs: none + * @param rpm new target blood pump speed (in RPM) + * @param dir new blood flow direction + * @return TRUE if new flow rate & direction are set, FALSE if not + *************************************************************************/ +BOOL setBloodPumpTargetRPM( U32 rpm, MOTOR_DIR_T dir ) +{ + BOOL result = FALSE; + F32 pwm = BP_MOTOR_SPEED_RPM_TO_PWM( rpm ); + + result = setBloodPumpTargetFlowRate( (U32)BP_ML_PER_MIN_FROM_PWM( pwm ), dir, PUMP_CONTROL_MODE_OPEN_LOOP ); + + return result; } /*********************************************************************//** @@ -436,7 +458,7 @@ { bpStopAtHomePosition = TRUE; bpHomeStartTime = getMSTimerCount(); - result = setBloodPumpTargetFlowRate( BP_HOME_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP ); + result = setBloodPumpTargetRPM( BP_HOME_SPEED, MOTOR_DIR_FORWARD ); } return result;