Index: firmware/App/Controllers/BalancingChamber.c =================================================================== diff -u -r24cfa6a50518180d8e6705e7fb71459e0e7d0f14 -rc1557cc79c8f0b0c358963c99d83015bd3b37e42 --- firmware/App/Controllers/BalancingChamber.c (.../BalancingChamber.c) (revision 24cfa6a50518180d8e6705e7fb71459e0e7d0f14) +++ firmware/App/Controllers/BalancingChamber.c (.../BalancingChamber.c) (revision c1557cc79c8f0b0c358963c99d83015bd3b37e42) @@ -66,9 +66,9 @@ #define BC_BICARB_SPEED_OFFSET_MLPM 240.0F ///< Bicarb speed formula offset (mL/min). #define BC_BICARB_SPEED_DISC_CONST 230400.0F ///< Bicarb speed formula discriminant constant. #define BC_BICARB_SPEED_DISC_VOL_COEF 96000.0F ///< Bicarb speed formula volume coefficient. -#define BC_ACID_SPEED_OFFSET_MLPM 160.0F -#define BC_ACID_SPEED_DISC_CONSTANT 102400.0F -#define BC_ACID_SPEED_DISC_VOL_COEF 96000.0F +#define BC_ACID_SPEED_OFFSET_MLPM 160.0F ///< Acid speed formula offset (mL/min). +#define BC_ACID_SPEED_DISC_CONSTANT 102400.0F ///< Acid speed formula discriminant constant. +#define BC_ACID_SPEED_DISC_VOL_COEF 96000.0F ///< Acid speed formula volume coefficient. /// Payload record structure for balancing chamber switch only request typedef struct @@ -223,7 +223,7 @@ * @param acidVolumeMl Instantaneous acid mix volume (mL) * @return Acid concentrate pump speed (mL/min) *************************************************************************/ -static F32 getAcidConcentratePumpSpeedMlMin( F32 acidVolumeMl) +static F32 getAcidConcentratePumpSpeedMlMin( F32 acidVolumeMl ) { F32 discriminant = BC_ACID_SPEED_DISC_CONSTANT - ( BC_ACID_SPEED_DISC_VOL_COEF * acidVolumeMl ); F32 result = 0.0F; @@ -466,7 +466,7 @@ BOOL state = FALSE; F32 dialFlowRate = getBalChamberActiveDialysateFlowrate(); - state = ( dialFlowRate <= BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_3 )? TRUE : FALSE; + state = ( dialFlowRate <= BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_4 )? TRUE : FALSE; return state; } Index: firmware/App/Controllers/BalancingChamber.h =================================================================== diff -u -rc53b6d8d57bd64bcfedf8a1bbb0d0eeab4502971 -rc1557cc79c8f0b0c358963c99d83015bd3b37e42 --- firmware/App/Controllers/BalancingChamber.h (.../BalancingChamber.h) (revision c53b6d8d57bd64bcfedf8a1bbb0d0eeab4502971) +++ firmware/App/Controllers/BalancingChamber.h (.../BalancingChamber.h) (revision c1557cc79c8f0b0c358963c99d83015bd3b37e42) @@ -39,13 +39,13 @@ #define BC_SPENT_FILL_PRESSURE_PSIG 29.0F ///< Spent side pressure (drop) during balancing chamber switching, indicates fill has been started / in progress. #define BAL_CHAMBER_FILL_VOLUME_ML 30.0F ///< Balancing chamber fill/drain volume per batch operation. #define BAL_CHAMBER_TIME_BASED_D48_SPEED_RPM 250 ///< Minimum D48 speed and fixed speed for time-based balancing chamber switching. -#define BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_1 50.0F ///< Band 1 flowrate(50 mL/min) -#define BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_2 60.0F ///< Band 2 flowrate(60 mL/min) -#define BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_3 70.0F ///< Band 3 flowrate(70 mL/min) -#define BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_4 80.0F ///< Band 4 flowrate(80 mL/min) +#define BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_1 50.0F ///< Band 1 flowrate (50 mL/min) +#define BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_2 60.0F ///< Band 2 flowrate (60 mL/min) +#define BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_3 70.0F ///< Band 3 flowrate (70 mL/min) +#define BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_4 80.0F ///< Band 4 flowrate (80 mL/min) #define BAL_CHAMBER_TIME_BASED_BAND_1 250 ///< Speed at D48 pump runs when the flowrate is between 50 mL/min and 60 mL/min. #define BAL_CHAMBER_TIME_BASED_BAND_2 290 ///< Speed at D48 pump runs when the flowrate is between 60 mL/min and 70 mL/min. -#define BAL_CHAMBER_TIME_BASED_BAND_3 330 ///< Speed at D48 pump runs when the flowrate is between 80 mL/min and 80 mL/min. +#define BAL_CHAMBER_TIME_BASED_BAND_3 330 ///< Speed at D48 pump runs when the flowrate is between 70 mL/min and 80 mL/min. /// balancing chamber data structure typedef struct Index: firmware/App/Controllers/DryBiCart.c =================================================================== diff -u -r24cfa6a50518180d8e6705e7fb71459e0e7d0f14 -rc1557cc79c8f0b0c358963c99d83015bd3b37e42 --- firmware/App/Controllers/DryBiCart.c (.../DryBiCart.c) (revision 24cfa6a50518180d8e6705e7fb71459e0e7d0f14) +++ firmware/App/Controllers/DryBiCart.c (.../DryBiCart.c) (revision c1557cc79c8f0b0c358963c99d83015bd3b37e42) @@ -57,7 +57,7 @@ #define GET_FILL_COMPLETE_PRESSURE_PSI (getTestConfigStatus( TEST_CONFIG_DD_ENABLE_WCID_1 ) != TRUE ? \ DRY_BICART_WCID2_FILL_COMPLETE_PRESSURE_PSI : DRY_BICART_WCID1_FILL_COMPLETE_PRESSURE_PSI ) ///< Get fill complete pressure based on the WCID configuration #define DRY_BICART_FILL_INITIATE_PRESSURE_PSI 1.5F ///< Minimum pressure required to initiate the dry bicart fill process. -#define DRY_BICART_FILL_COMPLETE_SUPPLY_PRESSURE_PSI 10.0F ///< Maximum pressure allowed at bicart fill during supply process/state +#define DRY_BICART_FILL_COMPLETE_SUPPLY_PRESSURE_PSI 10.0F ///< Maximum pressure allowed at bicart fill during supply process/state #define DRY_BICART_FILL_INITIATE_SUPPLY_PRESSURE_PSI 4.0F ///< Minimum pressure required to initiate the dry bicart fill during supply process/state #define DRY_BICART_MAX_FILL_CYCLE_CNT 10 ///< Max fill cycle allowed (by override) for dry bicart fill/mix with water. #define DRY_BICART_MINIMUM_FILL_CYCLE_CNT 3 ///< Minimum fill cycle count for filling dry bicart Index: firmware/App/Controllers/MixingControl.c =================================================================== diff -u -r24cfa6a50518180d8e6705e7fb71459e0e7d0f14 -rc1557cc79c8f0b0c358963c99d83015bd3b37e42 --- firmware/App/Controllers/MixingControl.c (.../MixingControl.c) (revision 24cfa6a50518180d8e6705e7fb71459e0e7d0f14) +++ firmware/App/Controllers/MixingControl.c (.../MixingControl.c) (revision c1557cc79c8f0b0c358963c99d83015bd3b37e42) @@ -120,7 +120,7 @@ #define FINAL_BICARB_MIX ( BICARB_MIX_VOLUME_ML * BICARB_PERCENT_CHANGE ) ///< Final bicarb mix volume -#define FINAL_BICARB_MIX_VOLUME_UPDATE ( FINAL_BICARB_MIX / 1.25 ) +#define FINAL_BICARB_MIX_VOLUME_UPDATE ( FINAL_BICARB_MIX / 1.25 ) ///< Updated Final Bicarb mix volume #define BICARB_CONDUCTIVITY_PRE ( STD_DILUTION_BICARB_POST_MIX_NA * BICARB_PERCENT_CHANGE * getTDBicarbConversionFactor() ) ///< Theoretical bicarb conductivity pre mix Index: firmware/App/Modes/ModeGenDialysate.c =================================================================== diff -u -rc53b6d8d57bd64bcfedf8a1bbb0d0eeab4502971 -rc1557cc79c8f0b0c358963c99d83015bd3b37e42 --- firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision c53b6d8d57bd64bcfedf8a1bbb0d0eeab4502971) +++ firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision c1557cc79c8f0b0c358963c99d83015bd3b37e42) @@ -709,11 +709,6 @@ nominalRpm = getD48PumpSpeed(); rpm = nominalRpm; -// if ( nominalRpm <= BAL_CHAMBER_TIME_BASED_D48_SPEED_RPM ) -// { -// rpm = BAL_CHAMBER_TIME_BASED_D48_SPEED_RPM; -// } - if ( ( dialFlowRate >= BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_1 ) && ( dialFlowRate <= BAL_CHAMBER_OPEN_LOOP_FLOW_RATE_BAND_2 ) ) { rpm = BAL_CHAMBER_TIME_BASED_BAND_1;