Update submodule sitl_gazebo-classic to latest Mon Mar 25 12:39:17 UTC 2024

- sitl_gazebo-classic in PX4/Firmware (4a553938fb): da7206e057
    - sitl_gazebo-classic current upstream: f754540e71
    - Changes: da7206e057...f754540e71

    f754540 2024-03-04 RyosukeMatsushima - remove unmatched bracket (#1024)
63b72dc 2024-03-04 Julian Oes - gimbal_controller: send attitude in Earth frame (#1023)

.editorconfig

@@ -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

Tools/simulation/gazebo-classic/sitl_gazebo-classic

@@ -1 +1 @@
-Subproject commit da7206e057703cc645770f02437013358b71e1c0
+Subproject commit f754540e714642fea897445e69a675245bc6306a

src/drivers/px4io/px4io.cpp

@@ -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);

src/lib/mixer_module/mixer_module.cpp

@@ -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;
 }
 

src/lib/mixer_module/mixer_module.hpp

@@ -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
 

src/lib/mixer_module/mixer_module_tests.cpp

@@ -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

src/modules/px4iofirmware/mixer.cpp

@@ -180,21 +180,17 @@ 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];
 		}
-		}
 
 	} 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];
 		}
 	}
-	}
 
 	/* set arming */
 	bool needs_to_arm = (should_arm || should_arm_nothrottle || should_always_enable_pwm);