Add modal for force disarming if normal disarm fails#915
Merged
1Blademaster merged 5 commits intomainfrom Dec 15, 2025
Merged
Conversation
Closed
Contributor
There was a problem hiding this comment.
Pull request overview
This pull request adds a modal dialog that prompts users to force disarm the aircraft when a normal disarm attempt fails. The feature enhances the user experience by providing a clear option to force disarm when safety checks prevent normal disarming, while also displaying appropriate warnings about the risks.
- Backend endpoints now include
was_disarmingandwas_forceflags in arm/disarm responses to help the frontend determine when to show the modal - The MAVLink force arm/disarm parameter value was updated from 2989 to 21196
- A new React modal component provides a user-friendly interface for force disarming with clear safety warnings
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| radio/app/endpoints/arm.py | Added response flags to indicate if the operation was a disarm attempt and if force was used |
| radio/app/controllers/armController.py | Updated MAVLink force arm/disarm parameter from 2989 to 21196 |
| gcs/src/redux/slices/droneConnectionSlice.js | Added Redux state and actions for managing the force disarm modal visibility |
| gcs/src/redux/middleware/socketMiddleware.js | Added logic to open the force disarm modal when a non-force disarm fails |
| gcs/src/dashboard.jsx | Integrated the ForceDisarmModal component into the dashboard |
| gcs/src/components/dashboard/ForceDisarmModal.jsx | New modal component with force disarm functionality and safety warnings |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Kwash67
approved these changes
Dec 15, 2025
Contributor
Kwash67
left a comment
Kwash67
left a comment
There was a problem hiding this comment.
Modal can be styled better, but i'll approve for now👍
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.