Skip to content

Commit 09119f9

Browse files
lthallpeterbarker
authored andcommitted
autotest: WPArcs: add arc segment over 360 degrees
1 parent 5d9074e commit 09119f9

2 files changed

Lines changed: 23 additions & 20 deletions

File tree

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
11
QGC WPL 110
22
0 1 0 16 0 0 0 0 -35.3632621 149.1652375 584.080000 1
33
1 0 3 22 0.00000000 0.000000000 0.00000000 0.00000000 0.00000000 0.00000000 10.000000 1
4-
2 0 3 36 0.00000000 0.000000000 0.00000000 0.00000000 -35.36340000 149.16522000 10.000000 1
5-
3 0 3 36 -90.000000 0.000000000 0.00000000 0.00000000 -35.36320000 149.16522000 10.000000 1
6-
4 0 3 36 90.0000000 0.000000000 0.00000000 0.00000000 -35.36300000 149.16522000 10.000000 1
7-
5 0 3 36 -180.00000 0.000000000 0.00000000 0.00000000 -35.36280000 149.16522000 10.000000 1
8-
6 0 3 36 180.000000 0.000000000 0.00000000 0.00000000 -35.36260000 149.16522000 10.000000 1
9-
7 0 3 36 -270.00000 0.000000000 0.00000000 0.00000000 -35.36240000 149.16522000 10.000000 1
10-
8 0 3 36 270.000000 0.000000000 0.00000000 0.00000000 -35.36220000 149.16522000 10.000000 1
11-
9 0 3 36 0.00000000 0.000000000 0.00000000 0.00000000 -35.36200000 149.16522000 10.000000 1
12-
10 0 3 36 -180.000000 0.000000000 0.00000000 0.00000000 -35.36200000 149.16500000 10.000000 1
13-
11 0 3 16 0.00000000 0.000000000 0.00000000 0.00000000 -35.36240000 149.16500000 10.000000 1
14-
12 0 3 36 90.0000000 0.000000000 0.00000000 0.00000000 -35.36250000 149.16490000 10.000000 1
15-
13 0 3 16 0.00000000 0.000000000 0.00000000 0.00000000 -35.36250000 149.16300000 10.000000 1
16-
14 0 3 36 -180.00000 0.000000000 0.00000000 0.00000000 -35.36270000 149.16300000 10.000000 1
17-
15 0 3 16 0.00000000 0.000000000 0.00000000 0.00000000 -35.36270000 149.16490000 10.000000 1
18-
16 0 3 36 180.000000 0.000000000 0.00000000 0.00000000 -35.36340000 149.16490000 10.000000 1
19-
17 0 3 16 0.00000000 0.00000000 0.00000000 0.00000000 -35.36340000 149.16300000 10.000000 1
20-
18 0 0 20 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.000000 1
4+
2 0 3 16 0.000000 0.000000 0.000000 0.000000 -35.362123 149.165239 20.000000 1
5+
3 0 3 36 -400.000000 0.000000 0.000000 0.000000 -35.362115 149.164481 40.000000 1
6+
4 0 3 16 0.000000 0.000000 0.000000 0.000000 -35.363270 149.164617 40.000000 1
7+
5 0 3 36 0.00000000 0.000000000 0.00000000 0.00000000 -35.36340000 149.16522000 10.000000 1
8+
6 0 3 36 -90.000000 0.000000000 0.00000000 0.00000000 -35.36320000 149.16522000 10.000000 1
9+
7 0 3 36 90.0000000 0.000000000 0.00000000 0.00000000 -35.36300000 149.16522000 10.000000 1
10+
8 0 3 36 -180.00000 0.000000000 0.00000000 0.00000000 -35.36280000 149.16522000 10.000000 1
11+
9 0 3 36 180.000000 0.000000000 0.00000000 0.00000000 -35.36260000 149.16522000 10.000000 1
12+
10 0 3 36 -270.00000 0.000000000 0.00000000 0.00000000 -35.36240000 149.16522000 10.000000 1
13+
11 0 3 36 270.000000 0.000000000 0.00000000 0.00000000 -35.36220000 149.16522000 10.000000 1
14+
12 0 3 36 0.00000000 0.000000000 0.00000000 0.00000000 -35.36200000 149.16522000 10.000000 1
15+
13 0 3 36 -180.000000 0.000000000 0.00000000 0.00000000 -35.36200000 149.16500000 10.000000 1
16+
14 0 3 16 0.00000000 0.000000000 0.00000000 0.00000000 -35.36240000 149.16500000 10.000000 1
17+
15 0 3 36 90.0000000 0.000000000 0.00000000 0.00000000 -35.36250000 149.16490000 10.000000 1
18+
16 0 3 16 0.00000000 0.000000000 0.00000000 0.00000000 -35.36250000 149.16300000 10.000000 1
19+
17 0 3 36 -180.00000 0.000000000 0.00000000 0.00000000 -35.36270000 149.16300000 10.000000 1
20+
18 0 3 16 0.00000000 0.000000000 0.00000000 0.00000000 -35.36270000 149.16490000 10.000000 1
21+
19 0 3 36 180.000000 0.000000000 0.00000000 0.00000000 -35.36340000 149.16490000 10.000000 1
22+
20 0 3 16 0.00000000 0.00000000 0.00000000 0.00000000 -35.36340000 149.16300000 10.000000 1
23+
21 0 0 20 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.00000000 0.000000 1

Tools/autotest/arducopter.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -442,16 +442,16 @@ def WPArcs(self):
442442
)
443443
last_print_time = now
444444

445-
if current_wp > 16:
445+
if current_wp > 19:
446446
raise NotAchievedException(
447-
"mission progressed beyond WP 16 before current longitude > "
447+
"mission progressed beyond WP 19 before current longitude > "
448448
"desired long (%f)" % desired_long
449449
)
450450

451451
if (current_long > desired_long):
452452
self.progress(
453453
"Success: Copter traveled far enough east whilst traveling to "
454-
"WP 16 that we are likely flying a WP Arc"
454+
"WP 19 that we are likely flying a WP Arc"
455455
)
456456
break
457457

0 commit comments

Comments
 (0)