Index: firmware/App/Controllers/DryBiCart.c =================================================================== diff -u -r902889c30391b6ca8c9f19adfd3c841c86a5d49f -rd2f5fe93cb4abd8bf8c3bc4a9aa17146c7414062 --- firmware/App/Controllers/DryBiCart.c (.../DryBiCart.c) (revision 902889c30391b6ca8c9f19adfd3c841c86a5d49f) +++ firmware/App/Controllers/DryBiCart.c (.../DryBiCart.c) (revision d2f5fe93cb4abd8bf8c3bc4a9aa17146c7414062) @@ -45,7 +45,9 @@ #define DRY_BICART_DATA_PUBLISH_INTERVAL ( 250 / TASK_GENERAL_INTERVAL ) ///< Interval (ms/task time) at which the balancing chamber data published. // Dry Bicart Fill -#define DRY_BICART_FILL_DURATION_MIN_MS ( 2 * MS_PER_SECOND ) ///< Minimum fill duration to be met to end the fill cycle. +#define DRY_BICART_FILL_PERSISTANCE_DURATION_MS 200 ///< Fill persistence duration to overcome the pressure over shoot for beta 1.9 and beta 2.0. +#define DRY_BICART_FILL_DURATION_MIN_MS ( 2 * MS_PER_SECOND + \ + DRY_BICART_FILL_PERSISTANCE_DURATION_MS) ///< Minimum fill duration to be met to end the fill cycle. #define DRY_BICART_FILL_COMPLETE_TIME_MS ( 1 * MS_PER_SECOND ) ///< Wait time to reset the request flag after fill complete #define DRY_BICART_FILL_DURATION_DIFF_MS 750 ///< Fill duration difference between last and current fill cycle. @@ -54,7 +56,7 @@ #define DRY_BICART_FILL_INITIATE_PRESSURE 1.5F ///< Minimum pressure required to initiate the dry bicart fill process. #define DRY_BICART_FILL_COMPLETE_SUPPLY_PRESSURE 6.0F ///< Maximum pressure allowed at bicart fill during supply process/state #define DRY_BICART_FILL_INITIATE_SUPPLY_PRESSURE 3.0F ///< Minimum pressure required to initiate the dry bicart fill during supply process/state -#define MAX_DRY_BICART_FILL_COMPLETE_PRESSURE 15 ///< Very Max dry bicart fill complete pressure for perisistence on d66 +#define MAX_DRY_BICART_FILL_COMPLETE_PRESSURE 15 ///< Very Max dry bicart fill complete pressure for persistence on d66 #define DRY_BICART_DEFAULT_MAX_FILL_CYCLE_CNT 10 ///< Default max fill cycle allowed for dry bicart fill/mix with water. #define DRY_BICART_MAX_FILL_CYCLE_CNT 30 ///< Max fill cycle allowed (by override) for dry bicart fill/mix with water. @@ -377,8 +379,8 @@ dryBiCartLowerCartPressure.ovInitData = 0.0F; dryBiCartLowerCartPressure.override = OVERRIDE_RESET; - dryBiCartMixControlInterval.data = MIXING_CONTROL_INTERVAL; - dryBiCartMixControlInterval.ovData = MIXING_CONTROL_INTERVAL; + dryBiCartMixControlInterval.data = BICARB_MIX_CONTROL_INTERVAL; + dryBiCartMixControlInterval.ovData = BICARB_MIX_CONTROL_INTERVAL; dryBiCartMixControlInterval.ovInitData = 0.0F; dryBiCartMixControlInterval.override = OVERRIDE_RESET;