Index: firmware/App/Controllers/DialysatePumps.c =================================================================== diff -u -r67b9e7ce05b6b2592a0cca8429915dcbfc36734b -rb4e581d847579ffd65e15822b67def7f64212481 --- firmware/App/Controllers/DialysatePumps.c (.../DialysatePumps.c) (revision 67b9e7ce05b6b2592a0cca8429915dcbfc36734b) +++ firmware/App/Controllers/DialysatePumps.c (.../DialysatePumps.c) (revision b4e581d847579ffd65e15822b67def7f64212481) @@ -77,7 +77,7 @@ #define DEGAS_PUMP_INTERCEPT_FACTOR 0.1153F ///< Dialysate pump target pressure addition factor ( b factor in 'y = mx + b' equation) #define MAX_ALLOWED_RPM_OUT_OF_RANGE 300 ///< Maximum allowed RPM out of range from target RPM in open loop. -#define PUMP_TRANS_TO_RAMP_SPEED_THRESHOLD 20.0F ///< Speed change that alters the state to ramp during control state. +#define PUMP_TRANS_TO_RAMP_SPEED_THRESHOLD 100.0F ///< Speed change that alters the state to ramp during control state. #define RPM_OUT_OF_RANGE_TIME_OUT ( 10 * MS_PER_SECOND ) ///< Open loop RPM out of range time out in ms. #define SAFETY_SHUTDOWN_TIMEOUT ( 1 * MS_PER_SECOND ) ///< Dialysate pump safety shutdown activation timeout. Index: firmware/App/Controllers/SpentChamberFill.h =================================================================== diff -u -re6415d33321e7990c3b5e82b0c8a87c64cc3a2c8 -rb4e581d847579ffd65e15822b67def7f64212481 --- firmware/App/Controllers/SpentChamberFill.h (.../SpentChamberFill.h) (revision e6415d33321e7990c3b5e82b0c8a87c64cc3a2c8) +++ firmware/App/Controllers/SpentChamberFill.h (.../SpentChamberFill.h) (revision b4e581d847579ffd65e15822b67def7f64212481) @@ -33,7 +33,7 @@ #define FRESH_DIAL_FILL_PRESSURE_MIN_PSIG 22.0F ///< Minimum fresh dialysate pressure (D18) limit for spent chamber fill operations. #define FRESH_DIAL_FILL_PRESSURE_MAX_PSIG 30.0F ///< Maximum fresh dialysate pressure (D18) limit for spent chamber fill operations. -#define SPENT_DIAL_FILL_PRESSURE_MIN_PSIG 24.0F ///< Minimum spent dialysate pressure (D51) limit for spent chamber fill operations. +#define SPENT_DIAL_FILL_PRESSURE_MIN_PSIG 10.0F ///< Minimum spent dialysate pressure (D51) limit for spent chamber fill operations. #define SPENT_DIAL_FILL_PRESSURE_MAX_PSIG 30.0F ///< Maximum spent dialysate pressure (D51) limit for spent chamber fill operations. /// spent chamber fill data structure Index: firmware/App/Modes/ModeGenDialysate.c =================================================================== diff -u -rac1d91ed684d7c4fd67e7aa3352b90c93b81675d -rb4e581d847579ffd65e15822b67def7f64212481 --- firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision ac1d91ed684d7c4fd67e7aa3352b90c93b81675d) +++ firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision b4e581d847579ffd65e15822b67def7f64212481) @@ -624,9 +624,10 @@ *************************************************************************/ static DD_GEND_MODE_STATE_T handleGenDDialysateDeliveryState( void ) { - DD_GEND_MODE_STATE_T state = DD_GEND_DIALYSATE_DELIVERY_STATE; - LEVEL_STATE_T spentChamberLevel = getLevelStatus( D46_LEVL ); - LEVEL_STATE_T bicarbChamberLevel = getLevelStatus( D63_LEVL ); + DD_GEND_MODE_STATE_T state = DD_GEND_DIALYSATE_DELIVERY_STATE; + LEVEL_STATE_T spentChamberLevel = getLevelStatus( D46_LEVL ); + LEVEL_STATE_T bicarbChamberLevel = getLevelStatus( D63_LEVL ); + BOOL balancingChambFillInProgress = getBalancingChamberFillinProgressStatus(); // if TD asks for bypass or dialysate is not good to deliver //transition to bypass dialystate state Index: firmware/App/Modes/ModeGenDialysate.h =================================================================== diff -u -r812ad8c00b6e976736cc3af210adeaa125f5478d -rb4e581d847579ffd65e15822b67def7f64212481 --- firmware/App/Modes/ModeGenDialysate.h (.../ModeGenDialysate.h) (revision 812ad8c00b6e976736cc3af210adeaa125f5478d) +++ firmware/App/Modes/ModeGenDialysate.h (.../ModeGenDialysate.h) (revision b4e581d847579ffd65e15822b67def7f64212481) @@ -33,7 +33,7 @@ #define FRESH_DIAL_PUMP_INITIAL_RPM 2500 ///< Nominal RPM target for fresh dialysate pump to maintain required pressure. #define SPENT_DIAL_PUMP_INITIAL_RPM 2300 ///< Nominal RPM target for spent dialysate pump to maintain required pressure. -#define SPENT_DIAL_PUMP_FILL_RPM 200 ///< Nominal RPM target for spent chamber fill operations. +#define SPENT_DIAL_PUMP_FILL_RPM 350 ///< Nominal RPM target for spent chamber fill operations. /// Generate dialysate mode data structure typedef struct Index: firmware/App/Monitors/Level.c =================================================================== diff -u -r229341f9eb23fec730cdf9b1f8f3960de2daf384 -rb4e581d847579ffd65e15822b67def7f64212481 --- firmware/App/Monitors/Level.c (.../Level.c) (revision 229341f9eb23fec730cdf9b1f8f3960de2daf384) +++ firmware/App/Monitors/Level.c (.../Level.c) (revision b4e581d847579ffd65e15822b67def7f64212481) @@ -32,8 +32,8 @@ #define FPGA_LEVEL_MEDIUM 3 ///< Floater medium level status #define FPGA_LEVEL_HIGH 1 ///< Floater high level status #define LEVEL_COUNT_LOW 0xFFFF ///< Level sensor count when fluid level is low or non submerged -#define LEVEL_COUNT_HIGH_START 0x2000 ///< Start range of level sensor count when fluid level is high or submerged -#define LEVEL_COUNT_HIGH_END 0x2FFF ///< End range of level sensor count when fluid level is high or submerged +#define LEVEL_COUNT_HIGH_START 0x6000 ///< Start range of level sensor count when fluid level is high or submerged +#define LEVEL_COUNT_HIGH_END 0x6E00 ///< End range of level sensor count when fluid level is high or submerged #define LOW_LEVEL_COUNT_TOLERANCE ( ( LEVEL_COUNT_LOW / 100 ) * 1 ) ///< Level sensor count 1% tolerance for low level #define HIGH_LEVEL_COUNT_TOLERANCE ( ( LEVEL_COUNT_HIGH / 100 ) * 1 ) ///< Level sensor count 1% tolerance for high level #define LEVEL_DATA_PUB_INTERVAL ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL ) ///< Interval (ms/task time) at which the level data is published on the CAN bus.