Index: firmware/App/Controllers/DryBiCart.c =================================================================== diff -u -r95fa5cf340d60a9efcba15c4b5af6554e36fc551 -r98f2b3df325b323494f2e110f71a4163d4df7fbd --- firmware/App/Controllers/DryBiCart.c (.../DryBiCart.c) (revision 95fa5cf340d60a9efcba15c4b5af6554e36fc551) +++ firmware/App/Controllers/DryBiCart.c (.../DryBiCart.c) (revision 98f2b3df325b323494f2e110f71a4163d4df7fbd) @@ -96,6 +96,7 @@ DRY_BICART_INITIAL_FILL, ///< Dry bicart initial fill DRY_BICART_SUPPLY, ///< Dry bicart chamber fill DRY_BICART_DRAIN, ///< Dry bicart drain + DRY_BICART_DEPRESSURIZE, ///< Dry bicart depressurize NUM_OF_DRY_BICART_OPERATION ///< Number of dry bicart operation } DRY_BICART_OPERATION_T; @@ -298,6 +299,11 @@ execDryBicartDrainMode(); break; + case DRY_BICART_DEPRESSURIZE: + // Dry bicart depressurize + execDryBicartDepressurize(); + break; + default: // software fault, dryBicartStartRequest = DRY_BICART_IDLE; @@ -712,7 +718,8 @@ /*********************************************************************//** * @brief - * The updateDrybicartOperation function initiates the water fill, bicarbonate supply or bicarbonate drain + * The updateDrybicartOperation function initiates bicart fill water, bicarbonate supply, + * bicart drain or bicart depressurize * operation * @details \b Inputs: none * @details \b Outputs: dryBicartStartRequest @@ -735,6 +742,10 @@ //drain dryBicartStartRequest = DRY_BICART_DRAIN; } + else if ( TRUE == getBicartDepressurizeRequested() ) + { + dryBicartStartRequest = DRY_BICART_DEPRESSURIZE; + } else { // idle @@ -1692,7 +1703,7 @@ *************************************************************************/ BOOL testDryBiCartDepressurizeRequestOverride( MESSAGE_T *message ) { - BOOL result = setBicartDrainRequested();//u32Override( message, &dryBiCartDepressurizeRequested, FALSE, TRUE ); + BOOL result = u32Override( message, &dryBiCartDepressurizeRequested, FALSE, TRUE ); return result; } Index: firmware/App/Tasks/TaskGeneral.c =================================================================== diff -u -ra6ead936473ef260bbd330050fcf7e1b10120175 -r98f2b3df325b323494f2e110f71a4163d4df7fbd --- firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision a6ead936473ef260bbd330050fcf7e1b10120175) +++ firmware/App/Tasks/TaskGeneral.c (.../TaskGeneral.c) (revision 98f2b3df325b323494f2e110f71a4163d4df7fbd) @@ -100,13 +100,11 @@ if ( FALSE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_DRY_BICARB ) ) { - // manage drybicart fill, supply and drain state machines + // Control drybicart fill, supply , drain and depressurize state machines execDryBicart(); - - // manage drybicart depressurize state machines - execDryBicartDepressurize(); } + // Control closed loop mixing of bicarb and acid execMixingControl(); // Control RO pump