Index: firmware/App/Modes/ModeStandby.c =================================================================== diff -u -r3eb378de95b514ceb487e35342f58e734ca678c6 -r22fef1f14490125a8ccf059af78787e8b6f27b55 --- firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 3eb378de95b514ceb487e35342f58e734ca678c6) +++ firmware/App/Modes/ModeStandby.c (.../ModeStandby.c) (revision 22fef1f14490125a8ccf059af78787e8b6f27b55) @@ -1072,7 +1072,7 @@ else if ( disinfectCancelReqID != GENERIC_CONFIRM_ID_NONE ) { // Get the confirmation request. It consumes the request if completed and responds to UI. - confirm_status = getConfirmationRequestStatus( disinfectCancelReqID ); + confirm_status = getConfirmationRequestStatus( disinfectCancelReqID, 0.0F, 0.0F, 0.0F, 0.0F ); switch ( confirm_status ) { case CONFIRMATION_REQUEST_STATUS_ACCEPTED: @@ -1251,7 +1251,7 @@ if ( currentDGCleaningMode.sampleRequestID != GENERIC_CONFIRM_ID_NONE ) { // There is a user confirm - CONFIRMATION_REQUEST_STATUS_T status = getConfirmationRequestStatus( currentDGCleaningMode.sampleRequestID ); + CONFIRMATION_REQUEST_STATUS_T status = getConfirmationRequestStatus( currentDGCleaningMode.sampleRequestID, 0.0F, 0.0F, 0.0F, 0.0F ); U32 sampleStatus = 0; switch( status ) @@ -1316,7 +1316,7 @@ if ( currentDGCleaningMode.sampleRequestID != GENERIC_CONFIRM_ID_NONE ) { // There is a user confirm - CONFIRMATION_REQUEST_STATUS_T status = getConfirmationRequestStatus( currentDGCleaningMode.sampleRequestID ); + CONFIRMATION_REQUEST_STATUS_T status = getConfirmationRequestStatus( currentDGCleaningMode.sampleRequestID, 0.0F, 0.0F, 0.0F, 0.0F ); U32 sampleStatus = 0; switch( status ) Index: firmware/App/Modes/ModeTreatment.c =================================================================== diff -u -rab30d3ef5af247823a9a954ff71526699139caa7 -r22fef1f14490125a8ccf059af78787e8b6f27b55 --- firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision ab30d3ef5af247823a9a954ff71526699139caa7) +++ firmware/App/Modes/ModeTreatment.c (.../ModeTreatment.c) (revision 22fef1f14490125a8ccf059af78787e8b6f27b55) @@ -1589,7 +1589,8 @@ void handleUFRateConfirmationMessageFromUI( void ) { BOOL result = FALSE; - CONFIRMATION_REQUEST_STATUS_T status = getConfirmationRequestStatus( GENERIC_CONFIRM_ID_UF_RATE_CHANGE_IN_TX_DURATION_CHANGE ); + CONFIRMATION_REQUEST_STATUS_T status = getConfirmationRequestStatus( GENERIC_CONFIRM_ID_UF_RATE_CHANGE_IN_TX_DURATION_CHANGE, + txDurationRequest.newUFRateMLPM, 0.0F, 0.0F, 0.0F ); if ( TRUE == txDurationRequest.isUFRateConfInProgress ) { Index: firmware/App/Modes/OperationModes.c =================================================================== diff -u -r3044b79469c3eebf960f9ac6f4fb9a87718a8604 -r22fef1f14490125a8ccf059af78787e8b6f27b55 --- firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision 3044b79469c3eebf960f9ac6f4fb9a87718a8604) +++ firmware/App/Modes/OperationModes.c (.../OperationModes.c) (revision 22fef1f14490125a8ccf059af78787e8b6f27b55) @@ -449,7 +449,7 @@ * @param requestID ID of confirmation being requested * @return Status of given confirmation *************************************************************************/ -CONFIRMATION_REQUEST_STATUS_T getConfirmationRequestStatus( GENERIC_CONFIRM_ID_T requestID ) +CONFIRMATION_REQUEST_STATUS_T getConfirmationRequestStatus( GENERIC_CONFIRM_ID_T requestID, F32 payload1, F32 payload2, F32 payload3, F32 payload4 ) { BOOL pending = FALSE; U32 pendingIndex = 0; @@ -458,10 +458,10 @@ GENERIC_CONFIRMATION_REQUEST_T genConfRqst; genConfRqst.rejectReason = 0; - genConfRqst.genericPayload1 = 0.0F; - genConfRqst.genericPayload2 = 0.0F; - genConfRqst.genericPayload3 = 0.0F; - genConfRqst.genericPayload4 = 0.0F; + genConfRqst.genericPayload1 = payload1; + genConfRqst.genericPayload2 = payload2; + genConfRqst.genericPayload3 = payload3; + genConfRqst.genericPayload4 = payload3; for ( i = 0; i < MAX_PENDING_CONFIRM_REQUESTS; i++ ) { Index: firmware/App/Modes/OperationModes.h =================================================================== diff -u -r56ae47b6766bed3f138fa3f1989431d7a439ea7a -r22fef1f14490125a8ccf059af78787e8b6f27b55 --- firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision 56ae47b6766bed3f138fa3f1989431d7a439ea7a) +++ firmware/App/Modes/OperationModes.h (.../OperationModes.h) (revision 22fef1f14490125a8ccf059af78787e8b6f27b55) @@ -61,7 +61,8 @@ HD_OP_MODE_T getPreviousOperationMode( void ); // Get the previous operation mode U32 getCurrentSubMode( void ); // Get the current sub-mode void initiateAlarmAction( ALARM_ACTION_T action ); // Initiate an alarm or alarm recovery action according to current op mode -CONFIRMATION_REQUEST_STATUS_T getConfirmationRequestStatus( GENERIC_CONFIRM_ID_T requestID ); // Get the current confirmation request status +CONFIRMATION_REQUEST_STATUS_T getConfirmationRequestStatus( GENERIC_CONFIRM_ID_T requestID, F32 payload1, + F32 payload2, F32 payload3, F32 payload4 ); // Get the current confirmation request status void setConfirmationRequestStatus( GENERIC_CONFIRM_ID_T requestID, CONFIRMATION_REQUEST_STATUS_T status ); // Set the confirmation request status GENERIC_CONFIRM_ID_T addConfirmationRequest( GENERIC_CONFIRMATION_REQUEST_T *request ); // Add a new confirmation request Index: firmware/App/Services/AlarmMgmt.c =================================================================== diff -u -r56ae47b6766bed3f138fa3f1989431d7a439ea7a -r22fef1f14490125a8ccf059af78787e8b6f27b55 --- firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 56ae47b6766bed3f138fa3f1989431d7a439ea7a) +++ firmware/App/Services/AlarmMgmt.c (.../AlarmMgmt.c) (revision 22fef1f14490125a8ccf059af78787e8b6f27b55) @@ -1026,7 +1026,7 @@ alarmBackupAudioCurrent.data = getFPGABackupAlarmAudioCurrent(); // Check for user confirmation of end treatment alarm response - if ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == getConfirmationRequestStatus( GENERIC_CONFIRM_ID_TREATMENT_END ) ) + if ( CONFIRMATION_REQUEST_STATUS_ACCEPTED == getConfirmationRequestStatus( GENERIC_CONFIRM_ID_TREATMENT_END, 0.0F, 0.0F, 0.0F, 0.0F ) ) { // To avoid raising repeated alarm before reaching end treatment setVenousBubbleDetectionEnabled( FALSE );