Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r090cfb22a7c0b4738299c3fb411ca77aaba8d968 -r4fb1e15d35f6b968bab5620909c30baec98bfd4e --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 090cfb22a7c0b4738299c3fb411ca77aaba8d968) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 4fb1e15d35f6b968bab5620909c30baec98bfd4e) @@ -20,7 +20,6 @@ //#include "CPLD.h" //#include "DrainPump.h" //#include "Heaters.h" -#include "MessageSupport.h" //#include "ModeChemicalDisinfect.h" #include "ModeFault.h" //#include "ModeHeatDisinfect.h" @@ -34,11 +33,12 @@ #include "SystemCommDD.h" #include "Messaging.h" #include "TaskGeneral.h" +#include "MessageSupport.h" //#include "Timers.h" //#include "Valves.h" /** - * @addtogroup DGStandbyMode + * @addtogroup DDStandbyMode * @{ */ @@ -51,22 +51,22 @@ // ********** private data ********** -static DG_STANDBY_MODE_STATE_T standbyState; ///< Currently active standby state. +static DD_STANDBY_MODE_STATE_T standbyState; ///< Currently active standby state. //static BOOL stopSampleWaterRequest; ///< Flag indicating HD has requested to stop sample water //static BOOL startSampleWaterRequest; ///< Flag indicating HD has requested to start sample water //static BOOL flushFilterRequest; ///< Flag indicating HD has requested to flush filters //static BOOL endSampleWaterRequest; ///< Flag indicating HD has requested to end sample water // -//static BOOL pendingStartDGRequest; ///< Flag indicating HD has requested DG start (go to generation idle mode). +//static BOOL pendingStartDGRequest; ///< Flag indicating HD has requested DD start (go to generation idle mode). //static U32 waterSampleStartTime; ///< Time stamp for start of water sample state. //static U32 filterFlushStartTime; ///< Time stamp for start of filter flush state. //static U32 filterFlushPublishTimerCounter; ///< Filter flush data publish timer counter. -//static BOOL pendingStartDGFlushRequest; ///< Flag indicating HD has requested DG start flush. -//static BOOL pendingStartDGHeatDisinfectRequest; ///< Flag indicating HD has requested DG start heat disinfect. -//static BOOL pendingStartDGChemicalDisinfectRequest; ///< Flag indicating HD has requested DG start chemical disinfect. -//static BOOL pendingStartDGHeatDisinfectActiveCoolRequest; ///< Flag indicating HD has requested DG start heat disinfect active cool. -//static BOOL pendingStartDGChemicalDisinfectFlushRequest; ///< Flag indicating HD has requested DG start chemical disinfect flush. -//static BOOL pendingStartDGROPermeateSampleRequest; ///< Flag indicating HD has requested DG start RO permeate sample. +//static BOOL pendingStartDGFlushRequest; ///< Flag indicating HD has requested DD start flush. +//static BOOL pendingStartDGHeatDisinfectRequest; ///< Flag indicating HD has requested DD start heat disinfect. +//static BOOL pendingStartDGChemicalDisinfectRequest; ///< Flag indicating HD has requested DD start chemical disinfect. +//static BOOL pendingStartDGHeatDisinfectActiveCoolRequest; ///< Flag indicating HD has requested DD start heat disinfect active cool. +//static BOOL pendingStartDGChemicalDisinfectFlushRequest; ///< Flag indicating HD has requested DD start chemical disinfect flush. +//static BOOL pendingStartDGROPermeateSampleRequest; ///< Flag indicating HD has requested DD start RO permeate sample. static OVERRIDE_U32_T filterFlushTimePeriod = { FILTER_FLUSH_TIME_MS, FILTER_FLUSH_TIME_MS, 0, 0 }; ///< Filter flush time period in ms. @@ -75,11 +75,11 @@ static BOOL areInletWaterConditionsAlarmsActive( void ); -static DG_STANDBY_MODE_STATE_T handleStandbyIdleState( void ); -static DG_STANDBY_MODE_STATE_T handleStandbyFlushFilterState( void ); -static DG_STANDBY_MODE_STATE_T handleStandbyFlushFilterIdleState( void ); -static DG_STANDBY_MODE_STATE_T handleStandbySampleWaterState( void ); -static DG_STANDBY_MODE_STATE_T handleStandbyPauseState( void ); +static DD_STANDBY_MODE_STATE_T handleStandbyIdleState( void ); +static DD_STANDBY_MODE_STATE_T handleStandbyFlushFilterState( void ); +static DD_STANDBY_MODE_STATE_T handleStandbyFlushFilterIdleState( void ); +static DD_STANDBY_MODE_STATE_T handleStandbySampleWaterState( void ); +static DD_STANDBY_MODE_STATE_T handleStandbyPauseState( void ); /*********************************************************************//** * @brief @@ -94,7 +94,7 @@ *************************************************************************/ void initStandbyMode( void ) { - standbyState = DG_STANDBY_MODE_STATE_IDLE; + standbyState = DD_STANDBY_MODE_STATE_IDLE; // stopSampleWaterRequest = FALSE; // startSampleWaterRequest = FALSE; // flushFilterRequest = FALSE; @@ -169,35 +169,35 @@ if ( TRUE == areInletWaterConditionsAlarmsActive() ) { //setValveState( VSP, VALVE_STATE_CLOSED ); - standbyState = DG_STANDBY_MODE_STATE_PAUSE; + standbyState = DD_STANDBY_MODE_STATE_PAUSE; } // execute current Standby state switch ( standbyState ) { - case DG_STANDBY_MODE_STATE_IDLE: + case DD_STANDBY_MODE_STATE_IDLE: standbyState = handleStandbyIdleState(); break; - case DG_STANDBY_MODE_STATE_FLUSH_FILTER: + case DD_STANDBY_MODE_STATE_FLUSH_FILTER: standbyState = handleStandbyFlushFilterState(); break; - case DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE: + case DD_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE: standbyState = handleStandbyFlushFilterIdleState(); break; - case DG_STANDBY_MODE_STATE_SAMPLE_WATER: + case DD_STANDBY_MODE_STATE_SAMPLE_WATER: standbyState = handleStandbySampleWaterState(); break; - case DG_STANDBY_MODE_STATE_PAUSE: + case DD_STANDBY_MODE_STATE_PAUSE: standbyState = handleStandbyPauseState(); break; default: SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_STANDBY_MODE_INVALID_EXEC_STATE, standbyState ) - standbyState = DG_STANDBY_MODE_STATE_IDLE; + standbyState = DD_STANDBY_MODE_STATE_IDLE; break; } @@ -244,9 +244,9 @@ * pendingStartDGChemicalDisinfectRequest * @return the next state *************************************************************************/ -static DG_STANDBY_MODE_STATE_T handleStandbyIdleState( void ) +static DD_STANDBY_MODE_STATE_T handleStandbyIdleState( void ) { - DG_STANDBY_MODE_STATE_T state = DG_STANDBY_MODE_STATE_IDLE; + DD_STANDBY_MODE_STATE_T state = DD_STANDBY_MODE_STATE_IDLE; // go to standby solo mode if HD is turned off or stops communicating. if ( FALSE == isTDCommunicating() ) @@ -259,13 +259,13 @@ // setValveState( VPI, VALVE_STATE_OPEN ); // flushFilterRequest = FALSE; // filterFlushStartTime = getMSTimerCount(); -// state = DG_STANDBY_MODE_STATE_FLUSH_FILTER; +// state = DD_STANDBY_MODE_STATE_FLUSH_FILTER; // } // else if ( TRUE == pendingStartDGRequest ) // { // pendingStartDGRequest = FALSE; // signalSyncToHD(); -// requestNewOperationMode( DG_MODE_GENE ); +// requestNewOperationMode( DD_MODE_GENE ); // } // else if ( TRUE == pendingStartDGFlushRequest ) // { @@ -280,7 +280,7 @@ // else if ( TRUE == pendingStartDGChemicalDisinfectRequest ) // { // pendingStartDGChemicalDisinfectRequest = FALSE; -// requestNewOperationMode( DG_MODE_CHEM ); +// requestNewOperationMode( DD_MODE_CHEM ); // } // else if ( TRUE == pendingStartDGHeatDisinfectActiveCoolRequest ) // { @@ -291,7 +291,7 @@ // else if ( TRUE == pendingStartDGChemicalDisinfectFlushRequest ) // { // pendingStartDGChemicalDisinfectFlushRequest = FALSE; -// requestNewOperationMode( DG_MODE_CHFL ); +// requestNewOperationMode( DD_MODE_CHFL ); // } // else if ( TRUE == pendingStartDGROPermeateSampleRequest ) // { @@ -310,15 +310,15 @@ * @details \b Outputs: Flushed the filters * @return the next state *************************************************************************/ -static DG_STANDBY_MODE_STATE_T handleStandbyFlushFilterState( void ) +static DD_STANDBY_MODE_STATE_T handleStandbyFlushFilterState( void ) { - DG_STANDBY_MODE_STATE_T state = DG_STANDBY_MODE_STATE_FLUSH_FILTER; + DD_STANDBY_MODE_STATE_T state = DD_STANDBY_MODE_STATE_FLUSH_FILTER; // U32 filterFlushTimePeriod_ms = getU32OverrideValue( &filterFlushTimePeriod ); // // if ( TRUE == didTimeout( filterFlushStartTime, filterFlushTimePeriod_ms ) ) // { // setValveState( VPI, VALVE_STATE_CLOSED ); -// state = DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE; +// state = DD_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE; // } // // if ( ++filterFlushPublishTimerCounter >= FILTER_FLUSH_DATA_PUBLISH_INTERVAL ) @@ -329,14 +329,14 @@ // data.countdown = data.timeout - ( calcTimeSince( filterFlushStartTime ) / MS_PER_SECOND ); // filterFlushPublishTimerCounter = 0; // -// broadcastData( MSG_ID_DG_FILTER_FLUSH_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( STANDBY_MODE_DATA_T ) ); +// broadcastData( MSG_ID_DD_FILTER_FLUSH_PROGRESS_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( STANDBY_MODE_DATA_T ) ); // } // // if ( TRUE == endSampleWaterRequest ) // { // endSampleWaterRequest = FALSE; // setValveState( VPI, VALVE_STATE_CLOSED ); -// state = DG_STANDBY_MODE_STATE_IDLE; +// state = DD_STANDBY_MODE_STATE_IDLE; // } return state; @@ -351,23 +351,23 @@ * waterSampleStartTime * @return the next state *************************************************************************/ -static DG_STANDBY_MODE_STATE_T handleStandbyFlushFilterIdleState( void ) +static DD_STANDBY_MODE_STATE_T handleStandbyFlushFilterIdleState( void ) { - DG_STANDBY_MODE_STATE_T state = DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE; + DD_STANDBY_MODE_STATE_T state = DD_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE; // if ( TRUE == startSampleWaterRequest ) // { // waterSampleStartTime = getMSTimerCount(); // setValveState( VPI, VALVE_STATE_OPEN ); // setValveState( VSP, VALVE_STATE_OPEN ); -// state = DG_STANDBY_MODE_STATE_SAMPLE_WATER; +// state = DD_STANDBY_MODE_STATE_SAMPLE_WATER; // } // // if ( TRUE == endSampleWaterRequest ) // { // endSampleWaterRequest = FALSE; // setValveState( VPI, VALVE_STATE_CLOSED ); -// state = DG_STANDBY_MODE_STATE_IDLE; +// state = DD_STANDBY_MODE_STATE_IDLE; // } // // startSampleWaterRequest = FALSE; @@ -383,17 +383,17 @@ * @details \b Outputs: Finished sample water and closed valve * @return the next state *************************************************************************/ -static DG_STANDBY_MODE_STATE_T handleStandbySampleWaterState( void ) +static DD_STANDBY_MODE_STATE_T handleStandbySampleWaterState( void ) { - DG_STANDBY_MODE_STATE_T state = DG_STANDBY_MODE_STATE_SAMPLE_WATER; + DD_STANDBY_MODE_STATE_T state = DD_STANDBY_MODE_STATE_SAMPLE_WATER; // // After HD requests to stop or 10 seconds has elapsed, close and return to idle state // if ( ( TRUE == stopSampleWaterRequest ) || ( TRUE == didTimeout( waterSampleStartTime, MAX_WATER_SAMPLE_TIME_MS ) ) ) // { // stopSampleWaterRequest = FALSE; // setValveState( VSP, VALVE_STATE_CLOSED ); // setValveState( VPI, VALVE_STATE_CLOSED ); -// state = DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE; +// state = DD_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE; // } return state; @@ -406,14 +406,14 @@ * @details \b Outputs: filterFlushStartTime * @return the next state *************************************************************************/ -static DG_STANDBY_MODE_STATE_T handleStandbyPauseState( void ) +static DD_STANDBY_MODE_STATE_T handleStandbyPauseState( void ) { - DG_STANDBY_MODE_STATE_T state = DG_STANDBY_MODE_STATE_PAUSE; + DD_STANDBY_MODE_STATE_T state = DD_STANDBY_MODE_STATE_PAUSE; // if ( FALSE == areInletWaterConditionsAlarmsActive() ) // { // filterFlushStartTime = getMSTimerCount(); -// state = DG_STANDBY_MODE_STATE_FLUSH_FILTER; +// state = DD_STANDBY_MODE_STATE_FLUSH_FILTER; // } return state; @@ -428,38 +428,38 @@ *************************************************************************/ void waterSampleCommandHandler( SAMPLE_WATER_CMD_T sampleWaterCmd ) { -// DG_CMD_RESPONSE_T cmdResponse; +// DD_CMD_RESPONSE_T cmdResponse; // -// cmdResponse.commandID = DG_CMD_SAMPLE_WATER; +// cmdResponse.commandID = DD_CMD_SAMPLE_WATER; // cmdResponse.rejected = TRUE; -// cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_INVALID_MODE; +// cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_INVALID_MODE; // // switch ( sampleWaterCmd ) // { // case SAMPLE_WATER_CMD_STOP: -// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_SAMPLE_WATER == standbyState ) ) +// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DD_STANDBY_MODE_STATE_SAMPLE_WATER == standbyState ) ) // { // stopSampleWaterRequest = TRUE; // cmdResponse.rejected = FALSE; -// cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE; +// cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE; // } // break; // // case SAMPLE_WATER_CMD_START: -// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE == standbyState ) ) +// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DD_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE == standbyState ) ) // { // startSampleWaterRequest = TRUE; // cmdResponse.rejected = FALSE; -// cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE; +// cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE; // } // break; // // case SAMPLE_WATER_CMD_FLUSH: -// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) +// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DD_STANDBY_MODE_STATE_IDLE == standbyState ) ) // { // flushFilterRequest = TRUE; // cmdResponse.rejected = FALSE; -// cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE; +// cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE; // } // break; // @@ -468,12 +468,12 @@ // { // endSampleWaterRequest = TRUE; // cmdResponse.rejected = FALSE; -// cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE; +// cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE; // } // break; // // default: -// cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER; +// cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER; // break; // } // @@ -482,16 +482,16 @@ /*********************************************************************//** * @brief - * The requestDGStart function handles an HD request to start (go to generation idle mode). + * The requestDDStart function handles an HD request to start (go to generation idle mode). * @details \b Inputs: standbyState * @details \b Outputs: pendingSampleWaterRequest * @return TRUE if request accepted, FALSE if not. *************************************************************************/ -BOOL requestDGStart( void ) +BOOL requestDDStart( void ) { BOOL result = FALSE; - if ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) + if ( DD_STANDBY_MODE_STATE_IDLE == standbyState ) { result = TRUE; //pendingStartDGRequest = TRUE; @@ -515,7 +515,7 @@ { BOOL result = FALSE; - if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( standbyState != DG_STANDBY_MODE_STATE_IDLE ) ) + if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( standbyState != DD_STANDBY_MODE_STATE_IDLE ) ) { result = TRUE; initStandbyMode(); @@ -528,28 +528,28 @@ /*********************************************************************//** * @brief - * The startDGFlush function starts DG flush mode. + * The startDDFlush function starts DD flush mode. * @details \b Inputs: standbyState * @details \b Outputs: none * @return: TRUE if the switch was successful, otherwise FALSE *************************************************************************/ -BOOL startDGFlush( void ) +BOOL startDDFlush( void ) { BOOL result = FALSE; -// // If DG is in standby mode or in the solo mode and the standby mode is in Idle state, request DG flush -// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) ) +// // If DD is in standby mode or in the solo mode and the standby mode is in Idle state, request DD flush +// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DD_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DD_MODE_SOLO == getCurrentOperationMode() ) ) // { -// DG_CMD_RESPONSE_T cmdResponse; -// DG_USAGE_INFO_RECORD_T usageInfo; +// DD_CMD_RESPONSE_T cmdResponse; +// DD_USAGE_INFO_RECORD_T usageInfo; // -// getNVRecord2Driver( GET_USAGE_RECORD, (U08*)&usageInfo, sizeof( DG_USAGE_INFO_RECORD_T ), 0, ALARM_ID_NO_ALARM ); +// getNVRecord2Driver( GET_USAGE_RECORD, (U08*)&usageInfo, sizeof( DD_USAGE_INFO_RECORD_T ), 0, ALARM_ID_NO_ALARM ); // // OPN_CLS_STATE_T concCap = getSwitchStatus( CONCENTRATE_CAP ); // OPN_CLS_STATE_T diaCap = getSwitchStatus( DIALYSATE_CAP ); -// cmdResponse.commandID = DG_CMD_START_FLUSH; +// cmdResponse.commandID = DD_CMD_START_FLUSH; // cmdResponse.rejected = FALSE; -// cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE; +// cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE; // //#ifndef _RELEASE_ // if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) ) @@ -566,17 +566,17 @@ // if ( ( STATE_OPEN == concCap ) || ( STATE_OPEN == diaCap ) ) // { // cmdResponse.rejected = TRUE; -// cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN : -// REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN ); +// cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DD_DIALYSATE_CAP_OPEN : +// REQUEST_REJECT_REASON_DD_CONCENTRATE_CAP_OPEN ); // } // else if ( usageInfo.lastChemDisFlushCompleteDateEpoch < usageInfo.lastChemDisStartDateEpoch ) // { // cmdResponse.rejected = TRUE; -// cmdResponse.rejectCode = REQUEST_REJECT_REASON_DG_CHEM_FLUSH_NOT_COMPLETED; +// cmdResponse.rejectCode = REQUEST_REJECT_REASON_DD_CHEM_FLUSH_NOT_COMPLETED; // } // else // { -// pendingStartDGFlushRequest = TRUE; +// pendingStartDDFlushRequest = TRUE; // result = TRUE; // } // @@ -588,28 +588,28 @@ /*********************************************************************//** * @brief - * The startDGHeatDisinfect function starts heat disinfect mode. + * The startDDHeatDisinfect function starts heat disinfect mode. * @details \b Inputs: standbyState * @details \b Outputs: none * @return: TRUE if the switch was successful *************************************************************************/ -BOOL startDGHeatDisinfect( void ) +BOOL startDDHeatDisinfect( void ) { BOOL status = FALSE; -// // If DG is in standby mode and the standby mode is in Idle state or if DG is in solo mode, request DG heat disinfect -// if ( ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) ) +// // If DD is in standby mode and the standby mode is in Idle state or if DD is in solo mode, request DD heat disinfect +// if ( ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DD_STANDBY_MODE_STATE_IDLE == standbyState ) ) || ( DD_MODE_SOLO == getCurrentOperationMode() ) ) // { -// DG_CMD_RESPONSE_T cmdResponse; -// DG_USAGE_INFO_RECORD_T usageInfo; +// DD_CMD_RESPONSE_T cmdResponse; +// DD_USAGE_INFO_RECORD_T usageInfo; // OPN_CLS_STATE_T concCap = getSwitchStatus( CONCENTRATE_CAP ); // OPN_CLS_STATE_T diaCap = getSwitchStatus( DIALYSATE_CAP ); // -// getNVRecord2Driver( GET_USAGE_RECORD, (U08*)&usageInfo, sizeof( DG_USAGE_INFO_RECORD_T ), 0, ALARM_ID_NO_ALARM ); +// getNVRecord2Driver( GET_USAGE_RECORD, (U08*)&usageInfo, sizeof( DD_USAGE_INFO_RECORD_T ), 0, ALARM_ID_NO_ALARM ); // -// cmdResponse.commandID = DG_CMD_START_HEAT_DISINFECT; +// cmdResponse.commandID = DD_CMD_START_HEAT_DISINFECT; // cmdResponse.rejected = FALSE; -// cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE; +// cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE; // //#ifndef _RELEASE_ // if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) ) @@ -626,17 +626,17 @@ // if ( ( STATE_OPEN == concCap ) || ( STATE_OPEN == diaCap ) ) // { // cmdResponse.rejected = TRUE; -// cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN : -// REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN ); +// cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DD_DIALYSATE_CAP_OPEN : +// REQUEST_REJECT_REASON_DD_CONCENTRATE_CAP_OPEN ); // } // else if ( usageInfo.lastChemDisFlushCompleteDateEpoch < usageInfo.lastChemDisStartDateEpoch ) // { // cmdResponse.rejected = TRUE; -// cmdResponse.rejectCode = REQUEST_REJECT_REASON_DG_CHEM_FLUSH_NOT_COMPLETED; +// cmdResponse.rejectCode = REQUEST_REJECT_REASON_DD_CHEM_FLUSH_NOT_COMPLETED; // } // else // { -// pendingStartDGHeatDisinfectRequest = TRUE; +// pendingStartDDHeatDisinfectRequest = TRUE; // status = TRUE; // } // @@ -648,29 +648,29 @@ /*********************************************************************//** * @brief - * The startDGHeatDisinfectActiveCool function starts heat disinfect active + * The startDDHeatDisinfectActiveCool function starts heat disinfect active * cool mode. * @details \b Inputs: standbyState * @details \b Outputs: none * @return: TRUE if the switch was successful *************************************************************************/ -BOOL startDGHeatDisinfectActiveCool( void ) +BOOL startDDHeatDisinfectActiveCool( void ) { BOOL status = FALSE; -// // If DG is in standby mode and the standby mode is in Idle state or if DG is in solo mode, request DG heat disinfect -// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DG_MODE_SOLO == getCurrentOperationMode() ) ) +// // If DD is in standby mode and the standby mode is in Idle state or if DD is in solo mode, request DD heat disinfect +// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DD_STANDBY_MODE_STATE_IDLE == standbyState ) || ( DD_MODE_SOLO == getCurrentOperationMode() ) ) // { -// DG_CMD_RESPONSE_T cmdResponse; -// DG_USAGE_INFO_RECORD_T usageInfo; +// DD_CMD_RESPONSE_T cmdResponse; +// DD_USAGE_INFO_RECORD_T usageInfo; // OPN_CLS_STATE_T concCap = getSwitchStatus( CONCENTRATE_CAP ); // OPN_CLS_STATE_T diaCap = getSwitchStatus( DIALYSATE_CAP ); // -// getNVRecord2Driver( GET_USAGE_RECORD, (U08*)&usageInfo, sizeof( DG_USAGE_INFO_RECORD_T ), 0, ALARM_ID_NO_ALARM ); +// getNVRecord2Driver( GET_USAGE_RECORD, (U08*)&usageInfo, sizeof( DD_USAGE_INFO_RECORD_T ), 0, ALARM_ID_NO_ALARM ); // -// cmdResponse.commandID = DG_CMD_START_HEAT_DISINFECT; +// cmdResponse.commandID = DD_CMD_START_HEAT_DISINFECT; // cmdResponse.rejected = FALSE; -// cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE; +// cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE; // //#ifndef _RELEASE_ // if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) ) @@ -687,17 +687,17 @@ // if ( ( STATE_OPEN == concCap ) || ( STATE_OPEN == diaCap ) ) // { // cmdResponse.rejected = TRUE; -// cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN : -// REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN ); +// cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DD_DIALYSATE_CAP_OPEN : +// REQUEST_REJECT_REASON_DD_CONCENTRATE_CAP_OPEN ); // } // else if ( usageInfo.lastChemDisFlushCompleteDateEpoch < usageInfo.lastChemDisStartDateEpoch ) // { // cmdResponse.rejected = TRUE; -// cmdResponse.rejectCode = REQUEST_REJECT_REASON_DG_CHEM_FLUSH_NOT_COMPLETED; +// cmdResponse.rejectCode = REQUEST_REJECT_REASON_DD_CHEM_FLUSH_NOT_COMPLETED; // } // else // { -// pendingStartDGHeatDisinfectActiveCoolRequest = TRUE; +// pendingStartDDHeatDisinfectActiveCoolRequest = TRUE; // status = TRUE; // } // @@ -709,24 +709,24 @@ /*********************************************************************//** * @brief - * The startDGChemicalDisinfect function starts chemical disinfect mode. + * The startDDChemicalDisinfect function starts chemical disinfect mode. * @details \b Inputs: standbyState * @details \b Outputs: none * @return: TRUE if the switch was successful *************************************************************************/ -BOOL startDGChemicalDisinfect( void ) +BOOL startDDChemicalDisinfect( void ) { BOOL status = FALSE; -// // If DG is in standby mode and the standby mode is in Idle, request chemical disinfect +// // If DD is in standby mode and the standby mode is in Idle, request chemical disinfect // // Chemical disinfect cannot be run in solo mode because the user has to confirm that the acid is inserted or removed -// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) +// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DD_STANDBY_MODE_STATE_IDLE == standbyState ) ) // { -// DG_CMD_RESPONSE_T cmdResponse; +// DD_CMD_RESPONSE_T cmdResponse; // -// cmdResponse.commandID = DG_CMD_START_CHEM_DISINFECT; +// cmdResponse.commandID = DD_CMD_START_CHEM_DISINFECT; // cmdResponse.rejected = FALSE; -// cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE; +// cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE; // OPN_CLS_STATE_T diaCap = getSwitchStatus( DIALYSATE_CAP ); // //#ifndef _RELEASE_ @@ -740,11 +740,11 @@ // if ( STATE_OPEN == diaCap ) // { // cmdResponse.rejected = TRUE; -// cmdResponse.rejectCode = REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN; +// cmdResponse.rejectCode = REQUEST_REJECT_REASON_DD_DIALYSATE_CAP_OPEN; // } // else // { -// pendingStartDGChemicalDisinfectRequest = TRUE; +// pendingStartDDChemicalDisinfectRequest = TRUE; // status = TRUE; // } // @@ -756,23 +756,23 @@ /*********************************************************************//** * @brief - * The startDGChemicalDisinfectFlush function starts chemical disinfect flush mode. + * The startDDChemicalDisinfectFlush function starts chemical disinfect flush mode. * @details \b Inputs: standbyState * @details \b Outputs: none * @return: TRUE if the switch was successful *************************************************************************/ -BOOL startDGChemicalDisinfectFlush( void ) +BOOL startDDChemicalDisinfectFlush( void ) { BOOL status = FALSE; -// DG_CMD_RESPONSE_T cmdResponse; +// DD_CMD_RESPONSE_T cmdResponse; // -// cmdResponse.commandID = DG_CMD_START_CHEM_DISINFECT_FLUSH; +// cmdResponse.commandID = DD_CMD_START_CHEM_DISINFECT_FLUSH; // cmdResponse.rejected = FALSE; -// cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE; +// cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE; // -// // If DG is in standby mode and the standby mode is in Idle, request chemical disinfect flush +// // If DD is in standby mode and the standby mode is in Idle, request chemical disinfect flush // // Chemical disinfect flush cannot be run in solo mode because the user has to confirm that the acid is inserted or removed -// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) +// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DD_STANDBY_MODE_STATE_IDLE == standbyState ) ) // { // OPN_CLS_STATE_T concCap = getSwitchStatus( CONCENTRATE_CAP ); // OPN_CLS_STATE_T diaCap = getSwitchStatus( DIALYSATE_CAP ); @@ -788,19 +788,19 @@ // if ( ( STATE_OPEN == concCap ) || ( STATE_OPEN == diaCap ) ) // { // cmdResponse.rejected = TRUE; -// cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN : -// REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN ); +// cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DD_DIALYSATE_CAP_OPEN : +// REQUEST_REJECT_REASON_DD_CONCENTRATE_CAP_OPEN ); // } // else // { -// pendingStartDGChemicalDisinfectFlushRequest = TRUE; +// pendingStartDDChemicalDisinfectFlushRequest = TRUE; // status = TRUE; // } // } // else // { // cmdResponse.rejected = TRUE; -// cmdResponse.rejectCode = REQUEST_REJECT_REASON_DG_NOT_IN_STANDBY_IDLE_STATE; +// cmdResponse.rejectCode = REQUEST_REJECT_REASON_DD_NOT_IN_STANDBY_IDLE_STATE; // } // // sendCommandResponseMsg( &cmdResponse ); @@ -810,28 +810,28 @@ /*********************************************************************//** * @brief - * The startDGROPermeateSample function starts RO permeate sample mode. + * The startDDROPermeateSample function starts RO permeate sample mode. * @details \b Inputs: standbyState - * @details \b Outputs: pendingStartDGChemicalDisinfectFlushRequest + * @details \b Outputs: pendingStartDDChemicalDisinfectFlushRequest * @return: TRUE if the switch was successful *************************************************************************/ -BOOL startDGROPermeateSample( void ) +BOOL startDDROPermeateSample( void ) { BOOL status = FALSE; -// DG_CMD_RESPONSE_T cmdResponse; +// DD_CMD_RESPONSE_T cmdResponse; // -// cmdResponse.commandID = DG_CMD_START_RO_PERMEATE_SAMPLE; +// cmdResponse.commandID = DD_CMD_START_RO_PERMEATE_SAMPLE; // cmdResponse.rejected = FALSE; -// cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE; +// cmdResponse.rejectCode = DD_CMD_REQUEST_REJECT_REASON_NONE; // -// // If DG is in standby mode and the standby mode is in Idle, request RO permeate sample -// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DG_STANDBY_MODE_STATE_IDLE == standbyState ) ) +// // If DD is in standby mode and the standby mode is in Idle, request RO permeate sample +// if ( ( DD_MODE_STAN == getCurrentOperationMode() ) && ( DD_STANDBY_MODE_STATE_IDLE == standbyState ) ) // { -// DG_USAGE_INFO_RECORD_T usageInfo; +// DD_USAGE_INFO_RECORD_T usageInfo; // OPN_CLS_STATE_T concCap = getSwitchStatus( CONCENTRATE_CAP ); // OPN_CLS_STATE_T diaCap = getSwitchStatus( DIALYSATE_CAP ); // -// getNVRecord2Driver( GET_USAGE_RECORD, (U08*)&usageInfo, sizeof( DG_USAGE_INFO_RECORD_T ), 0, ALARM_ID_NO_ALARM ); +// getNVRecord2Driver( GET_USAGE_RECORD, (U08*)&usageInfo, sizeof( DD_USAGE_INFO_RECORD_T ), 0, ALARM_ID_NO_ALARM ); // //#ifndef _RELEASE_ // if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) ) @@ -848,24 +848,24 @@ // if ( ( STATE_OPEN == concCap ) || ( STATE_OPEN == diaCap ) ) // { // cmdResponse.rejected = TRUE; -// cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN : -// REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN ); +// cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DD_DIALYSATE_CAP_OPEN : +// REQUEST_REJECT_REASON_DD_CONCENTRATE_CAP_OPEN ); // } // else if ( usageInfo.lastChemDisFlushCompleteDateEpoch < usageInfo.lastChemDisStartDateEpoch ) // { // cmdResponse.rejected = TRUE; -// cmdResponse.rejectCode = REQUEST_REJECT_REASON_DG_CHEM_FLUSH_NOT_COMPLETED; +// cmdResponse.rejectCode = REQUEST_REJECT_REASON_DD_CHEM_FLUSH_NOT_COMPLETED; // } // else // { -// pendingStartDGROPermeateSampleRequest = TRUE; +// pendingStartDDROPermeateSampleRequest = TRUE; // status = TRUE; // } // } // else // { // cmdResponse.rejected = TRUE; -// cmdResponse.rejectCode = REQUEST_REJECT_REASON_DG_NOT_IN_STANDBY_IDLE_STATE; +// cmdResponse.rejectCode = REQUEST_REJECT_REASON_DD_NOT_IN_STANDBY_IDLE_STATE; // } // // sendCommandResponseMsg( &cmdResponse ); @@ -880,7 +880,7 @@ * @details \b Outputs: none * @return the current state of standby mode. *************************************************************************/ -DG_STANDBY_MODE_STATE_T getCurrentStandbyState( void ) +DD_STANDBY_MODE_STATE_T getCurrentStandbyState( void ) { return standbyState; }