Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -rbcc80fde38b8b94c64a7ad615f9ca3cb6e98c77e -r176bb5bc32a18891912e179dc1bc9293b370bed4 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision bcc80fde38b8b94c64a7ad615f9ca3cb6e98c77e) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 176bb5bc32a18891912e179dc1bc9293b370bed4) @@ -47,7 +47,7 @@ typedef struct { BOOL startCleaningMode; ///< Flag to indicate to start cleaning mode. - DD_COMMAND_T startRequestCmdID; ///< DD cleaning mode start request command ID. + DD_DISINFECT_SEL_COMMAND_T startRequestCmdID; ///< DD cleaning mode start request command ID. ALARM_ID_T alarmID; ///< The informative alarm to trigger for each cleaning mode. DD_OP_MODE_T ddOpMode; ///< DD operation mode. BOOL sampleRqstTrgrd; ///< Flag to indicate the sample alarm has been triggered (for RO perm and chem flush). @@ -62,13 +62,15 @@ static BOOL homingInitiated; ///< Flag indicates actuators have been homed. static FLUID_TYPE_T fluidType; ///< Fluid type assigned based on user selection. static TREATMENT_TYPE_T modality; ///< Modality from the treatment initiation. +static BOOL heatDisinfectionStartConfirmed; static DD_CLEANING_MODE_STATUS_T currentDDCleaningMode; ///< Current DD cleaning mode status. +static DD_DISINFECT_SEL_COMMAND_T requestedDisinfectionCommand = DD_CMD_DISINFECT_INIT; // ********** private function prototypes ********** static TD_STANDBY_STATE_T handleStandbyModeStartState( void ); static TD_STANDBY_STATE_T handleStandbyModeWaitForTreatmentState( void ); -static void setRequestedCleaningMode( DD_OP_MODE_T opMode, BOOL isHeatDisPassiveCool ); +static void setRequestedCleaningMode( DD_DISINFECT_SEL_COMMAND_T opMode ); static TD_STANDBY_STATE_T handleStandbyModeWaitForDisinfectState( void ); /*********************************************************************//** @@ -83,6 +85,7 @@ currentStandbyState = STANDBY_START_STATE; treatStartReqReceived = FALSE; homingInitiated = FALSE; + heatDisinfectionStartConfirmed = FALSE; fluidType = FLUID_TYPE_UNKNOWN; modality = TREATMENT_MODALITY_HD_SALINE_FLUID; } @@ -165,6 +168,25 @@ currentStandbyState = handleStandbyModeWaitForDisinfectState(); break; + case STANDBY_WAIT_FOR_DD_CLEANING_MODE_TO_START_STATE: + if ( DD_MODE_HEAT == getDDOpMode() ) + { + currentStandbyState = STANDBY_CLEANING_MODE_IN_PROGRESS_STATE; + } + break; + + case STANDBY_CLEANING_MODE_IN_PROGRESS_STATE: + if ( ( DD_MODE_HEAT == getDDOpMode() ) && + ( DD_HEAT_DISINFECT_STATE_COMPLETE == getDDSubMode() ) ) + { + requestedDisinfectionCommand = DD_CMD_DISINFECT_INIT; + heatDisinfectionStartConfirmed = FALSE; + + currentStandbyState = + STANDBY_WAIT_FOR_TREATMENT_STATE; + } + break; + default: SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_STANDBY_INVALID_STATE, currentStandbyState ); currentStandbyState = STANDBY_START_STATE; @@ -228,7 +250,24 @@ // } // } // } + switch ( requestedDisinfectionCommand ) + { + case DD_CMD_START_DISINFECT_SKIP: + case DD_CMD_DISINFECT_INIT: + state = STANDBY_WAIT_FOR_TREATMENT_STATE; + requestedDisinfectionCommand = DD_CMD_DISINFECT_INIT; + break; + case DD_CMD_START_DISINFECT_HEAT: + state = STANDBY_WAIT_FOR_DISINFECT_STATE; + break; + + default: + state = STANDBY_WAIT_FOR_TREATMENT_STATE; + requestedDisinfectionCommand = DD_CMD_DISINFECT_INIT; + break; + } + return state; } @@ -326,50 +365,16 @@ { TD_STANDBY_STATE_T state = STANDBY_WAIT_FOR_DISINFECT_STATE; - if ( TRUE == currentDDCleaningMode.startCleaningMode ) + if ( ( DISINFECT_SEL_HEAT == requestedDisinfectionSelection ) && + ( TRUE == heatDisinfectionStartConfirmed ) ) { - switch ( currentDDCleaningMode.ddOpMode ) - { - case DD_MODE_FLUS: - cmdStartDDFlush(); - break; + heatDisinfectionStartConfirmed = FALSE; - case DD_MODE_HEAT: -// if ( DD_CMD_START_HEAT_DISINFECT_ACTIVE_COOL == currentDDCleaningMode.startRequestCmdID ) -// { -// //cmdStartDDHeatDisinfectActiveCool(); -// } -// else -// { -// //cmdStartDDHeatDisinfectPassiveCool(); -// } - break; + cmdStartDDHeatDisinfect(); - case DD_MODE_HCOL: - //cmdStartDDActiveCool(); - break; - } - state = STANDBY_WAIT_FOR_DD_CLEANING_MODE_CMD_RESPONSE_STATE; + state = STANDBY_WAIT_FOR_DD_CLEANING_MODE_TO_START_STATE; } - else - { - switch ( getDDOpMode() ) - { - case DD_MODE_FLUS: - case DD_MODE_HEAT: - // This is for the situations that any of the disinfect modes are started using the proxy commands while the HD - // is in this state of the Standby Mode. - setRequestedCleaningMode( getDDOpMode(), FALSE ); - state = STANDBY_WAIT_FOR_DD_CLEANING_MODE_TO_START_STATE; - currentDDCleaningMode.startCleaningMode = FALSE; - break; - default: - // Do nothing we are not in the cleaning mode - break; - } - } - return state; } @@ -406,63 +411,22 @@ * cool heat disinfect or not. * @return none *************************************************************************/ -static void setRequestedCleaningMode( DD_OP_MODE_T opMode, BOOL isHeatDisPassiveCool ) +static void setRequestedCleaningMode( DD_DISINFECT_SEL_COMMAND_T opMode ) { switch ( opMode ) { - case DD_MODE_FLUS: - currentDDCleaningMode.startCleaningMode = TRUE; - currentDDCleaningMode.startRequestCmdID = DD_CMD_START_FLUSH; - currentDDCleaningMode.ddOpMode = DD_MODE_FLUS; - currentDDCleaningMode.sampleRqstTrgrd = FALSE; -// currentDDCleaningMode.alarmID = ALARM_ID_TD_DISINFECT_FLUSH; - currentDDCleaningMode.stopRequestCmdID = GENERIC_CONFIRM_ID_DISINFECT_STOP_WATERFLUSH; + case DD_CMD_START_DISINFECT_SKIP: break; -// case DD_MODE_HEAT: -// currentDDCleaningMode.startCleaningMode = TRUE; + case DD_CMD_START_DISINFECT_HEAT: + currentDDCleaningMode.startCleaningMode = TRUE; // currentDDCleaningMode.startRequestCmdID = ( FALSE == isHeatDisPassiveCool ? DD_CMD_START_HEAT_DISINFECT_ACTIVE_COOL : DD_CMD_START_HEAT_DISINFECT_PASSIVE_COOL ); -// currentDDCleaningMode.ddOpMode = DD_MODE_HEAT; -// currentDDCleaningMode.sampleRqstTrgrd = FALSE; + currentDDCleaningMode.ddOpMode = DD_MODE_HEAT; + currentDDCleaningMode.sampleRqstTrgrd = FALSE; // currentDDCleaningMode.alarmID = ALARM_ID_TD_DISINFECT_HEAT; -// currentDDCleaningMode.stopRequestCmdID = GENERIC_CONFIRM_ID_DISINFECT_STOP_HEAT; -// break; -// -// case DD_MODE_CHEM: -// currentDDCleaningMode.startCleaningMode = TRUE; -// currentDDCleaningMode.startRequestCmdID = DD_CMD_START_CHEM_DISINFECT; -// currentDDCleaningMode.ddOpMode = DD_MODE_CHEM; -// currentDDCleaningMode.sampleRqstTrgrd = FALSE; -// currentDDCleaningMode.alarmID = ALARM_ID_TD_DISINFECT_CHEM; -// currentDDCleaningMode.stopRequestCmdID = GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL; -// break; -// -// case DD_MODE_CHFL: -// currentDDCleaningMode.startCleaningMode = TRUE; -// currentDDCleaningMode.startRequestCmdID = DD_CMD_START_CHEM_DISINFECT_FLUSH; -// currentDDCleaningMode.ddOpMode = DD_MODE_CHFL; -// currentDDCleaningMode.sampleRqstTrgrd = FALSE; -// currentDDCleaningMode.alarmID = ALARM_ID_TD_DISINFECT_CHEM_FLUSH; -// currentDDCleaningMode.stopRequestCmdID = GENERIC_CONFIRM_ID_DISINFECT_STOP_CHEMICAL_FLUSH; -// break; -// -// case DD_MODE_HCOL: -// currentDDCleaningMode.startCleaningMode = FALSE; -// currentDDCleaningMode.startRequestCmdID = DD_CMD_START_ACTIVE_COOL; -// currentDDCleaningMode.ddOpMode = DD_MODE_HCOL; -// currentDDCleaningMode.sampleRqstTrgrd = FALSE; -// currentDDCleaningMode.alarmID = ALARM_ID_TD_DISINFECT_HEAT_COOL; -// currentDDCleaningMode.stopRequestCmdID = GENERIC_CONFIRM_ID_DISINFECT_STOP_ACTIVE_COOL; -// break; -// -// case DD_MODE_ROPS: -// currentDDCleaningMode.startCleaningMode = TRUE; -// currentDDCleaningMode.startRequestCmdID = DD_CMD_START_RO_PERMEATE_SAMPLE; -// currentDDCleaningMode.ddOpMode = DD_MODE_ROPS; -// currentDDCleaningMode.sampleRqstTrgrd = FALSE; -// currentDDCleaningMode.alarmID = ALARM_ID_TD_RO_PERMEATE_SAMPLE; -// currentDDCleaningMode.stopRequestCmdID = GENERIC_CONFIRM_ID_DISINFECT_STOP_RO_PERMEATE_SAMPLE; -// break; + currentDDCleaningMode.stopRequestCmdID = GENERIC_CONFIRM_ID_DISINFECT_STOP_HEAT; + break; + } } @@ -613,42 +577,108 @@ /*********************************************************************//** * @brief - * The signalUserInitiateFlushMode function handles user initiation of flush + * The signalUserInitiateDisinfectionSelection function handles user initiation of flush * mode. * @details \b Inputs: currentStandbyState * @details \b Outputs: currentStandbyState * @return TRUE if signal accepted, FALSE if not *************************************************************************/ -BOOL signalUserInitiateFlushMode( void ) +BOOL signalUserInitiateDisinfectionSelection( + DD_DISINFECT_SEL_COMMAND_T command ) { - BOOL result = FALSE; - REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE; - UI_RESPONSE_PAYLOAD_T response; - memset( &response, 0, sizeof( UI_RESPONSE_PAYLOAD_T ) ); + BOOL result = FALSE; if ( MODE_STAN == getCurrentOperationMode() ) { - if ( ( STANDBY_WAIT_FOR_DISINFECT_STATE == currentStandbyState ) || ( STANDBY_WAIT_FOR_TREATMENT_STATE == currentStandbyState ) ) + if ( STANDBY_WAIT_FOR_TREATMENT_STATE == currentStandbyState ) { - if ( TRUE == isDDCommunicating() ) + if ( DD_CMD_START_DISINFECT_SKIP == command ) { - setRequestedCleaningMode( DD_MODE_FLUS, FALSE ); - result = TRUE; - currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE; - rejReason = REQUEST_REJECT_REASON_NONE; + requestedDisinfectionCommand = DD_CMD_DISINFECT_INIT; + currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE; + result = TRUE; } - else + else if ( DD_CMD_START_DISINFECT_HEAT == command ) { - rejReason = REQUEST_REJECT_REASON_DD_COMM_LOST; + requestedDisinfectionCommand = command; + currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE; + result = TRUE; } } + else if ( ( STANDBY_WAIT_FOR_DISINFECT_STATE == currentStandbyState ) && + ( DD_CMD_START_DISINFECT_HEAT == command ) ) + { + // User confirmed Heat Disinfection setup screen. + heatDisinfectionStartConfirmed = TRUE; + result = TRUE; + } } + else if ( MODE_POST == getCurrentOperationMode() ) + { + signalUserConfirmDisinfection( command ); + result = TRUE; + } - // Respond to request to start treatment. - response.accepted = result; - response.rejectionReason = rejReason; - sendMessage( MSG_ID_TD_DISINFECT_RESPONSE, COMM_BUFFER_OUT_CAN_TD_2_UI, (U08*) &response, sizeof( UI_RESPONSE_PAYLOAD_T ) ); + return result; +} +/*********************************************************************//** + * @brief + * The signalStandbyDisinfectionSelection function saves the selected + * disinfection option for use by Standby mode. + * @details \b Inputs: Selected disinfection command. + * @details \b Outputs: Updates requestedDisinfectionCommand. + * @param command Selected disinfection command. + * @return none + *************************************************************************/ +void signalStandbyDisinfectionSelection( DD_DISINFECT_SEL_COMMAND_T command ) +{ + requestedDisinfectionCommand = command; +} + +/*********************************************************************//** + * @brief + * The handleUIDisinfectRequest function handles a disinfect/flush user + * action command message from the UI. + * @details \b Inputs: none + * @details \b Outputs: message handled + * @param message a pointer to the message to handle + * @return none + *************************************************************************/ +BOOL handleUIDisinfectRequest( MESSAGE_T *message ) +{ + BOOL result = FALSE; + TD_OP_MODE_T mode = getCurrentOperationMode(); + UI_RESPONSE_PAYLOAD_T response; + DD_DISINFECT_SEL_COMMAND_T command = DD_CMD_DISINFECT_INIT; + + response.rejectionReason = REQUEST_REJECT_REASON_NONE; + if ( sizeof( U32 ) == message->hdr.payloadLen ) + { + memcpy( &command , &message->payload[ 0 ], sizeof(U32) ); + if ( TRUE == isDDCommunicating() ) + { + result = signalUserInitiateDisinfectionSelection( command ); + response.rejectionReason = + REQUEST_REJECT_REASON_NONE; + } + else + { + response.rejectionReason = + REQUEST_REJECT_REASON_DD_COMM_LOST; + } + } + else + { + response.rejectionReason = + REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT; + } + + response.accepted = result; + + sendMessage( MSG_ID_TD_DISINFECT_RESPONSE, COMM_BUFFER_OUT_CAN_TD_2_UI, + (U08 *)&response, sizeof( UI_RESPONSE_PAYLOAD_T ) ); + return result; }