Index: firmware/App/Controllers/DGInterface.c =================================================================== diff -u -r4d0c621f5994e1de8bf7d3337678f7835292ce73 -rcd5be724d5a3ba7457e761191d82f278654d7f5c --- firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision 4d0c621f5994e1de8bf7d3337678f7835292ce73) +++ firmware/App/Controllers/DGInterface.c (.../DGInterface.c) (revision cd5be724d5a3ba7457e761191d82f278654d7f5c) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved. +* Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file DGInterface.c * -* @author (last) Sean Nash -* @date (last) 14-Aug-2023 +* @author (last) Dara Navaei +* @date (last) 19-Sep-2023 * * @author (original) Sean * @date (original) 08-Apr-2020 @@ -913,7 +913,12 @@ { dgCmdResp[ DG_CMD_START_FILL ].commandID = DG_CMD_NONE; - sendDGFillCommand( DG_CMD_START, fillToVolMl, targetFlowLPM ); + if ( ( FALSE == isAlarmActive( ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME ) ) && ( FALSE == isAlarmActive( ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME ) ) ) + { + // The empty bottle alarms should not be active. If they are, the user shall insert the new bottle first and then hit Ok/Resume and + // then the fill can go. This is to make sure the next fill is done the full bottles + sendDGFillCommand( DG_CMD_START, fillToVolMl, targetFlowLPM ); + } } /*********************************************************************//** @@ -967,6 +972,21 @@ /*********************************************************************//** * @brief + * The cmdDGParkConcentratePumps function sends a park concentrate pumps command + * message to the DG. + * @details Inputs: none + * @details Outputs: park concentrate pumps command sent to DG. + * @return none + *************************************************************************/ +void cmdDGParkConcentratePumps( void ) +{ + dgCmdResp[ DG_CMD_PARK_CONCENTRATE_PUMPS ].commandID = DG_CMD_NONE; + + sendDGParkConcentratePumpsCommand( ); +} + +/*********************************************************************//** + * @brief * The cmdStartDGFlush function sends a start flush command message to * the DG. * @details Inputs: none