Index: firmware/App/Services/Reservoirs.c =================================================================== diff -u -r1d07de4e970f54f2ae1786ef546cf5567df9ba8e -r704eea3d84b2372670e109eb21dee4e3f089898b --- firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 1d07de4e970f54f2ae1786ef546cf5567df9ba8e) +++ firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 704eea3d84b2372670e109eb21dee4e3f089898b) @@ -51,10 +51,7 @@ #define MAX_RESERVOIR_DEPLETION_TIME_MS ( 30 * SEC_PER_MIN * MS_PER_SECOND ) ///< Maximum allowed depletion time in milliseconds. #define RESERVOIR_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the reservoir data is published on the CAN bus. -#define DIALYSATE_FLOW_RATE_350_ML_PER_MIN 0.35F ///< Dialysate flow rate 350 mL/min. -#define DIALYSATE_FLOW_RATE_550_ML_PER_MIN 0.55F ///< Dialysate flow rate 550 mL/min. -#define TGT_FILL_FLOW_FOR_DIA_FLOW_100_TO_350_ML_PER_MIN 0.5F ///< Target fill flow rate for dialysate flow rates in between 100 to 350 mL/min. -#define TGT_FILL_FLOW_FOR_DIA_FLOW_550_TO_600_ML_PER_MIN 0.8F ///< Target fill flow rate for dialysate flow rates in between 500 to 600 mL/min. +#define TGT_FILL_FLOW_800_ML_PER_MIN 0.8F ///< Target fill flow rate 800 mL/min. #define TGT_FILL_FLOW_ERROR_ALLOWANCE 0.9F ///< Target fill flow rate for dialysate allowed error percentage. #define DIA_FLOW_TO_FILL_FLOW_SECOND_ORDER_COEFF 10.0F ///< Dialysate flow rate to fill flow rate second order coefficient. @@ -316,27 +313,8 @@ *************************************************************************/ static F32 getTargetFillFlowRateLPM( void ) { - F32 fillFlowRate = 0.0; + F32 fillFlowRate = TGT_FILL_FLOW_800_ML_PER_MIN; - // Get the current dialysate flow rate set by the user and convert it L/min - F32 dialysateFlow = (F32)getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ) / ML_PER_LITER; - - if ( dialysateFlow <= DIALYSATE_FLOW_RATE_350_ML_PER_MIN ) - { - fillFlowRate = TGT_FILL_FLOW_FOR_DIA_FLOW_100_TO_350_ML_PER_MIN; - } - else if ( dialysateFlow >= DIALYSATE_FLOW_RATE_550_ML_PER_MIN ) - { - fillFlowRate = TGT_FILL_FLOW_FOR_DIA_FLOW_550_TO_600_ML_PER_MIN; - } - else - { - // fill flow = linear interpolation between 350 MLP and 550MLP - fillFlowRate = TGT_FILL_FLOW_FOR_DIA_FLOW_100_TO_350_ML_PER_MIN - + ( ( dialysateFlow - DIALYSATE_FLOW_RATE_350_ML_PER_MIN ) / (DIALYSATE_FLOW_RATE_550_ML_PER_MIN - DIALYSATE_FLOW_RATE_350_ML_PER_MIN ) ) - * ( TGT_FILL_FLOW_FOR_DIA_FLOW_550_TO_600_ML_PER_MIN - TGT_FILL_FLOW_FOR_DIA_FLOW_100_TO_350_ML_PER_MIN ); - } - targetFillFlowLPM = fillFlowRate; return fillFlowRate;