Merge branch 'v2.1.0-dev' into acs-ptg-ctrl-fixes-2

2023-05-23 15:37:16 +02:00
parent 8a65aca7b8 72b5c7d053
commit 7eeece6934
33 changed files with 1783 additions and 883 deletions
--- a/mission/controller/acs/SensorProcessing.cpp
+++ b/mission/controller/acs/SensorProcessing.cpp
@ -573,7 +573,7 @@ void SensorProcessing::processGps(const double gpsLatitude, const double gpsLong

    // Altitude FDIR
    if (gpsAltitude > gpsParameters->maximumFdirAltitude ||
-        gpsAltitude < gpsParameters->maximumFdirAltitude) {
+        gpsAltitude < gpsParameters->minimumFdirAltitude) {
      altitude = gpsParameters->fdirAltitude;
    } else {
      altitude = gpsAltitude;