Index: firmware/App/Controllers/DryBiCart.h =================================================================== diff -u -ra631e128cd6be44aa232e23b58a229bfb8fe9043 -rd513f36b5f073cab9dcb91db28f2b5bb6599eaf4 --- firmware/App/Controllers/DryBiCart.h (.../DryBiCart.h) (revision a631e128cd6be44aa232e23b58a229bfb8fe9043) +++ firmware/App/Controllers/DryBiCart.h (.../DryBiCart.h) (revision d513f36b5f073cab9dcb91db28f2b5bb6599eaf4) @@ -39,11 +39,13 @@ U32 dryBiCartFillExecState; ///< Dry bicart execution state U32 bicarbChamberFillExecState; ///< Bicarb chamber Fill execution state U32 dryBiCartDrainExecState; ///< Dry bicart drain execution state + U32 dryBiCartDepressurizeExecState; ///< Dry bicart depressurize execution state U32 dryBiCartFillCycleCounter; ///< Dry bicart fill cycle counter U32 dryBiCartMaxFillCycleCount; ///< Dry bicart fill cycle max count U32 dryBiCartFillRequest; ///< Dry bicart fill request U32 bicarbChamberFillRequest; ///< Bicarb chamber fill request U32 dryBiCartDrainRequest; ///< Dry bicart drain request + U32 dryBiCartDepressurizeRequest; ///< Dry bicart depressurize request U32 dryBiCartLastFillTime; ///< Dry bicart last fill duration in milli second U32 dryBiCartCurrentFillTime; ///< Dry bicart current fill duration in milli second U32 dryBiCartType; ///< Dry bicart type (small-0/large-1) @@ -55,16 +57,18 @@ void initDryBiCart( void ); void transitionToDryBicart( void ); -U32 execDryBicartFillMode( void ); -U32 execBicarbChamberFillMode( void ); -U32 execDryBicartDrainMode( void ); +U32 execDryBicartFill( void ); +U32 execBicarbChamberSupply( void ); +U32 execDryBicartDrain( void ); U32 execDryBicartDepressurize( void ); void execDryBicart( void ); BOOL setBicarbChamberFillRequested( void ); BOOL getBicarbChamberFillRequested( void ); BOOL setBicartFillRequested( void ); BOOL setBicartDrainRequested( void ); +BOOL setBicartDepressurizeRequested( void ); + DRY_BICART_FILL_EXEC_STATE_T getCurrentDryBiCartFillExecState( void ); BOOL testDryBiCartDataPublishIntervalOverride( MESSAGE_T *message );