Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r8492830da5862d7eeaea89d30efb5ea5dcc22572 -r00f98c3a603917bb25450e7686bc75a34c357e97 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 8492830da5862d7eeaea89d30efb5ea5dcc22572) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 00f98c3a603917bb25450e7686bc75a34c357e97) @@ -48,18 +48,6 @@ #define USER_COMMAND_CANCEL 0 ///< Cancel treatment workflow command code. #define USER_COMMAND_INITIATE 1 ///< Initiate treatment workflow command code. -/// DD cleaning mode status data structure -typedef struct -{ - BOOL startCleaningMode; ///< Flag to indicate to start cleaning mode. - DD_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). - GENERIC_CONFIRM_ID_T sampleRequestID; ///< Sample request pass/fail message status. - GENERIC_CONFIRM_ID_T stopRequestCmdID; ///< Stop DD cleaning request command ID -} DD_CLEANING_MODE_STATUS_T; - // ********** private data ********** static TD_STANDBY_STATE_T currentStandbyState; ///< Current state (sub-mode) of standby mode. @@ -68,7 +56,6 @@ 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_COMMAND_T requestedDisinfectionCommand = DD_CMD_NONE; // ********** private function prototypes ********** @@ -77,6 +64,9 @@ static TD_STANDBY_STATE_T handleStandbyModeWaitForTreatmentState( void ); static void setRequestedCleaningMode( DISINFECT_SELECTION_T opMode ); static TD_STANDBY_STATE_T handleStandbyModeWaitForDisinfectState( void ); +static TD_STANDBY_STATE_T handleStandbyModeWaitForDDCleaningModeCmdResponseState( void ); +static TD_STANDBY_STATE_T handleStandbyModeWaitForDDCleaningModeStartState( void ); +static TD_STANDBY_STATE_T handleStandbyModeDDCleaningModeInProgressState( void ); static void setStandbyStateTransition( void ); /*********************************************************************//** @@ -184,23 +174,16 @@ currentStandbyState = handleStandbyModeWaitForDisinfectState(); break; + case STANDBY_WAIT_FOR_DD_CLEANING_MODE_CMD_RESPONSE_STATE: + currentStandbyState = handleStandbyModeWaitForDDCleaningModeCmdResponseState(); + break; + case STANDBY_WAIT_FOR_DD_CLEANING_MODE_TO_START_STATE: - if ( DD_MODE_HEAT == getDDOpMode() ) - { - currentStandbyState = STANDBY_CLEANING_MODE_IN_PROGRESS_STATE; - } + currentStandbyState = handleStandbyModeWaitForDDCleaningModeStartState(); break; case STANDBY_CLEANING_MODE_IN_PROGRESS_STATE: - if ( ( DD_MODE_HEAT == getDDOpMode() ) && - ( DD_HEAT_DISINFECT_STATE_COMPLETE == getDDSubMode() ) ) - { - requestedDisinfectionCommand = DD_CMD_NONE; - heatDisinfectionStartConfirmed = FALSE; - - currentStandbyState = - STANDBY_WAIT_FOR_TREATMENT_STATE; - } + currentStandbyState = handleStandbyModeDDCleaningModeInProgressState(); break; default: @@ -256,25 +239,30 @@ setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT ); homingInitiated = FALSE; state = STANDBY_WAIT_FOR_TREATMENT_STATE; - } - switch ( requestedDisinfectionCommand ) - { - case DD_CMD_START_DISINFECT_SKIP: - state = STANDBY_WAIT_FOR_TREATMENT_STATE; - requestedDisinfectionCommand = DD_CMD_NONE; - break; + // Determine the next Standby state from the Post-Treatment + // disinfection selection. + switch ( requestedDisinfectionCommand ) + { + case DD_CMD_NONE: + state = STANDBY_WAIT_FOR_TREATMENT_STATE; + break; - case DD_CMD_START_DISINFECT_HEAT: - state = STANDBY_WAIT_FOR_DISINFECT_STATE; - requestedDisinfectionCommand = DD_CMD_NONE; - break; + case DD_CMD_START_DISINFECT_SKIP: + state = STANDBY_WAIT_FOR_TREATMENT_STATE; + requestedDisinfectionCommand = DD_CMD_NONE; + break; - default: - state = STANDBY_WAIT_FOR_TREATMENT_STATE; - requestedDisinfectionCommand = DD_CMD_NONE; - break; - } + case DD_CMD_START_DISINFECT_HEAT: + state = STANDBY_WAIT_FOR_DISINFECT_STATE; + break; + default: + state = STANDBY_WAIT_FOR_TREATMENT_STATE; + requestedDisinfectionCommand = DD_CMD_NONE; + break; + } + } + return state; } @@ -369,12 +357,12 @@ /*********************************************************************//** * @brief - * The handleStandbyModeWaitForDisinfectState function handles wait for - * disinfect state. - * @details \b Inputs: flushStartReqReceived, heatDisinfectStartReqReceived, - * chemDisinfectStartReqReceived - * @details \b Outputs: none - * @return next state of the standby mode state machine + * The handleStandbyModeWaitForDisinfectState function handles the + * Standby Wait For Disinfect state. + * @details \b Inputs: requestedDisinfectionCommand, + * heatDisinfectionStartConfirmed. + * @details \b Outputs: heatDisinfectionStartConfirmed. + * @return Next Standby mode state. *************************************************************************/ static TD_STANDBY_STATE_T handleStandbyModeWaitForDisinfectState( void ) { @@ -385,16 +373,95 @@ { heatDisinfectionStartConfirmed = FALSE; + // Request DD to start Heat Disinfection. cmdStartDDHeatDisinfect(); - state = STANDBY_WAIT_FOR_DD_CLEANING_MODE_TO_START_STATE; + state = STANDBY_WAIT_FOR_DD_CLEANING_MODE_CMD_RESPONSE_STATE; } return state; } /*********************************************************************//** * @brief + * The handleStandbyModeWaitForDDCleaningModeCmdResponseState function + * waits for the DD response to the Heat Disinfection start request. + * @details \b Inputs: DD Heat Disinfection command response. + * @details \b Outputs: Standby state transition. + * @return Next Standby mode state. + *************************************************************************/ +static TD_STANDBY_STATE_T handleStandbyModeWaitForDDCleaningModeCmdResponseState( void ) +{ + TD_STANDBY_STATE_T state = STANDBY_WAIT_FOR_DD_CLEANING_MODE_CMD_RESPONSE_STATE; + DD_CMD_RESPONSE_T ddCmdResp; + + if ( TRUE == getDDCommandResponse( DD_CMD_START_DISINFECT_HEAT, &ddCmdResp ) ) + { + if ( FALSE == ddCmdResp.rejected ) + { + state = STANDBY_WAIT_FOR_DD_CLEANING_MODE_TO_START_STATE; + } + else + { + // DD rejected the Heat Disinfection start request. + // Return to the setup confirmation state so the request + // may be retried. + state = STANDBY_WAIT_FOR_DISINFECT_STATE; + } + } + + return state; +} + +/*********************************************************************//** + * @brief + * The handleStandbyModeWaitForDDCleaningModeStartState function handles + * the standby mode wait for DD cleaning mode to start state. + * @details \b Inputs: DD operation mode + * @details \b Outputs: none + * @return next state of the standby mode state machine + *************************************************************************/ +static TD_STANDBY_STATE_T handleStandbyModeWaitForDDCleaningModeStartState( void ) +{ + TD_STANDBY_STATE_T state = STANDBY_WAIT_FOR_DD_CLEANING_MODE_TO_START_STATE; + + // Wait until DD reports that Heat Disinfection has started. + if ( DD_MODE_HEAT == getDDOpMode() ) + { + state = STANDBY_CLEANING_MODE_IN_PROGRESS_STATE; + } + + return state; +} + +/*********************************************************************//** + * @brief + * The handleStandbyModeDDCleaningModeInProgressState function handles + * Heat Disinfection while DD cleaning is in progress. + * @details \b Inputs: DD operation mode and DD sub-mode. + * @details \b Outputs: requestedDisinfectionCommand, + * heatDisinfectionStartConfirmed. + * @return Next Standby mode state. + *************************************************************************/ +static TD_STANDBY_STATE_T handleStandbyModeDDCleaningModeInProgressState( void ) +{ + TD_STANDBY_STATE_T state = STANDBY_CLEANING_MODE_IN_PROGRESS_STATE; + + // Wait until DD reports Heat Disinfection complete. + if ( ( DD_MODE_HEAT == getDDOpMode() ) && + ( DD_HEAT_DISINFECT_STATE_COMPLETE == getDDSubMode() ) ) + { + requestedDisinfectionCommand = DD_CMD_NONE; + heatDisinfectionStartConfirmed = FALSE; + + state = STANDBY_WAIT_FOR_TREATMENT_STATE; + } + + return state; +} + +/*********************************************************************//** + * @brief * The setStandbyStateTransition function sets the actuators and variables * for Standby state transitions. * @details \b Inputs: newState @@ -404,20 +471,24 @@ *************************************************************************/ static void setStandbyStateTransition( void ) { - // Common Standby actuator settings. - resetAirTrap(); + if ( ( currentStandbyState == STANDBY_START_STATE ) || + ( currentStandbyState == STANDBY_WAIT_FOR_TREATMENT_STATE ) ) + { + // Common Standby actuator settings. + resetAirTrap(); - setAirPumpState( AIR_PUMP_STATE_OFF, - AIR_PUMP_MOTOR_OFF ); + setAirPumpState( AIR_PUMP_STATE_OFF, + AIR_PUMP_MOTOR_OFF ); - set3WayValveState( H13_VALV, - VALVE_3WAY_COMMON_TO_CLOSED_STATE ); + set3WayValveState( H13_VALV, + VALVE_3WAY_COMMON_TO_CLOSED_STATE ); - set3WayValveState( H20_VALV, - VALVE_3WAY_COMMON_TO_CLOSED_STATE ); + set3WayValveState( H20_VALV, + VALVE_3WAY_COMMON_TO_CLOSED_STATE ); - stopSyringePump(); - signalBloodPumpHardStop(); + stopSyringePump(); + signalBloodPumpHardStop(); + } switch ( currentStandbyState ) { @@ -440,6 +511,22 @@ // Qs 0 break; + case STANDBY_WAIT_FOR_DISINFECT_STATE: + // No additional actuator changes required. + break; + + case STANDBY_WAIT_FOR_DD_CLEANING_MODE_CMD_RESPONSE_STATE: + // No additional actuator changes required. + break; + + case STANDBY_WAIT_FOR_DD_CLEANING_MODE_TO_START_STATE: + // No additional actuator changes required. + break; + + case STANDBY_CLEANING_MODE_IN_PROGRESS_STATE: + // No additional actuator changes required. + break; + default: SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, @@ -473,36 +560,6 @@ /*********************************************************************//** * @brief - * The setRequestedCleaningMode function sets the variables for the requested - * DD cleaning mode. - * @details \b Inputs: currentDDCleaningMode - * @details \b Outputs: none - * @param opMode DD operation mode that has been requested (i.e. heat disinfect) - * @param isHeatDisPassiveCool boolean flag to indicate whether this is a passive - * cool heat disinfect or not. - * @return none - *************************************************************************/ -static void setRequestedCleaningMode( DISINFECT_SELECTION_T opMode ) -{ - switch ( opMode ) - { - case DD_CMD_START_DISINFECT_SKIP: - break; - - 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.alarmID = ALARM_ID_TD_DISINFECT_HEAT; -// currentDDCleaningMode.stopRequestCmdID = GENERIC_CONFIRM_ID_DISINFECT_STOP_HEAT; - break; - - } -} - -/*********************************************************************//** - * @brief * The getFluidType function returns the current fluid type assigned * based on the user's treatment selection. * @details \b Inputs: none @@ -729,18 +786,10 @@ result = TRUE; } } - else if ( ( STANDBY_WAIT_FOR_DISINFECT_STATE == currentStandbyState ) && - ( DD_CMD_START_DISINFECT_HEAT == options ) ) - { - // User confirmed Heat Disinfection setup screen. - heatDisinfectionStartConfirmed = TRUE; - result = TRUE; - } } else if ( MODE_POST == getCurrentOperationMode() ) { - signalUserConfirmDisinfection( options ); - result = TRUE; + result = signalUserConfirmDisinfection( options ); } return result; @@ -765,7 +814,18 @@ if ( sizeof( U32 ) == message->hdr.payloadLen ) { - heatDisinfectionStartConfirmed = TRUE; + if ( ( STANDBY_WAIT_FOR_DISINFECT_STATE == currentStandbyState ) && + ( DD_CMD_START_DISINFECT_HEAT == requestedDisinfectionCommand ) ) + { + // User confirmed Heat Disinfection setup screen. + heatDisinfectionStartConfirmed = TRUE; + result = TRUE; + } + else + { + result = FALSE; + response.rejectionReason = REQUEST_REJECT_REASON_CONFIRMATION_NOT_EXPECTED; + } } else { @@ -807,7 +867,6 @@ BOOL handleUIDisinfectRequest( MESSAGE_T *message ) { BOOL result = FALSE; - TD_OP_MODE_T mode = getCurrentOperationMode(); UI_RESPONSE_PAYLOAD_T response; DISINFECT_SELECTION_T options = DISINFECT_SEL_SKIP; @@ -818,13 +877,18 @@ if ( TRUE == isDDCommunicating() ) { result = signalUserInitiateDisinfectionSelection( options ); - response.rejectionReason = - REQUEST_REJECT_REASON_NONE; + if ( result ) + { + response.rejectionReason = REQUEST_REJECT_REASON_NONE; + } + else + { + response.rejectionReason = REQUEST_REJECT_REASON_INVALID_COMMAND; + } } else { - response.rejectionReason = - REQUEST_REJECT_REASON_DD_COMM_LOST; + response.rejectionReason = REQUEST_REJECT_REASON_DD_COMM_LOST; } } else