Index: firmware/App/Modes/Rinseback.c =================================================================== diff -u -r2dd1b02e90c90fcd94bf9b21245282205a963654 -re798f32972642732f325dec07f059f1d5bf5e773 --- firmware/App/Modes/Rinseback.c (.../Rinseback.c) (revision 2dd1b02e90c90fcd94bf9b21245282205a963654) +++ firmware/App/Modes/Rinseback.c (.../Rinseback.c) (revision e798f32972642732f325dec07f059f1d5bf5e773) @@ -42,8 +42,9 @@ #define MAX_TOTAL_ADDITIONAL_RINSEBACK_VOLUME_ML 300.0F ///< Maximum total additional rinseback volume allowed : all additionals (in mL). #define TARGET_ADDITIONAL_RINSEBACK_VOLUME_ML 10.0F ///< Target rinseback volume for an additional volume request (in mL). #define RINSEBACK_FLOW_RATE_ADJ_ML_MIN 25 ///< Adjustment amount (in mL/min) to apply when user requests increase/decrease in flow rate. -#define MIN_RINSEBACK_FLOW_RATE_ML_MIN 50 ///< Minimum rinseback flow rate (in mL/min). -#define MAX_RINSEBACK_FLOW_RATE_ML_MIN 150 ///< Maximum rinseback flow rate (in mL/min). +#define DEFAULT_RINSEBACK_FLOW_RATE_ML_MIN 200 ///< Default rinseback flow rate (in mL/min). +#define MIN_RINSEBACK_FLOW_RATE_ML_MIN 100 ///< Minimum rinseback flow rate (in mL/min). +#define MAX_RINSEBACK_FLOW_RATE_ML_MIN 300 ///< Maximum rinseback flow rate (in mL/min). /// Interval at which rinseback progress is to be published to UI. #define RINSEBACK_DATA_PUBLISH_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) @@ -129,7 +130,6 @@ totalAdditionalRinsebackVolume_mL = 0.0; rinsebackAdditionalTimerCtr = 0; rinsebackPublishTimerCtr = 0; - rinsebackTargetVolume_mL = DEFAULT_RINSEBACK_VOLUME_ML; resetRinsebackFlags(); } @@ -483,8 +483,10 @@ * @brief * The handleRinsebackStoppedState function handles the stopped rinseback * state operations. - * @details Inputs: flags - * @details Outputs: flags handled + * @details Inputs: rinsebackTimerCtr, recircRequested, additionalRinsebackRequested, + * backToTreatmentRequested, endTreatmentRequested + * @details Outputs: additionalRinsebackRequested, rinsebackAdditionalTimerCtr, + * additionalRinsebackVolume_mL, targetRinsebackVolumePlusAdditional_mL * @return next rinseback state *************************************************************************/ static RINSEBACK_STATE_T handleRinsebackStoppedState( void ) @@ -510,7 +512,8 @@ rinsebackAdditionalTimerCtr = 0; additionalRinsebackVolume_mL = 0.0; targetRinsebackVolumePlusAdditional_mL += TARGET_ADDITIONAL_RINSEBACK_VOLUME_ML; - setupForRinsebackDelivery( MIN_RINSEBACK_FLOW_RATE_ML_MIN ); + rinsebackRate_mL_min = DEFAULT_RINSEBACK_FLOW_RATE_ML_MIN; + setupForRinsebackDelivery( rinsebackRate_mL_min ); result = RINSEBACK_RUN_ADDITIONAL_STATE; } }