Index: firmware/App/Services/Reservoirs.c =================================================================== diff -u -rf9570a9717805d0759622da836a33ee04f3fa40f -rfb1673d2282822995ed233f3e9ea5dfb0567780d --- firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision f9570a9717805d0759622da836a33ee04f3fa40f) +++ firmware/App/Services/Reservoirs.c (.../Reservoirs.c) (revision fb1673d2282822995ed233f3e9ea5dfb0567780d) @@ -18,8 +18,8 @@ // ********** private definitions ********** -#define RESERVOIR_SETTLE_TIME_MS 5000 ///< Allocated time to settle the filled reservoir in milliseconds. -#define RESERVOIR_CYCLE_EXTRA_MARGIN_TIME_MS 8000 ///< Reservoir extra time in during the cycle for error in milliseconds. +#define RESERVOIR_SETTLE_TIME_MS 5000 ///< Allocated time to settle the filled reservoir in milliseconds. +#define RESERVOIR_CYCLE_EXTRA_MARGIN_TIME_MS 8000 ///< Reservoir extra time in during the cycle for error in milliseconds. #define MAX_RESERVOIR_VOLUME_ML 1950.0 ///< Maximum allowed fluid in a reservoir in milliliters. #define MAX_RESERVOIR_DILUTION 0.15F ///< Maximum reservoir dilution limit. @@ -64,7 +64,7 @@ static F32 dilutionLevelPct = 0.0; ///< Reservoir dilution level. static DG_OP_MODE_T dgOpMode = DG_MODE_INIT; ///< DG operation mode. static U32 dgSubMode = 0; ///< DG operation submode. -static U32 timeReservoirInUse = 0; ///< Reservoir time in use in milliseconds. +static U32 timeReservoirInUse = 0; ///< Reservoir time in use in milliseconds. static F32 volSpentUFML = 0.0; ///< Ultrafiltration volume in milliliters. static DG_RESERVOIR_ID_T activeReservoir; ///< Active reservoir. static F32 recirculationLevelPct = 0.0; ///< Recirculation level in percent. @@ -152,8 +152,8 @@ * @brief * The execReservoirs function executes the state machine for the treatment * reservoir management during treatment mode. - * @details Inputs: reservoirsStatus - * @details Outputs: reservoirsStatus + * @details Inputs: reservoirsState + * @details Outputs: reservoirsState, timeReservoirInUse, volSpentML * @return none *************************************************************************/ void execReservoirs( void ) @@ -178,7 +178,6 @@ if ( TREATMENT_DIALYSIS_STATE == getTreatmentState()) { - ++timeReservoirInUse; } } @@ -566,7 +565,6 @@ { SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE, recirculationLevelPct ) } - } // Check if DG has moved out of the fill mode