Index: firmware/App/Modes/Rinseback.c =================================================================== diff -u -r6d750c93f17571bbeba89404b63d87f37a9243af -rcd5be724d5a3ba7457e761191d82f278654d7f5c --- firmware/App/Modes/Rinseback.c (.../Rinseback.c) (revision 6d750c93f17571bbeba89404b63d87f37a9243af) +++ firmware/App/Modes/Rinseback.c (.../Rinseback.c) (revision cd5be724d5a3ba7457e761191d82f278654d7f5c) @@ -1,14 +1,14 @@ /************************************************************************** * -* Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved. +* Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. * * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * @file Rinseback.c * * @author (last) Sean Nash -* @date (last) 21-Jun-2023 +* @date (last) 08-Sep-2023 * * @author (original) Sean Nash * @date (original) 20-Jan-2021 @@ -68,6 +68,7 @@ static F32 totalAdditionalRinsebackVolume_mL; ///< Total accumulated volume (in mL) delivered so far for all additional volumes combined. static U32 rinsebackAdditionalTimerCtr; ///< Timer counter for duration of an additional rinseback delivery. static U32 rinsebackPublishTimerCtr; ///< Timer counter for determining interval for rinseback status to be published. + /// Interval (in task intervals) at which to publish rinseback data to CAN bus. static OVERRIDE_U32_T rinsebackPublishInterval = { RINSEBACK_DATA_PUBLISH_INTERVAL, RINSEBACK_DATA_PUBLISH_INTERVAL, RINSEBACK_DATA_PUBLISH_INTERVAL, 0 }; @@ -96,6 +97,7 @@ static RINSEBACK_STATE_T handleRinsebackPausedState( void ); static RINSEBACK_STATE_T handleRinsebackStoppedState( void ); static RINSEBACK_STATE_T handleRinsebackRunAdditionalState( void ); +static RINSEBACK_STATE_T handleRinsebackReconnectPatientState( void ); static BOOL handleStartRinsebackUserAction( REQUEST_REJECT_REASON_CODE_T *rejReason ); static BOOL handleIncrRinsebackUserAction( REQUEST_REJECT_REASON_CODE_T *rejReason ); @@ -165,6 +167,7 @@ void transitionToRinseback( void ) { initRinseback(); + setCurrentSubState( (U32)rinsebackState ); doorClosedRequired( TRUE, TRUE ); @@ -280,12 +283,6 @@ rinsebackTimerCtr++; - // Check for user confirmation of end treatment - if ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == getConfirmationRequestStatus( GENERIC_CONFIRM_ID_TREATMENT_END ) ) - { - endTreatmentRequested = TRUE; - } - switch ( rinsebackState ) { case RINSEBACK_STOP_INIT_STATE: @@ -308,6 +305,10 @@ rinsebackState = handleRinsebackRunAdditionalState(); break; + case RINSEBACK_RECONNECT_PATIENT_STATE: + rinsebackState = handleRinsebackReconnectPatientState(); + break; + default: SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_RINSEBACK_INVALID_STATE, rinsebackState ); break; @@ -459,8 +460,9 @@ * @brief * The handleRinsebackPausedState function handles the rinseback paused * state operations. - * @details Inputs: flags - * @details Outputs: flags handled + * @details Inputs: rinsebackTimerCtr, resumeRinsebackRequested, + * endTreatmentRequested, endRinsebackRequested, rinsebackRate_mL_min + * @details Outputs: targetRinsebackVolumePlusAdditional_mL * @return next rinseback state *************************************************************************/ static RINSEBACK_STATE_T handleRinsebackPausedState( void ) @@ -478,6 +480,10 @@ setupForRinsebackDelivery( rinsebackRate_mL_min ); result = RINSEBACK_RUN_STATE; } + else if ( TRUE == endTreatmentRequested ) + { + signalEndTreatment(); + } // Has user requested to end rinseback? else if ( TRUE == endRinsebackRequested ) { @@ -531,7 +537,7 @@ } else if ( TRUE == backToTreatmentRequested ) { - signalGoToTreatmentStopped(); + result = RINSEBACK_RECONNECT_PATIENT_STATE; } else if ( TRUE == endTreatmentRequested ) { @@ -570,8 +576,9 @@ targetRinsebackVolumePlusAdditional_mL = getRinsebackVolume(); result = RINSEBACK_STOP_STATE; } - // Has additional rinseback completed - else if ( additionalRinsebackVolume_mL >= TARGET_ADDITIONAL_RINSEBACK_VOLUME_ML ) + // Has additional rinseback completed or max additional volume reached + else if ( ( additionalRinsebackVolume_mL >= TARGET_ADDITIONAL_RINSEBACK_VOLUME_ML ) || + ( totalAdditionalRinsebackVolume_mL >= MAX_TOTAL_ADDITIONAL_RINSEBACK_VOLUME_ML ) ) { result = RINSEBACK_STOP_STATE; } @@ -604,6 +611,34 @@ /*********************************************************************//** * @brief + * The handleRinsebackReconnectPatientState function handles the rinseback + * reconnect patient state operations. + * @details Inputs: flags + * @details Outputs: flags handled + * @return next rinseback state + *************************************************************************/ +static RINSEBACK_STATE_T handleRinsebackReconnectPatientState( void ) +{ + RINSEBACK_STATE_T result = RINSEBACK_RECONNECT_PATIENT_STATE; + + if ( TRUE == resumeRinsebackRequested ) + { + result = RINSEBACK_STOP_STATE; + } + else if ( TRUE == backToTreatmentRequested ) + { + signalGoToTreatmentStopped(); + } + else if ( TRUE == endTreatmentRequested ) + { + signalEndTreatment(); + } + + return result; +} + +/*********************************************************************//** + * @brief * The signalRinsebackAlarmResumeUserAction function signals the rinseback * sub-mode to resume per user alarm action. * @details Inputs: none @@ -820,7 +855,7 @@ * user action request. It is assumed that the calling function will set * the reject reason parameter to None beforehand. * @details Inputs: rinsebackState - * @details Outputs: rinseback resumed if appropriate + * @details Outputs: resumeRinsebackRequested * @param rejReason Code indicating reason for rejection * @return TRUE if user action accepted, FALSE if not *************************************************************************/ @@ -830,16 +865,14 @@ if ( RINSEBACK_PAUSED_STATE == rinsebackState ) { - if ( getNoRetriggerFlag() != TRUE ) - { - result = TRUE; - resumeRinsebackRequested = TRUE; - } - else - { - *rejReason = REQUEST_REJECT_REASON_TREATMENT_CANNOT_BE_RESUMED; - } + result = TRUE; + resumeRinsebackRequested = TRUE; } + else if ( RINSEBACK_RECONNECT_PATIENT_STATE == rinsebackState ) + { + result = TRUE; + resumeRinsebackRequested = TRUE; + } else { *rejReason = REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE; @@ -891,7 +924,7 @@ if ( RINSEBACK_STOP_STATE == rinsebackState ) { - if ( ( totalAdditionalRinsebackVolume_mL + TARGET_ADDITIONAL_RINSEBACK_VOLUME_ML ) <= MAX_TOTAL_ADDITIONAL_RINSEBACK_VOLUME_ML ) + if ( totalAdditionalRinsebackVolume_mL < MAX_TOTAL_ADDITIONAL_RINSEBACK_VOLUME_ML ) { result = TRUE; additionalRinsebackRequested = TRUE; @@ -966,7 +999,9 @@ { *rejReason = REQUEST_REJECT_REASON_TREATMENT_CANNOT_BE_RESUMED; } - else if ( ( RINSEBACK_STOP_INIT_STATE != rinsebackState ) && ( RINSEBACK_STOP_STATE != rinsebackState ) ) + else if ( ( RINSEBACK_STOP_INIT_STATE != rinsebackState ) && + ( RINSEBACK_STOP_STATE != rinsebackState ) && + ( RINSEBACK_RECONNECT_PATIENT_STATE != rinsebackState ) ) { *rejReason = REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE; } @@ -1010,19 +1045,26 @@ data.targetRinsebackVolumeMl = rinsebackTargetVolume_mL; rinsebackPublishTimerCtr = 0; // If we have completed rinseback, timeout is no longer in force - indicate by zeroing timeout. Also include any additionals to target. + data.timeout = 0; + data.countdown = 0; if ( ( rinsebackState > RINSEBACK_PAUSED_STATE ) && ( getRinsebackVolume() >= rinsebackTargetVolume_mL ) ) { data.targetRinsebackVolumeMl = targetRinsebackVolumePlusAdditional_mL; - timeout = 0; } data.deliveredRinsebackVolumeMl = getRinsebackVolume(); data.rinsebackFlowRateMlMin = rinsebackRate_mL_min; if ( RINSEBACK_RUN_ADDITIONAL_STATE == rinsebackState ) { data.rinsebackFlowRateMlMin = DEFAULT_RINSEBACK_FLOW_RATE_ML_MIN; } - data.timeout = timeout; - data.countdown = countdown; + if ( getRinsebackCompleted() != TRUE ) + { + if ( rinsebackTimerCtr > 0 ) // Timer set to zero when BP is running + { + data.timeout = timeout; + data.countdown = countdown; + } + } if ( data.deliveredRinsebackVolumeMl >= rinsebackTargetVolume_mL ) { data.isCompleted = TRUE;