Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r1aedb1b649f6c427a6bf92b0e82486609bcfa698 -r8492830da5862d7eeaea89d30efb5ea5dcc22572 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 1aedb1b649f6c427a6bf92b0e82486609bcfa698) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 8492830da5862d7eeaea89d30efb5ea5dcc22572) @@ -21,6 +21,7 @@ #include "Bubbles.h" #include "Buttons.h" #include "Compatible.h" +#include "DDDefs.h" #include "DDInterface.h" #include "Messaging.h" #include "ModeInitPOST.h" @@ -47,18 +48,35 @@ #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. static BOOL treatStartReqReceived; ///< Flag indicates user has requested initiation of a treatment. 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_COMMAND_T requestedDisinfectionCommand = DD_CMD_NONE; // ********** private function prototypes ********** static TD_STANDBY_STATE_T handleStandbyModeStartState( void ); static TD_STANDBY_STATE_T handleStandbyModeWaitForTreatmentState( void ); +static void setRequestedCleaningMode( DISINFECT_SELECTION_T opMode ); +static TD_STANDBY_STATE_T handleStandbyModeWaitForDisinfectState( void ); static void setStandbyStateTransition( void ); /*********************************************************************//** @@ -73,6 +91,7 @@ currentStandbyState = STANDBY_START_STATE; treatStartReqReceived = FALSE; homingInitiated = FALSE; + heatDisinfectionStartConfirmed = FALSE; fluidType = FLUID_TYPE_UNKNOWN; modality = TREATMENT_MODALITY_HD_SALINE_FLUID; } @@ -161,6 +180,29 @@ currentStandbyState = handleStandbyModeWaitForTreatmentState(); break; + case STANDBY_WAIT_FOR_DISINFECT_STATE: + 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_NONE; + 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; @@ -215,7 +257,24 @@ 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; + case DD_CMD_START_DISINFECT_HEAT: + state = STANDBY_WAIT_FOR_DISINFECT_STATE; + requestedDisinfectionCommand = DD_CMD_NONE; + break; + + default: + state = STANDBY_WAIT_FOR_TREATMENT_STATE; + requestedDisinfectionCommand = DD_CMD_NONE; + break; + } + return state; } @@ -310,6 +369,32 @@ /*********************************************************************//** * @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 + *************************************************************************/ +static TD_STANDBY_STATE_T handleStandbyModeWaitForDisinfectState( void ) +{ + TD_STANDBY_STATE_T state = STANDBY_WAIT_FOR_DISINFECT_STATE; + + if ( ( DD_CMD_START_DISINFECT_HEAT == requestedDisinfectionCommand ) && + ( TRUE == heatDisinfectionStartConfirmed ) ) + { + heatDisinfectionStartConfirmed = FALSE; + + cmdStartDDHeatDisinfect(); + + state = STANDBY_WAIT_FOR_DD_CLEANING_MODE_TO_START_STATE; + } + + return state; +} + +/*********************************************************************//** + * @brief * The setStandbyStateTransition function sets the actuators and variables * for Standby state transitions. * @details \b Inputs: newState @@ -363,6 +448,7 @@ break; } } + /*********************************************************************//** * @brief * The setFluidType function sets the fluid type based on the user's @@ -387,6 +473,36 @@ /*********************************************************************//** * @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 @@ -584,7 +700,148 @@ } } +/*********************************************************************//** + * @brief + * 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 signalUserInitiateDisinfectionSelection( DISINFECT_SELECTION_T options ) +{ + BOOL result = FALSE; + if ( MODE_STAN == getCurrentOperationMode() ) + { + if ( STANDBY_WAIT_FOR_TREATMENT_STATE == currentStandbyState ) + { + if ( DISINFECT_SEL_SKIP == options ) + { + requestedDisinfectionCommand = DD_CMD_START_DISINFECT_SKIP; + currentStandbyState = STANDBY_WAIT_FOR_TREATMENT_STATE; + result = TRUE; + } + else if ( DISINFECT_SEL_HEAT == options ) + { + requestedDisinfectionCommand = DD_CMD_START_DISINFECT_HEAT; + currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE; + 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; + } + + return result; +} + +/*********************************************************************//** + * @brief + * The handleDisinfectionConfirmCmd function handles user selection + * of the Post-Treatment disinfection operation. + * @details \b Inputs: Disinfection selection message. + * @details \b Outputs: Acceptance response and selected disinfection command. + * @param message Pointer to the message to handle. + * @return TRUE if the selection is accepted, FALSE otherwise. + *************************************************************************/ +BOOL handleDisinfectionConfirmCmd( MESSAGE_T *message ) +{ + BOOL result = FALSE; + TD_OP_MODE_T mode = getCurrentOperationMode(); + UI_RESPONSE_PAYLOAD_T response; + + response.rejectionReason = REQUEST_REJECT_REASON_NONE; + + if ( sizeof( U32 ) == message->hdr.payloadLen ) + { + heatDisinfectionStartConfirmed = TRUE; + } + 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; +} + +/*********************************************************************//** + * @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_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; + DISINFECT_SELECTION_T options = DISINFECT_SEL_SKIP; + + response.rejectionReason = REQUEST_REJECT_REASON_NONE; + if ( sizeof( U32 ) == message->hdr.payloadLen ) + { + memcpy( &options , &message->payload[ 0 ], sizeof(U32) ); + if ( TRUE == isDDCommunicating() ) + { + result = signalUserInitiateDisinfectionSelection( options ); + 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; +} + + /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/