Index: firmware/App/Modes/ModePostTreat.c =================================================================== diff -u -rc048e88d130c4c30f9538330e8fcf23fcc581806 -r00f98c3a603917bb25450e7686bc75a34c357e97 --- firmware/App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision c048e88d130c4c30f9538330e8fcf23fcc581806) +++ firmware/App/Modes/ModePostTreat.c (.../ModePostTreat.c) (revision 00f98c3a603917bb25450e7686bc75a34c357e97) @@ -39,19 +39,18 @@ * @{ */ -#define POST_TREAT_STATE_BROADCAST_COUNT (MS_PER_SECOND / TASK_PRIORITY_INTERVAL) +#define POST_TREAT_STATE_DATA_PUB_INTERVAL (MS_PER_SECOND / TASK_PRIORITY_INTERVAL) // ********** private definitions ********** +static TD_POST_TREATMENT_STATE_T currentPostTreatmentState; ///< Current Post-Treatment sub-state static BOOL patientDisconnectionConfirmed; ///< Flag indicates user confirms patient disconnection. static BOOL patientDisconnectHandled; ///< Flag indicates patient disconnect actions have been handled static BOOL disposableRemovalConfirmed; ///< Flag indicates user confirms disposable removal. static DISINFECT_SELECTION_T selectedDisinfectionSelection; ///< Selected disinfection option from UI.static BOOL disinfectionSelectionReceived; static BOOL disinfectionSelectionReceived; static volatile U32 postTreatmentStateBroadcastTimer; ///< Timer counter for pending power off request. -static TD_POST_TREATMENT_STATE_T currentPostTreatmentState; ///< Current Post-Treatment sub-state - // ********** private function prototypes ********** static void setPostTreatStateTransition( void ); @@ -69,13 +68,13 @@ **************************************************************************/ void initPostTreatmentMode( void ) { - currentPostTreatmentState = TD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE; - patientDisconnectionConfirmed = FALSE; - patientDisconnectHandled = FALSE; - disposableRemovalConfirmed = FALSE; - disinfectionSelectionReceived = FALSE; - selectedDisinfectionSelection = DISINFECT_SEL_SKIP; - postTreatmentStateBroadcastTimer = 0; + currentPostTreatmentState = TD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE; + patientDisconnectionConfirmed = FALSE; + patientDisconnectHandled = FALSE; + disposableRemovalConfirmed = FALSE; + disinfectionSelectionReceived = FALSE; + selectedDisinfectionSelection = DISINFECT_SEL_SKIP; + postTreatmentStateBroadcastTimer = 0; } /*********************************************************************//** @@ -98,71 +97,6 @@ } /*********************************************************************//** -* @brief -* The setPostTreatStateTransition function sets the actuators and variables -* for the state transition in Post-Treatment mode. -* @details \b Inputs: Valve states, Pump speed -* @details \b Outputs: Actuate valves, pumps as desired -* @Param state Post-Treatment state enum -* @return none -**************************************************************************/ -static void setPostTreatStateTransition( void ) -{ - // Disable air trap level control. - resetAirTrap(); - // H12 Air Pump - Off. - setAirPumpState( AIR_PUMP_STATE_OFF, - AIR_PUMP_MOTOR_OFF ); - // H13 Air Trap Valve In - Closed. - set3WayValveState( H13_VALV, - VALVE_3WAY_COMMON_TO_CLOSED_STATE ); - // H20 Air Trap Valve Out - Closed. - set3WayValveState( H20_VALV, - VALVE_3WAY_COMMON_TO_CLOSED_STATE ); - //H10 Heparin/Syringe Pump - Off. - stopSyringePump(); - signalBloodPumpHardStop(); - - switch ( currentPostTreatmentState ) - { - case TD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE: - setValvePosition( H1_VALV, - VALVE_POSITION_C_CLOSE ); - setValvePosition( H19_VALV, - VALVE_POSITION_C_CLOSE ); - break; - - case TD_POST_TREATMENT_AUTO_EJECT_STATE: - setValvePosition( H1_VALV, - VALVE_POSITION_A_INSERT_EJECT ); - setValvePosition( H19_VALV, - VALVE_POSITION_A_INSERT_EJECT ); - break; - - case TD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE: - setValvePosition( H1_VALV, - VALVE_POSITION_A_INSERT_EJECT ); - setValvePosition( H19_VALV, - VALVE_POSITION_A_INSERT_EJECT ); - break; - - case TD_POST_TREATMENT_DISINFECTION_STATE: - setValvePosition( H1_VALV, - VALVE_POSITION_A_INSERT_EJECT ); - setValvePosition( H19_VALV, - VALVE_POSITION_A_INSERT_EJECT ); - break; - - default: - SET_ALARM_WITH_2_U32_DATA( - ALARM_ID_TD_SOFTWARE_FAULT, - SW_FAULT_ID_MODE_POST_TREATMENT_INVALID_STATE1, - currentPostTreatmentState ); - break; - } -} - -/*********************************************************************//** * @brief * The execPostTreatmentMode function executes the Post-Treatment * mode state machine. @@ -173,14 +107,14 @@ U32 execPostTreatmentMode( void ) { BOOL stop = isStopButtonPressed(); + TD_POST_TREATMENT_STATE_T prevPostTreatmentState = currentPostTreatmentState; + POST_TREATMENT_STATES_DATA_PAYLOAD_T payload = { 0 }; if ( TRUE == stop ) { // Ignore stop button in this mode. } - TD_POST_TREATMENT_STATE_T prevPostTreatmentState = currentPostTreatmentState; - // Execute mode state machine switch ( currentPostTreatmentState ) { @@ -203,16 +137,20 @@ default: SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, SW_FAULT_ID_MODE_POST_TREATMENT_INVALID_STATE, - currentPostTreatmentState ); + (U32)currentPostTreatmentState ); break; } postTreatmentStateBroadcastTimer++; - if (postTreatmentStateBroadcastTimer >= POST_TREAT_STATE_BROADCAST_COUNT) + if (postTreatmentStateBroadcastTimer >= POST_TREAT_STATE_DATA_PUB_INTERVAL) { postTreatmentStateBroadcastTimer = 0U; - //TODO: need to broadcast currentstate on which msgid + payload.mSubMode = (U32)currentPostTreatmentState; + broadcastData( MSG_ID_TD_POST_TREATMENT_STATES_DATA, + COMM_BUFFER_OUT_CAN_TD_BROADCAST, (U08 *)&payload, + sizeof( POST_TREATMENT_STATES_DATA_PAYLOAD_T ) ); } + if ( prevPostTreatmentState != currentPostTreatmentState) { setPostTreatStateTransition(); @@ -222,6 +160,63 @@ } /*********************************************************************//** +* @brief +* The setPostTreatStateTransition function sets the actuators and variables +* for the state transition in Post-Treatment mode. +* @details \b Inputs: Valve states, Pump speed +* @details \b Outputs: Actuate valves, pumps as desired +* @Param state Post-Treatment state enum +* @return none +**************************************************************************/ +static void setPostTreatStateTransition( void ) +{ + signalBloodPumpHardStop(); + // Disable air trap level control. + resetAirTrap(); + // H12 Air Pump - Off. + setAirPumpState( AIR_PUMP_STATE_OFF, AIR_PUMP_MOTOR_OFF ); + // H13 Air Trap Valve In - Closed. + set3WayValveState( H13_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE ); + // H20 Air Trap Valve Out - Closed. + set3WayValveState( H20_VALV, VALVE_3WAY_COMMON_TO_CLOSED_STATE ); + //H10 Heparin/Syringe Pump - Off. + stopSyringePump(); + // TODO: Set H5 ejector Off. + // Dialyzer - Bypassed. + // Qdt - 0. + // Quf - 0. + // Qs - 0. + switch ( currentPostTreatmentState ) + { + case TD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE: + setValvePosition( H1_VALV, VALVE_POSITION_B_OPEN ); + setValvePosition( H19_VALV, VALVE_POSITION_C_CLOSE ); + break; + + case TD_POST_TREATMENT_AUTO_EJECT_STATE: + setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT ); + setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT ); + break; + + case TD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE: + setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT ); + setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT ); + break; + + case TD_POST_TREATMENT_DISINFECTION_STATE: + setValvePosition( H1_VALV, VALVE_POSITION_A_INSERT_EJECT ); + setValvePosition( H19_VALV, VALVE_POSITION_A_INSERT_EJECT ); + break; + + default: + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_TD_SOFTWARE_FAULT, + SW_FAULT_ID_MODE_POST_TREATMENT_INVALID_STATE1, + currentPostTreatmentState ); + break; + } +} + +/*********************************************************************//** * @brief * The handlePatientDisconnectionState function executes the Post-Treatment * mode Patient Disconnection state machine. @@ -320,7 +315,7 @@ { TD_POST_TREATMENT_STATE_T state = TD_POST_TREATMENT_DISINFECTION_STATE; - static DD_COMMAND_T command = DD_CMD_NONE; + DD_COMMAND_T command = DD_CMD_NONE; if ( TRUE == disinfectionSelectionReceived ) { @@ -345,16 +340,19 @@ command = DD_CMD_NONE; break; } -// command = selectedDisinfectionSelection + DD_CMD_START_DISINFECT_SKIP; - // Save selected disinfection option in Standby. - signalStandbyDisinfectionSelection( command ); - // Request DD transition to Standby. - cmdStopGenerateDialysate(); + if ( DD_CMD_NONE != command ) + { + // Save selected disinfection option in Standby. + signalStandbyDisinfectionSelection( command ); - // Transition TD to Standby. - requestNewOperationMode( MODE_STAN ); + // Request DD transition to Standby. + cmdStopGenerateDialysate(); + // Transition TD to Standby. + requestNewOperationMode( MODE_STAN ); + } + disinfectionSelectionReceived = FALSE; } @@ -363,42 +361,109 @@ /*********************************************************************//** * @brief - * The signalUserConfirmPatientDisconnection signals post-treatment mode - * user has confirmed patient disconnection. - * @details \b Inputs: none - * @details \b Outputs: patientDisconnectedConfirm - * @return none + * The signalUserConfirmDisinfection function signals Post-Treatment mode + * that the user has selected a disinfection option. + * @details \b Inputs: current operation mode, current Post-Treatment state, + * and selected disinfection option. + * @details \b Outputs: disinfectionSelectionReceived, + * selectedDisinfectionSelection. + * @param options Disinfection option selected by the user. + * @return TRUE if the selection is accepted, otherwise FALSE. *************************************************************************/ -void signalUserConfirmPatientDisconnection( void ) +BOOL signalUserConfirmDisinfection( DISINFECT_SELECTION_T options ) { - patientDisconnectionConfirmed = TRUE; + BOOL result = FALSE; + + if ( ( TD_POST_TREATMENT_DISINFECTION_STATE == currentPostTreatmentState ) && + ( (U32)options < (U32)NUM_OF_DISINFECT_SELECTIONS ) ) + { + selectedDisinfectionSelection = options; + disinfectionSelectionReceived = TRUE; + result = TRUE; + } + + return result; } /*********************************************************************//** * @brief - * The signalUserConfirmDisposableRemoval signals post-treatment mode - * user has confirmed disposable removal. - * @details \b Inputs: none - * @details \b Outputs: disposableRemovalConfirmed - * @return none + * The handlePatientDisconnectionConfirmCmd function handles user + * confirmation of patient disconnection. + * @details \b Inputs: Patient disconnection confirmation message. + * @details \b Outputs: Acceptance response and patient disconnection signal. + * @param message Pointer to the message to handle. + * @return TRUE if the confirmation is accepted, FALSE otherwise. *************************************************************************/ -void signalUserConfirmDisposableRemoval( void ) +BOOL handlePatientDisconnectionConfirmCmd( MESSAGE_T *message ) { - disposableRemovalConfirmed = TRUE; + TD_OP_MODE_T mode = getCurrentOperationMode(); + TD_POST_TREATMENT_STATE_T postTxState = currentPostTreatmentState; + U32 payloadLen = message->hdr.payloadLen; + BOOL accepted = FALSE; + UI_RESPONSE_PAYLOAD_T response; + + response.accepted = FALSE; + response.rejectionReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE; + + if ( ( 0U == payloadLen ) && ( MODE_POST == mode ) && + ( TD_POST_TREATMENT_PATIENT_DISCONNECTION_STATE == postTxState ) ) + { + patientDisconnectionConfirmed = TRUE; + + accepted = TRUE; + response.accepted = TRUE; + response.rejectionReason = REQUEST_REJECT_REASON_NONE; + } + else if ( 0U != payloadLen ) + { + response.rejectionReason = REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT; + } + + sendMessage( MSG_ID_TD_PATIENT_DISCONNECT_CONFIRM_RESPONSE, + COMM_BUFFER_OUT_CAN_TD_2_UI, (U08 *)&response, + sizeof( UI_RESPONSE_PAYLOAD_T ) ); + + return accepted; } /*********************************************************************//** * @brief - * The signalUserConfirmDisinfection signals Post-Treatment mode that - * the user has confirmed the disinfection selection. - * @details \b Inputs: none - * @details \b Outputs: selectedDisinfectionCommand - * @return none + * The handleDisposableRemovalConfirmCmd function handles user confirmation + * of disposable removal. + * @details \b Inputs: Disposable removal confirmation message. + * @details \b Outputs: Acceptance response and disposable removal signal. + * @param message Pointer to the message to handle. + * @return TRUE if the confirmation is accepted, FALSE otherwise. *************************************************************************/ -void signalUserConfirmDisinfection( DISINFECT_SELECTION_T options ) +BOOL handleDisposableRemovalConfirmCmd( MESSAGE_T *message ) { - disinfectionSelectionReceived = TRUE; - selectedDisinfectionSelection = options; + TD_OP_MODE_T mode = getCurrentOperationMode(); + U32 payloadLen = message->hdr.payloadLen; + BOOL accepted = FALSE; + UI_RESPONSE_PAYLOAD_T response; + + response.accepted = FALSE; + response.rejectionReason = REQUEST_REJECT_REASON_NOT_ALLOWED_IN_CURRENT_MODE; + + if ( ( 0U == payloadLen ) && ( MODE_POST == mode ) && + ( TD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE == currentPostTreatmentState ) ) + { + disposableRemovalConfirmed = TRUE; + + accepted = TRUE; + response.accepted = TRUE; + response.rejectionReason = REQUEST_REJECT_REASON_NONE; + } + else if ( 0U != payloadLen ) + { + response.rejectionReason = REQUEST_REJECT_REASON_INVALID_REQUEST_FORMAT; + } + + sendMessage( MSG_ID_TD_POST_TREATMENT_DISPOSABLE_REMOVAL_CONFIRM_RESPONSE, + COMM_BUFFER_OUT_CAN_TD_2_UI, (U08 *)&response, + sizeof( UI_RESPONSE_PAYLOAD_T ) ); + + return accepted; }