Index: firmware/App/Modes/ModeTreatment.c =================================================================== diff -u -r48063d4ace2df447fc43af9bf321ae207c54561f -rf1f47c63c7128d8aa341ba6f427d1398aba9caa8 --- firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision 48063d4ace2df447fc43af9bf321ae207c54561f) +++ firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision f1f47c63c7128d8aa341ba6f427d1398aba9caa8) @@ -72,7 +72,7 @@ static BOOL treatmentCompleted; ///< Flag indicates whether the treatment has completed. static U32 presTreatmentTimeSecs; ///< Prescribed treatment time (in seconds). -static F32 presUFVolumeL; ///< Prescribed ultrafiltration volume (in L). +static F32 presUFVolumeMl; ///< Prescribed ultrafiltration volume (in L). static F32 presUFRateMlMin; ///< Prescribed ultrafiltration rate (in mL/Min). static U32 treatmentTimeMS; ///< Elapsed treatment time (in ms). @@ -158,7 +158,7 @@ salineBolusBroadcastTimerCtr = SALINE_BOLUS_DATA_PUB_INTERVAL; // So we send saline bolus data immediately when we begin treatment mode presTreatmentTimeSecs = 0; - presUFVolumeL = 0.0F; + presUFVolumeMl = 0.0F; presUFRateMlMin = 0.0F; resetSignalFlags(); @@ -207,9 +207,9 @@ // Set treatment parameters presTreatmentTimeSecs = getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ) * SEC_PER_MIN; - presUFVolumeL = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME ); - presUFRateMlMin = ( presUFVolumeL * (F32)ML_PER_LITER ) / (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ); - setDialysisDDParams( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presUFVolumeL, presUFRateMlMin ); + presUFVolumeMl = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME ) * (F32)ML_PER_LITER; + presUFRateMlMin = presUFVolumeMl / (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ); + setDialysisDDParams( getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW ), presUFVolumeMl, presUFRateMlMin ); bicarbConvFactor = BICARBONATE_CONVERSION_FACTOR; // Direct DD to generate dialysate and bypass while priming blood @@ -1128,7 +1128,7 @@ * @brief * The publishUltrafiltrationData function publishes the ultrafiltration data * at the set time interval. - * @details \b Inputs: presUFVolumeL, presUFRate + * @details \b Inputs: none * @details \b Outputs: none * @return none *************************************************************************/ @@ -1138,6 +1138,7 @@ { UF_DATA_PAYLOAD_T data; F32 presUFRateLHr = 0.0F; + F32 presUFVolumeL = getTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME ); presUFRateLHr = presUFVolumeL / ( (F32)getTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION ) / (F32)MIN_PER_HOUR ); data.setUFVolumeL = presUFVolumeL; Index: firmware/App/Modes/StateTxDialysis.c =================================================================== diff -u -rb87bac344f39b289e83d4794fba4e53cf3dac94a -rf1f47c63c7128d8aa341ba6f427d1398aba9caa8 --- firmware/App/Modes/StateTxDialysis.c (.../StateTxDialysis.c) (revision b87bac344f39b289e83d4794fba4e53cf3dac94a) +++ firmware/App/Modes/StateTxDialysis.c (.../StateTxDialysis.c) (revision f1f47c63c7128d8aa341ba6f427d1398aba9caa8) @@ -221,7 +221,7 @@ * @details \b Inputs: none * @details \b Outputs: setDialysateFlowRate, setUFVolumeL, setUFRateMlMin * @param qd target dialysate flow rate (in mL/min) - * @param ufVol target ultrafiltration volume (in L) + * @param ufVol target ultrafiltration volume (in mL) * @param quf target ultrafiltration flow rate (in mL/min) * @return none *************************************************************************/