Index: firmware/App/Controllers/DryBiCart.c =================================================================== diff -u -ra6ead936473ef260bbd330050fcf7e1b10120175 -r95fa5cf340d60a9efcba15c4b5af6554e36fc551 --- firmware/App/Controllers/DryBiCart.c (.../DryBiCart.c) (revision a6ead936473ef260bbd330050fcf7e1b10120175) +++ firmware/App/Controllers/DryBiCart.c (.../DryBiCart.c) (revision 95fa5cf340d60a9efcba15c4b5af6554e36fc551) @@ -490,14 +490,17 @@ * @brief * The setBicarbChamberFillRequested function sets the chmaberFillRequest * flag value to be True. - * @details \b Inputs: dryBiCartFillRequested, dryBiCartDrainRequested + * @details \b Inputs: dryBiCartFillRequested, dryBiCartDrainRequested, + * dryBiCartDepressurizeRequested * @details \b Outputs: bicarbChamberFillRequested * @return TRUE if successful, FALSE if not. *************************************************************************/ BOOL setBicarbChamberFillRequested( void ) { BOOL result = FALSE; - BOOL requestStatus = getU32OverrideValue( &dryBiCartFillRequested ) || getU32OverrideValue( &dryBiCartDrainRequested ); + BOOL requestStatus = getU32OverrideValue( &dryBiCartFillRequested ) ||\ + getU32OverrideValue( &dryBiCartDrainRequested ) || \ + getU32OverrideValue( &dryBiCartDepressurizeRequested ); // ensure that there is no other operation in progress before new request set to true if ( FALSE == requestStatus ) @@ -533,14 +536,17 @@ * @brief * The setBicartFillRequested function sets the bicart fill request * flag value to be True. - * @details \b Inputs: bicarbChamberFillRequested, dryBiCartDrainRequested + * @details \b Inputs: bicarbChamberFillRequested, dryBiCartDrainRequested, + * dryBiCartDepressurizeRequested * @details \b Outputs: dryBiCartFillRequested * @return TRUE if successful, FALSE if not. *************************************************************************/ BOOL setBicartFillRequested( void ) { BOOL result = FALSE; - BOOL requestStatus = getU32OverrideValue( &bicarbChamberFillRequested ) || getU32OverrideValue( &dryBiCartDrainRequested ); + BOOL requestStatus = getU32OverrideValue( &bicarbChamberFillRequested ) \ + || getU32OverrideValue( &dryBiCartDrainRequested ) || \ + getU32OverrideValue( &dryBiCartDepressurizeRequested ) ; //ensure that there is no other operation in progress before new request set to true if ( FALSE == requestStatus ) @@ -576,14 +582,17 @@ * @brief * The setBicartDrainRequested function sets the bicart drain request * flag value to be True. - * @details \b Inputs: bicarbChamberFillRequested,dryBiCartFillRequested + * @details \b Inputs: bicarbChamberFillRequested,dryBiCartFillRequested, + * dryBiCartDepressurizeRequested * @details \b Outputs: dryBiCartDrainRequested * @return TRUE if successful, FALSE if not. *************************************************************************/ BOOL setBicartDrainRequested( void ) { BOOL result = FALSE; - BOOL requestStatus = getU32OverrideValue( &bicarbChamberFillRequested ) || getU32OverrideValue( &dryBiCartFillRequested ); + BOOL requestStatus = getU32OverrideValue( &bicarbChamberFillRequested ) || \ + getU32OverrideValue( &dryBiCartFillRequested ) || \ + getU32OverrideValue( &dryBiCartDepressurizeRequested ); //ensure that there is no other operation in progress before new request set to true if ( FALSE == requestStatus ) @@ -617,6 +626,51 @@ /*********************************************************************//** * @brief + * The setBicartDepressurizeRequested function sets the bicart depressurize request + * flag value to be True. + * @details \b Inputs: bicarbChamberFillRequested,dryBiCartFillRequested,dryBiCartDrainRequested + * @details \b Outputs: dryBiCartDepressurizeRequested + * @return TRUE if successful, FALSE if not. + *************************************************************************/ +BOOL setBicartDepressurizeRequested( void ) +{ + BOOL result = FALSE; + BOOL requestStatus = getU32OverrideValue( &bicarbChamberFillRequested ) || \ + getU32OverrideValue( &dryBiCartFillRequested ) || \ + getU32OverrideValue( &dryBiCartDrainRequested ); + + //ensure that there is no other operation in progress before new request set to true + if ( FALSE == requestStatus ) + { + dryBiCartDepressurizeRequested.data = TRUE; + result = TRUE; + } + + return result; +} + +/*********************************************************************//** + * @brief + * The getBicartDepressurizeRequested function gets the bicart depressurize request + * flag value + * @details \b Inputs: dryBiCartDepressurizeRequested + * @details \b Outputs: none + * @return TRUE if successful, FALSE if not. + *************************************************************************/ +BOOL getBicartDepressurizeRequested( void ) +{ + BOOL result = FALSE; + + if ( ( TRUE == getU32OverrideValue( &dryBiCartDepressurizeRequested ) ) ) + { + result = TRUE; + } + + return result; +} + +/*********************************************************************//** + * @brief * The getCurrentDryBiCartFillExecState function returns the current state * of the dry bicart fill state. * @details \b Inputs: dryBiCartFillExecState @@ -1638,7 +1692,7 @@ *************************************************************************/ BOOL testDryBiCartDepressurizeRequestOverride( MESSAGE_T *message ) { - BOOL result = u32Override( message, &dryBiCartDepressurizeRequested, FALSE, TRUE ); + BOOL result = setBicartDrainRequested();//u32Override( message, &dryBiCartDepressurizeRequested, FALSE, TRUE ); return result; }