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

update vtol mission tests to increase length

sbg
Daniel Agar 7 years ago
parent
fd0f31ef50
commit
b5aded0db2
4 changed files with 224 additions and 83 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. 78
      integrationtests/python_src/px4_it/mavros/missions/vtol_new_2.plan
  2. 133
      integrationtests/python_src/px4_it/mavros/missions/vtol_old_1.plan
  3. 63
      integrationtests/python_src/px4_it/mavros/missions/vtol_old_2.plan
  4. 33
      integrationtests/python_src/px4_it/mavros/missions/vtol_old_3.plan

78
integrationtests/python_src/px4_it/mavros/missions/vtol_new_2.plan
Unescape View File

@ -1,9 +1,6 @@
{ {
"fileType": "Plan", "fileType": "Plan",
"geoFence": { "geoFence": {
"polygon": [
],
"version": 1
}, },
"groundStation": "QGroundControl", "groundStation": "QGroundControl",
"mission": { "mission": {
@ -12,22 +9,28 @@
"hoverSpeed": 5, "hoverSpeed": 5,
"items": [ "items": [
{ {
"AMSLAltAboveTerrain": null,
"Altitude": 12,
"AltitudeMode": 0,
"autoContinue": true, "autoContinue": true,
"command": 84, "command": 84,
"doJumpId": 1, "doJumpId": 1,
"frame": 3, "frame": 3,
"params": [ "params": [
15.0, 15,
0, 0,
0, 0,
null, null,
47.397746387399621, 47.39774638739962,
8.5455920888607579, 8.545592088860758,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null,
"Altitude": 12,
"AltitudeMode": 0,
"autoContinue": true, "autoContinue": true,
"command": 16, "command": 16,
"doJumpId": 2, "doJumpId": 2,
@ -37,35 +40,76 @@
0, 0,
0, 0,
null, null,
47.399093548895856, 47.3981026817918,
8.5455438069836305, 8.548114267064136,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null,
"Altitude": 50,
"AltitudeMode": 0,
"autoContinue": true, "autoContinue": true,
"command": 85, "command": 16,
"doJumpId": 3, "doJumpId": 3,
"frame": 3, "frame": 3,
"params": [
0,
0,
0,
null,
47.39995383332046,
8.54783592762601,
50
],
"type": "SimpleItem"
},
{
"AMSLAltAboveTerrain": null,
"Altitude": 20,
"AltitudeMode": 0,
"autoContinue": true,
"command": 16,
"doJumpId": 4,
"frame": 3,
"params": [
0,
0,
0,
null,
47.39998472464772,
8.544660189638307,
20
],
"type": "SimpleItem"
},
{
"AMSLAltAboveTerrain": null,
"Altitude": 0,
"AltitudeMode": 0,
"autoContinue": true,
"command": 85,
"doJumpId": 5,
"frame": 3,
"params": [ "params": [
0, 0,
0, 0,
0, 0,
null, null,
47.39903545, 47.39903545,
8.5432263800000001, 8.54322638,
0.0 0
], ],
"type": "SimpleItem" "type": "SimpleItem"
} }
], ],
"plannedHomePosition": [ "plannedHomePosition": [
47.397742, 47.3977419,
8.545594, 8.5455943,
12.0 489
], ],
"vehicleType": 19, "vehicleType": 20,
"version": 2 "version": 2
}, },
"rallyPoints": { "rallyPoints": {

133
integrationtests/python_src/px4_it/mavros/missions/vtol_old_1.plan
Unescape View File

@ -1,9 +1,6 @@
{ {
"fileType": "Plan", "fileType": "Plan",
"geoFence": { "geoFence": {
"polygon": [
],
"version": 1
}, },
"groundStation": "QGroundControl", "groundStation": "QGroundControl",
"mission": { "mission": {
@ -12,18 +9,21 @@
"hoverSpeed": 5, "hoverSpeed": 5,
"items": [ "items": [
{ {
"AMSLAltAboveTerrain": null,
"Altitude": 12,
"AltitudeMode": 0,
"autoContinue": true, "autoContinue": true,
"command": 22, "command": 22,
"doJumpId": 1, "doJumpId": 1,
"frame": 3, "frame": 3,
"params": [ "params": [
15.0, 15,
0, 0,
0, 0,
null, null,
47.398046406687619, 47.39804640668762,
8.5458366721115908, 8.54583667211159,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
@ -38,12 +38,15 @@
0, 0,
0, 0,
47.398033142089844, 47.398033142089844,
8.5457897186279297, 8.54578971862793,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null,
"Altitude": 12,
"AltitudeMode": 0,
"autoContinue": true, "autoContinue": true,
"command": 16, "command": 16,
"doJumpId": 3, "doJumpId": 3,
@ -53,13 +56,16 @@
0, 0,
0, 0,
null, null,
47.399269104003906, 47.398882302443944,
8.5455722808837891, 8.544601519419729,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null,
"Altitude": 12,
"AltitudeMode": 0,
"autoContinue": true, "autoContinue": true,
"command": 16, "command": 16,
"doJumpId": 4, "doJumpId": 4,
@ -69,51 +75,130 @@
0, 0,
0, 0,
null, null,
47.399281145681528, 47.399831101001084,
8.54424775753435,
12
],
"type": "SimpleItem"
},
{
"AMSLAltAboveTerrain": null,
"Altitude": 12,
"AltitudeMode": 0,
"autoContinue": true,
"command": 16,
"doJumpId": 5,
"frame": 3,
"params": [
0,
0,
0,
null,
47.400661353275886,
8.544699555148952,
12
],
"type": "SimpleItem"
},
{
"AMSLAltAboveTerrain": null,
"Altitude": 12,
"AltitudeMode": 0,
"autoContinue": true,
"command": 16,
"doJumpId": 6,
"frame": 3,
"params": [
0,
0,
0,
null,
47.40083843752823,
8.546172909420818,
12
],
"type": "SimpleItem"
},
{
"AMSLAltAboveTerrain": null,
"Altitude": 12,
"AltitudeMode": 0,
"autoContinue": true,
"command": 16,
"doJumpId": 7,
"frame": 3,
"params": [
0,
0,
0,
null,
47.40019385680461,
8.547528070486777,
12
],
"type": "SimpleItem"
},
{
"AMSLAltAboveTerrain": null,
"Altitude": 12,
"AltitudeMode": 0,
"autoContinue": true,
"command": 16,
"doJumpId": 8,
"frame": 3,
"params": [
0,
0,
0,
null,
47.39928114568153,
8.547910568913295, 8.547910568913295,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"autoContinue": true, "autoContinue": true,
"command": 3000, "command": 3000,
"doJumpId": 5, "doJumpId": 9,
"frame": 2, "frame": 2,
"params": [ "params": [
3, 3,
0, 0,
0, 0,
0, 0,
47.397785186767578, 47.39778518676758,
8.545262336730957, 8.545262336730957,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null,
"Altitude": 12,
"AltitudeMode": 0,
"autoContinue": true, "autoContinue": true,
"command": 21, "command": 21,
"doJumpId": 6, "doJumpId": 10,
"frame": 3, "frame": 3,
"params": [ "params": [
25.0, 25,
0, 0,
0, 0,
null, null,
47.398884865088675, 47.398884865088675,
8.547918116539563, 8.547918116539563,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
} }
], ],
"plannedHomePosition": [ "plannedHomePosition": [
47.397742, 47.3977419,
8.545594, 8.5455943,
12.0 489
], ],
"vehicleType": 19, "vehicleType": 20,
"version": 2 "version": 2
}, },
"rallyPoints": { "rallyPoints": {

63
integrationtests/python_src/px4_it/mavros/missions/vtol_old_2.plan
Unescape View File

@ -1,9 +1,6 @@
{ {
"fileType": "Plan", "fileType": "Plan",
"geoFence": { "geoFence": {
"polygon": [
],
"version": 1
}, },
"groundStation": "QGroundControl", "groundStation": "QGroundControl",
"mission": { "mission": {
@ -12,18 +9,21 @@
"hoverSpeed": 5, "hoverSpeed": 5,
"items": [ "items": [
{ {
"AMSLAltAboveTerrain": null,
"Altitude": 12,
"AltitudeMode": 0,
"autoContinue": true, "autoContinue": true,
"command": 22, "command": 22,
"doJumpId": 1, "doJumpId": 1,
"frame": 3, "frame": 3,
"params": [ "params": [
15.0, 15,
0, 0,
0, 0,
null, null,
47.397740722711738, 47.39774072271174,
8.5455944102696719, 8.545594410269672,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
@ -37,13 +37,16 @@
0, 0,
0, 0,
0, 0,
47.397732380000001, 47.39773238,
8.5458224099999995, 8.54582241,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null,
"Altitude": 12,
"AltitudeMode": 0,
"autoContinue": true, "autoContinue": true,
"command": 16, "command": 16,
"doJumpId": 3, "doJumpId": 3,
@ -53,13 +56,16 @@
0, 0,
0, 0,
0, 0,
47.397749067235559, 47.39693448800759,
8.5429755110031351, 8.540991562303702,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null,
"Altitude": 12,
"AltitudeMode": 0,
"autoContinue": true, "autoContinue": true,
"command": 16, "command": 16,
"doJumpId": 4, "doJumpId": 4,
@ -69,9 +75,9 @@
0, 0,
0, 0,
null, null,
47.399213119631852, 47.39921311963185,
8.5430124879018479, 8.543012487901848,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
@ -85,35 +91,38 @@
0, 0,
0, 0,
0, 0,
47.399158900000003, 47.3991589,
8.5429077299999996, 8.54290773,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null,
"Altitude": 12,
"AltitudeMode": 0,
"autoContinue": true, "autoContinue": true,
"command": 21, "command": 21,
"doJumpId": 6, "doJumpId": 6,
"frame": 3, "frame": 3,
"params": [ "params": [
25.0, 25,
0, 0,
0, 0,
null, null,
47.399211883544922, 47.39921188354492,
8.5430123448444419, 8.543012344844442,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
} }
], ],
"plannedHomePosition": [ "plannedHomePosition": [
47.397742, 47.3977419,
8.545594, 8.5455943,
12.0 489
], ],
"vehicleType": 19, "vehicleType": 20,
"version": 2 "version": 2
}, },
"rallyPoints": { "rallyPoints": {

33
integrationtests/python_src/px4_it/mavros/missions/vtol_old_3.plan
Unescape View File

@ -1,9 +1,6 @@
{ {
"fileType": "Plan", "fileType": "Plan",
"geoFence": { "geoFence": {
"polygon": [
],
"version": 1
}, },
"groundStation": "QGroundControl", "groundStation": "QGroundControl",
"mission": { "mission": {
@ -12,18 +9,21 @@
"hoverSpeed": 5, "hoverSpeed": 5,
"items": [ "items": [
{ {
"AMSLAltAboveTerrain": null,
"Altitude": 12,
"AltitudeMode": 0,
"autoContinue": true, "autoContinue": true,
"command": 16, "command": 16,
"doJumpId": 1, "doJumpId": 1,
"frame": 3, "frame": 3,
"params": [ "params": [
15.0, 15,
0, 0,
0, 0,
null, null,
47.398157669127094, 47.398157669127094,
8.5460336317115377, 8.546033631711538,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
@ -38,12 +38,15 @@
0, 0,
0, 0,
47.398033142089844, 47.398033142089844,
8.5457897186279297, 8.54578971862793,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
}, },
{ {
"AMSLAltAboveTerrain": null,
"Altitude": 12,
"AltitudeMode": 0,
"autoContinue": true, "autoContinue": true,
"command": 16, "command": 16,
"doJumpId": 3, "doJumpId": 3,
@ -53,19 +56,19 @@
0, 0,
0, 0,
null, null,
47.399269104003906, 47.400993929351195,
8.5455722808837891, 8.544680403485842,
12.0 12
], ],
"type": "SimpleItem" "type": "SimpleItem"
} }
], ],
"plannedHomePosition": [ "plannedHomePosition": [
47.397742, 47.3977419,
8.545594, 8.5455943,
12.0 489
], ],
"vehicleType": 19, "vehicleType": 20,
"version": 2 "version": 2
}, },
"rallyPoints": { "rallyPoints": {

Write Preview
Loading…
Cancel
Save