Tools: use Location::AltFrame for guided_state.target_alt_frame

ArduPilot · Oct 17, 2024 · 1873e29 · 1873e29
1 parent a8b5320
commit 1873e29
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/Tools/autotest/arduplane.py b/Tools/autotest/arduplane.py
@@ -5589,7 +5589,7 @@ def MAV_CMD_GUIDED_CHANGE_ALTITUDE(self):
         self.start_subtest("set home relative altitude")
         self.takeoff(30, relative=True)
         self.change_mode('GUIDED')
-        for alt in 50, 70:
+        for alt in 150, 170:
             self.run_cmd_int(
                 mavutil.mavlink.MAV_CMD_GUIDED_CHANGE_ALTITUDE,
                 p7=alt,
@@ -5628,6 +5628,7 @@ def MAV_CMD_GUIDED_CHANGE_ALTITUDE(self):
             timeout=30,
             relative=False,
         )
+<<<<<<< HEAD
         # test that this works if switching between RELATIVE (HOME) and terrain
         self.start_subtest("set terrain altitude, switch to loiter and resume guided")
         self.change_mode('GUIDED')