Compare commits

..

1 Commits

Author SHA1 Message Date
PX4 BuildBot 255eb5fb56 Update submodule public_regulated_data_types to latest Mon Mar 25 12:39:24 UTC 2024
- public_regulated_data_types in PX4/Firmware (9dac66b5ef): d0bd6516da
    - public_regulated_data_types current upstream: f9f67906cc
    - Changes: d0bd6516da...f9f67906cc

    f9f6790 2024-03-19 Pavel Kirienko - Hotfix: reduce the extent of ExecuteCommand.1.3 (#147)
ec27883 2024-03-19 EliotRossRob - Add output field in response (#146)
bb5f918 2024-01-28 Will MacCormack - Add COMMAND_IDENTIFY (#145)
935973b 2023-02-16 Pavel Kirienko - Stabilize uavcan.node.port.List (#138)
16b4f31 2023-02-11 Pavel Kirienko - Update the magnetic quantities in the SI namespace; add luminance; fix the PORT_NAME regexp (#137)
70573cb 2022-05-06 Pavel Kirienko - Automatic extension change & Cyphalization (#127)
2024-03-25 12:39:24 +00:00
21 changed files with 9 additions and 36 deletions

View File

@ -1,14 +1,6 @@
root = true
[*]
insert_final_newline = false
[{*.{c,cpp,cc,h,hpp},CMakeLists.txt,Kconfig}]
[*.{c,cpp,cc,h,hpp}]
indent_style = tab
tab_width = 8
# Not in the official standard, but supported by many editors
max_line_length = 120
[*.yaml]
indent_style = space
indent_size = 2

@ -1 +1 @@
Subproject commit d0bd6516dac8ff61287fe49a9f2c75e7d4dc1b8e
Subproject commit f9f67906cc0ca5d7c1b429924852f6b28f313cbf

View File

@ -364,13 +364,6 @@ PX4IO::~PX4IO()
bool PX4IO::updateOutputs(bool stop_motors, uint16_t outputs[MAX_ACTUATORS],
unsigned num_outputs, unsigned num_control_groups_updated)
{
for (size_t i = 0; i < num_outputs; i++) {
if (!_mixing_output.isFunctionSet(i)) {
// do not run any signal on disabled channels
outputs[i] = 0;
}
}
if (!_test_fmu_fail) {
/* output to the servos */
io_reg_set(PX4IO_PAGE_DIRECT_PWM, 0, outputs, num_outputs);

View File

@ -455,8 +455,7 @@ bool MixingOutput::update()
}
}
// Send output if any function mapped or one last disabling sample
if (!all_disabled || !_was_all_disabled) {
if (!all_disabled) {
if (!_armed.armed && !_armed.manual_lockdown) {
_actuator_test.overrideValues(outputs, _max_num_outputs);
}
@ -464,8 +463,6 @@ bool MixingOutput::update()
limitAndUpdateOutputs(outputs, has_updates);
}
_was_all_disabled = all_disabled;
return true;
}

View File

@ -288,7 +288,6 @@ private:
hrt_abstime _lowrate_schedule_interval{300_ms};
ActuatorTest _actuator_test{_function_assignment};
uint32_t _reversible_mask{0}; ///< per-output bits. If set, the output is configured to be reversible (motors only)
bool _was_all_disabled{false};
uORB::SubscriptionCallbackWorkItem *_subscription_callback{nullptr}; ///< current scheduling callback

View File

@ -191,15 +191,11 @@ TEST_F(MixerModuleTest, basic)
mixing_output.setAllMaxValues(MAX_VALUE);
EXPECT_EQ(test_module.num_updates, 0);
// all functions disabled: expect to get one single update to process disabling the output signal
// all functions disabled: not expected to get an update
mixing_output.update();
mixing_output.updateSubscriptions(false);
mixing_output.update();
EXPECT_EQ(test_module.num_updates, 1);
mixing_output.update();
mixing_output.updateSubscriptions(false);
mixing_output.update();
EXPECT_EQ(test_module.num_updates, 1);
EXPECT_EQ(test_module.num_updates, 0);
test_module.reset();
// configure motor, ensure all still disarmed

View File

@ -180,19 +180,15 @@ mixer_tick()
* Run the mixers.
*/
if (source == MIX_FAILSAFE) {
// Set failsafe value if the PWM output isn't disabled
/* copy failsafe values to the servo outputs */
for (unsigned i = 0; i < PX4IO_SERVO_COUNT; i++) {
if (r_page_servos[i] != 0) {
r_page_servos[i] = r_page_servo_failsafe[i];
}
r_page_servos[i] = r_page_servo_failsafe[i];
}
} else if (source == MIX_DISARMED) {
// Set disarmed value if the PWM output isn't disabled
/* copy disarmed values to the servo outputs */
for (unsigned i = 0; i < PX4IO_SERVO_COUNT; i++) {
if (r_page_servos[i] != 0) {
r_page_servos[i] = r_page_servo_disarmed[i];
}
r_page_servos[i] = r_page_servo_disarmed[i];
}
}