Index: firmware/App/HDCommon.h =================================================================== diff -u -r07a39ac5f935a84b2dbb93e3f3d3b3eaa8f37cc4 -re01f7b4be218971dafea65aa21e3ae4d3b4ab610 --- firmware/App/HDCommon.h (.../HDCommon.h) (revision 07a39ac5f935a84b2dbb93e3f3d3b3eaa8f37cc4) +++ firmware/App/HDCommon.h (.../HDCommon.h) (revision e01f7b4be218971dafea65aa21e3ae4d3b4ab610) @@ -25,7 +25,7 @@ #define HD_VERSION_MAJOR 0 #define HD_VERSION_MINOR 6 #define HD_VERSION_MICRO 0 -#define HD_VERSION_BUILD 190 +#define HD_VERSION_BUILD 192 // ********** development build switches ********** Index: firmware/App/Modes/ModeTreatment.c =================================================================== diff -u -r07a39ac5f935a84b2dbb93e3f3d3b3eaa8f37cc4 -re01f7b4be218971dafea65aa21e3ae4d3b4ab610 --- firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision 07a39ac5f935a84b2dbb93e3f3d3b3eaa8f37cc4) +++ firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision e01f7b4be218971dafea65aa21e3ae4d3b4ab610) @@ -8,7 +8,7 @@ * @file ModeTreatment.c * * @author (last) Sean Nash -* @date (last) 17-Jul-2023 +* @date (last) 19-Jul-2023 * * @author (original) Dara Navaei * @date (original) 05-Nov-2019 @@ -1135,19 +1135,8 @@ { pendingUFRateChange = 0.0; } - // Verify treatment duration change would be valid (leave zero if not valid - UI will disable option) - if ( ( trtTime <= MAX_TREATMENT_TIME_MINUTES ) && ( trtTime >= getMinTreatmentTimeInMinutes() ) && - ( dialVolume <= MAX_DIALYSATE_VOLUME_ML ) ) - { - result = TRUE; - pendingUFVolumeChange = uFVolume; - pendingTreatmentTimeChange = trtTime; - timeDiff = trtTime - ( (U32)( (F32)presTreatmentTimeSecs / (F32)SEC_PER_MIN ) + 1 ); - } - else - { - pendingTreatmentTimeChange = 0; - } + // Treatment duration change is now never valid - leave zero - UI will disable option) + pendingTreatmentTimeChange = 0; // If neither option works, reject for UF rate if ( FALSE == result ) { @@ -1209,14 +1198,9 @@ presMaxUFVolumeML = pendingUFVolumeChange; setTreatmentParameterF32( TREATMENT_PARAM_UF_VOLUME, ( presMaxUFVolumeML / (F32)ML_PER_LITER ) ); - // Which setting does user want to adjust to accommodate the UF volume change? (treatment time or UF rate) - if ( UF_ADJ_TREATMENT_TIME == adjustment ) + // User should only allow UF rate adjustment to achieve UF volume change + if ( UF_ADJ_UF_RATE == adjustment ) { - presTreatmentTimeSecs = pendingTreatmentTimeChange * SEC_PER_MIN; - setTreatmentParameterU32( TREATMENT_PARAM_TREATMENT_DURATION, ( presTreatmentTimeSecs / SEC_PER_MIN ) ); - } - else // Must be adjusting UF rate then - { sendTreatmentLogEventData( UF_RATE_CHANGE_EVENT, presUFRate, pendingUFRateChange ); presUFRate = pendingUFRateChange; signalInitiatePressureStabilization(); Index: firmware/App/Services/Reservoirs.c =================================================================== diff -u -r07a39ac5f935a84b2dbb93e3f3d3b3eaa8f37cc4 -re01f7b4be218971dafea65aa21e3ae4d3b4ab610 --- firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision 07a39ac5f935a84b2dbb93e3f3d3b3eaa8f37cc4) +++ firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision e01f7b4be218971dafea65aa21e3ae4d3b4ab610) @@ -7,8 +7,8 @@ * * @file Reservoirs.c * -* @author (last) Dara Navaei -* @date (last) 12-Jul-2023 +* @author (last) Sean Nash +* @date (last) 18-Jul-2023 * * @author (original) Dara Navaei * @date (original) 21-Nov-2021 @@ -238,20 +238,6 @@ /*********************************************************************//** * @brief - * The setDialysateHeatingParams function is an API to call other internal - * functions to set the trimmer's heater target temperature and times that are - * required to calculated the heaters target temperature in DG. - * @details Inputs: none - * @details Outputs: none - * @return none - *************************************************************************/ -void setDialysateHeatingParams( void ) -{ - calculateActiveReservoirCycleTime(); -} - -/*********************************************************************//** - * @brief * The getLastReservoirUFTimeInMs function returns the reservoir ultrafiltration * time (in ms) for the last reservoir used in treatment. * @details Inputs: none