Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ArmingStatus set to Armed based on actuator_armed.armed #21563

Merged
merged 1 commit into from
May 31, 2023

Conversation

henrykotze
Copy link
Contributor

Previously, the DroneCAN message uavcan::equipment::safety::ArmingStatus::status was set to STATUS_FULLY_ARMED if we were prearmed or armed. This would result in actuators being able to actuate such as ESC's even if the arm switch on the transmitter were on the disarm position, because the FMU entered prearmed.

This change sets uavcan::equipment::safety::ArmingStatus::status to STATUS_FULLY_ARMED if actuator_armed::armed is true.

On the cannode side, we hardcode prearm to true on receiving the uavcan::equipment::safety::ArmingStatus message, to allow servos/lights and other devices to be controlled in a disarmed state.

julianoes
julianoes previously approved these changes May 17, 2023
- ArmingStatus DroneCAN message STATUS field is only set to true based on
arming_status.armed

- Cannode prearm state is set to true always when ArmingStatus DroneCan
message is received
@henrykotze
Copy link
Contributor Author

Fixed Formatting and rebased

@DronecodeBot
Copy link

This pull request has been mentioned on Discussion Forum for PX4, Pixhawk, QGroundControl, MAVSDK, MAVLink. There might be relevant details there:

https://discuss.px4.io/t/px4-community-q-a-may-31-2023/32396/2

@dagar dagar merged commit fab58ee into PX4:main May 31, 2023
@henrykotze henrykotze deleted the pr-prearm-default-on-cannode branch June 8, 2023 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants