fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-19 05:33:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename manual_lockdown to kill for clarity

Browse Source
This commit is contained in:
Matthias Grob
2025-07-28 17:07:08 +02:00
parent 32531c870e
commit 79b46e08a8
8 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/mixer_module/mixer_module.cpp
+2 -2
View File
@@ -458,7 +458,7 @@ bool MixingOutput::update()
// Send output if any function mapped or one last disabling sample
if (!all_disabled || !_was_all_disabled) {
if (!_armed.armed && !_armed.manual_lockdown) {
if (!_armed.armed && !_armed.kill) {
_actuator_test.overrideValues(outputs, _max_num_outputs);
}
@@ -473,7 +473,7 @@ bool MixingOutput::update()
void
MixingOutput::limitAndUpdateOutputs(float outputs[MAX_ACTUATORS], bool has_updates)
{
if (_armed.lockdown || _armed.manual_lockdown) {
if (_armed.lockdown || _armed.kill) {
// overwrite outputs in case of lockdown with disarmed values
for (size_t i = 0; i < _max_num_outputs; i++) {
_current_output_value[i] = _disarmed_value[i];
src/lib/mixer_module/mixer_module_tests.cpp
+2 -2
View File
@@ -148,13 +148,13 @@ public:
_actuator_test_pub.publish(actuator_test);
}
void sendActuatorArmed(bool armed, bool termination = false, bool manual_lockdown = false, bool prearm = false)
void sendActuatorArmed(bool armed, bool termination = false, bool kill = false, bool prearm = false)
{
actuator_armed_s actuator_armed{};
actuator_armed.timestamp = hrt_absolute_time();
actuator_armed.armed = armed;
actuator_armed.termination = termination;
actuator_armed.manual_lockdown = manual_lockdown;
actuator_armed.kill = kill;
actuator_armed.prearmed = prearm;
_actuator_armed_pub.publish(actuator_armed);
}