Index: firmware/App/Controllers/DialInFlow.c =================================================================== diff -u -r6788d3f0fe41ee36ac7e9d4bd8e0f407f9fc2c4b -r48278ac6fa3738a97349ed7f3278773daf1d8004 --- firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 6788d3f0fe41ee36ac7e9d4bd8e0f407f9fc2c4b) +++ firmware/App/Controllers/DialInFlow.c (.../DialInFlow.c) (revision 48278ac6fa3738a97349ed7f3278773daf1d8004) @@ -921,20 +921,67 @@ } /************************************************************************* - * @brief testSetTargetDialInFlowRateOverride and testResetTargetDialInFlowRateOverride + * @brief * The testSetTargetDialInFlowRateOverride function overrides the target \n - * dialIn flow rate. \n - * The testResetTargetDialInFlowRateOverride function resets the override of the \n - * target dialIn flow rate. + * dialysate inlet flow rate. \n * @details * Inputs : none * Outputs : targetDialInFlowRate - * @param value : override target dialIn flow rate (in mL/min) + * @param value : override target dialysate inlet flow rate (in mL/min) * @return TRUE if override successful, FALSE if not *************************************************************************/ -DATA_OVERRIDE_FUNC( S32, testSetTargetDialInFlowRateOverride, testResetTargetDialInFlowRateOverride, targetDialInFlowRate ) +BOOL testSetTargetDialInFlowRateOverride( S32 value ) +{ + BOOL result = FALSE; + if ( TRUE == isTestingActivated() ) + { + MOTOR_DIR_T dir; + + if ( value < 0 ) + { + dir = MOTOR_DIR_REVERSE; + } + else + { + dir = MOTOR_DIR_FORWARD; + } + targetDialInFlowRate.ovInitData = targetDialInFlowRate.data; // backup current target flow rate + targetDialInFlowRate.ovData = value; + targetDialInFlowRate.override = OVERRIDE_KEY; + result = setDialInPumpTargetFlowRate( ABS(value), dir, dialInPumpControlMode ); + } + + return result; +} + /************************************************************************* + * @brief + * The testResetTargetDialInFlowRateOverride function resets the override of the \n + * target dialysate inlet flow rate. + * @details + * Inputs : none + * Outputs : targetDialInFlowRate + * @param none + * @return TRUE if override reset successful, FALSE if not + *************************************************************************/ +BOOL testResetTargetDialInFlowRateOverride( void ) +{ + BOOL result = FALSE; + + if ( TRUE == isTestingActivated() ) + { + targetDialInFlowRate.data = targetDialInFlowRate.ovInitData; // restore pre-override target flow rate + targetDialInFlowRate.override = OVERRIDE_RESET; + targetDialInFlowRate.ovInitData = 0; + targetDialInFlowRate.ovData = 0; + result = setDialInPumpTargetFlowRate( targetDialInFlowRate.data, dialInPumpDirection, dialInPumpControlMode ); + } + + return result; +} + +/************************************************************************* * @brief testSetMeasuredDialInFlowRateOverride and testResetMeasuredDialInFlowRateOverride * The testResetMeasuredDialInFlowRateOverride function overrides the measured \n * dialIn flow rate. \n