Merge branch 'main' into disable-thrust-reduction

PX4 · Nov 20, 2024 · a695ee7 · a695ee7
2 parents e5d8528 + f8b34fd
commit a695ee7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
diff --git a/.github/workflows/build_all_targets.yml b/.github/workflows/build_all_targets.yml
@@ -36,6 +36,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Update python packaging to avoid canonicalize_version() error
+        run: |
+            pip3 install -U packaging
+
       - name: Install Python Dependencies
         uses: py-actions/py-dependency-install@v4
         with:

diff --git a/Tools/setup/requirements.txt b/Tools/setup/requirements.txt
@@ -1,7 +1,7 @@
 argcomplete
 cerberus
 coverage
-empy==3.3.4
+empy>=3.3,<4
 future
 jinja2>=2.8
 jsonschema

diff --git a/src/modules/commander/HealthAndArmingChecks/checks/batteryCheck.cpp b/src/modules/commander/HealthAndArmingChecks/checks/batteryCheck.cpp
@@ -75,6 +75,10 @@ static constexpr const char *battery_fault_reason_str(battery_fault_reason_t bat
 void BatteryChecks::checkAndReport(const Context &context, Report &reporter)
 {
 	if (circuit_breaker_enabled_by_val(_param_cbrk_supply_chk.get(), CBRK_SUPPLY_CHK_KEY)) {
+		// Reset related failsafe flags otherwise failures from before disabling the check cause failsafes without reported reason
+		reporter.failsafeFlags().battery_unhealthy = false;
+		reporter.failsafeFlags().battery_low_remaining_time = false;
+		reporter.failsafeFlags().battery_warning = battery_status_s::BATTERY_WARNING_NONE;
 		return;
 	}
 

diff --git a/src/modules/sensors/vehicle_air_data/VehicleAirData.cpp b/src/modules/sensors/vehicle_air_data/VehicleAirData.cpp
@@ -38,7 +38,6 @@
 #include <lib/geo/geo.h>
 #include <lib/atmosphere/atmosphere.h>
 
-
 namespace sensors
 {
 
@@ -188,6 +187,12 @@ void VehicleAirData::Run()
 							_sensor_sub[uorb_index].registerCallback();
 						}
 
+						if (!_calibration[uorb_index].calibrated()) {
+							_calibration[uorb_index].set_device_id(report.device_id);
+							_calibration[uorb_index].ParametersSave(uorb_index);
+							param_notify_changes();
+						}
+
 						ParametersUpdate(true);
 					}