zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

mavsdk_tests: correctly locate plan

release/1.12
Julian Oes 4 years ago committed by Daniel Agar
parent
cd66a79747
commit
2eaf677de3
2 changed files with 31 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      test/mavsdk_tests/test_vtol_mission.cpp
  2. 60
      test/mavsdk_tests/vtol_mission.plan

2
test/mavsdk_tests/test_vtol_mission.cpp
Unescape View File

@ -39,7 +39,7 @@ TEST_CASE("Fly VTOL mission", "[vtol]")
AutopilotTester tester; AutopilotTester tester;
tester.connect(connection_url); tester.connect(connection_url);
tester.wait_until_ready(); tester.wait_until_ready();
tester.load_qgc_mission_raw_and_move_here("test/mavsdk_tests/vtol_mission_allmend.plan"); tester.load_qgc_mission_raw_and_move_here("test/mavsdk_tests/vtol_mission.plan");
tester.arm(); tester.arm();
tester.execute_mission_raw(); tester.execute_mission_raw();
tester.wait_until_disarmed(); tester.wait_until_disarmed();

60
test/mavsdk_tests/vtol_mission_allmend.plan → test/mavsdk_tests/vtol_mission.plan
Unescape View File

@ -15,7 +15,7 @@
"hoverSpeed": 5, "hoverSpeed": 5,
"items": [ "items": [
{ {
"AMSLAltAboveTerrain": null, "AMSLAltAboveTerrain": 20,
"Altitude": 20, "Altitude": 20,
"AltitudeMode": 1, "AltitudeMode": 1,
"autoContinue": true, "autoContinue": true,
@ -27,14 +27,14 @@
0, 0,
0, 0,
null, null,
47.35575503646861, 47.39833113265167,
8.52080660767436, 8.545508725338607,
20 20
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null, "AMSLAltAboveTerrain": 20,
"Altitude": 20, "Altitude": 20,
"AltitudeMode": 1, "AltitudeMode": 1,
"autoContinue": true, "autoContinue": true,
@ -46,14 +46,14 @@
0, 0,
0, 0,
null, null,
47.35537212, 47.399332700068925,
8.52207767, 8.54481499384454,
20 20
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null, "AMSLAltAboveTerrain": 30,
"Altitude": 30, "Altitude": 30,
"AltitudeMode": 1, "AltitudeMode": 1,
"autoContinue": true, "autoContinue": true,
@ -65,14 +65,14 @@
0, 0,
0, 0,
null, null,
47.35349688, 47.39908888031702,
8.52355825, 8.54344001880591,
30 30
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null, "AMSLAltAboveTerrain": 30,
"Altitude": 30, "Altitude": 30,
"AltitudeMode": 1, "AltitudeMode": 1,
"autoContinue": true, "autoContinue": true,
@ -84,14 +84,14 @@
0, 0,
0, 0,
null, null,
47.3528936, 47.39760160279815,
8.52294671, 8.542394178137585,
30 30
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null, "AMSLAltAboveTerrain": 30,
"Altitude": 30, "Altitude": 30,
"AltitudeMode": 1, "AltitudeMode": 1,
"autoContinue": true, "autoContinue": true,
@ -103,14 +103,14 @@
0, 0,
0, 0,
null, null,
47.35230484, 47.396941861414504,
8.52030742, 8.54282818797708,
30 30
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null, "AMSLAltAboveTerrain": 30,
"Altitude": 30, "Altitude": 30,
"AltitudeMode": 1, "AltitudeMode": 1,
"autoContinue": true, "autoContinue": true,
@ -122,14 +122,14 @@
0, 0,
0, 0,
null, null,
47.35294448, 47.396686401111786,
8.51882684, 8.544419333554089,
30 30
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null, "AMSLAltAboveTerrain": 30,
"Altitude": 30, "Altitude": 30,
"AltitudeMode": 1, "AltitudeMode": 1,
"autoContinue": true, "autoContinue": true,
@ -141,14 +141,14 @@
0, 0,
0, 0,
null, null,
47.35375855, 47.397202447861446,
8.52002847, 8.545440338322464,
30 30
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null, "AMSLAltAboveTerrain": 20,
"Altitude": 20, "Altitude": 20,
"AltitudeMode": 1, "AltitudeMode": 1,
"autoContinue": true, "autoContinue": true,
@ -160,14 +160,14 @@
0, 0,
0, 0,
null, null,
47.35552475934091, 47.39766309343905,
8.51881610700002, 8.545713820298545,
20 20
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null, "AMSLAltAboveTerrain": 0,
"Altitude": 0, "Altitude": 0,
"AltitudeMode": 1, "AltitudeMode": 1,
"autoContinue": true, "autoContinue": true,
@ -179,17 +179,17 @@
0, 0,
20, 20,
null, null,
47.3557210047974, 47.397748880653054,
8.518762469830165, 8.545753080416318,
0 0
], ],
"type": "SimpleItem" "type": "SimpleItem"
} }
], ],
"plannedHomePosition": [ "plannedHomePosition": [
47.3557317, 47.39775218584113,
8.5187574, 8.545620889782981,
419.8934400000014 489.0021493051957
], ],
"vehicleType": 20, "vehicleType": 20,
"version": 2 "version": 2
Write Preview
Loading…
Cancel
Save