Browse Source

Autotest: fix two copter tests after parameter rename

I'm not sure if a better fix would be to remove the set_parameter() call
c415-sdk
Dr.-Ing. Amilcar do Carmo Lucas 4 years ago committed by Peter Barker
parent
commit
8d8753b14c
  1. 21
      Tools/autotest/arducopter.py

21
Tools/autotest/arducopter.py

@ -1102,7 +1102,7 @@ class AutoTestCopter(AutoTest): @@ -1102,7 +1102,7 @@ class AutoTestCopter(AutoTest):
def fly_fence_avoid_test_radius_check(self, timeout=180, avoid_behave=avoid_behave_slide):
using_mode = "LOITER" # must be something which adjusts velocity!
self.change_mode(using_mode)
self.set_parameter("FENCE_AUTOENABLE", 1) # fence
self.set_parameter("FENCE_ENABLE", 1) # fence
self.set_parameter("FENCE_TYPE", 2) # circle
fence_radius = 15
self.set_parameter("FENCE_RADIUS", fence_radius)
@ -1215,7 +1215,7 @@ class AutoTestCopter(AutoTest): @@ -1215,7 +1215,7 @@ class AutoTestCopter(AutoTest):
raise NotAchievedException("Did not receive HOME_POSITION")
self.progress("home: %s" % str(m))
self.start_subtest("ensure we can't arm if ouside fence")
self.start_subtest("ensure we can't arm if outside fence")
self.load_fence("fence-in-middle-of-nowhere.txt")
self.delay_sim_time(5) # let fence check run so it loads-from-eeprom
@ -1224,7 +1224,7 @@ class AutoTestCopter(AutoTest): @@ -1224,7 +1224,7 @@ class AutoTestCopter(AutoTest):
self.clear_fence()
self.delay_sim_time(5) # let fence breach clear
self.drain_mav()
self.end_subtest("ensure we can't arm if ouside fence")
self.end_subtest("ensure we can't arm if outside fence")
self.start_subtest("ensure we can't arm with bad radius")
self.context_push()
@ -1300,12 +1300,13 @@ class AutoTestCopter(AutoTest): @@ -1300,12 +1300,13 @@ class AutoTestCopter(AutoTest):
"Fence test failed to reach home (%fm distance) - "
"timed out after %u seconds" % (home_distance, timeout,))
# fly_alt_fence_test - fly up until you hit the fence
# fly_alt_max_fence_test - fly up until you hit the fence
def fly_alt_max_fence_test(self):
self.takeoff(10, mode="LOITER")
"""Hold loiter position."""
# enable fence, disable avoidance
self.set_parameter("FENCE_ENABLE", 1)
self.set_parameter("FENCE_AUTOENABLE", 1)
self.set_parameter("AVOID_ENABLE", 0)
self.set_parameter("FENCE_TYPE", 1)
@ -1335,7 +1336,7 @@ class AutoTestCopter(AutoTest): @@ -1335,7 +1336,7 @@ class AutoTestCopter(AutoTest):
self.zero_throttle()
# fly_alt_fence_test - fly up until you hit the fence
# fly_alt_min_fence_test - fly down until you hit the fence
def fly_alt_min_fence_test(self):
self.takeoff(50, mode="LOITER", timeout=120)
"""Hold loiter position."""
@ -1343,11 +1344,13 @@ class AutoTestCopter(AutoTest): @@ -1343,11 +1344,13 @@ class AutoTestCopter(AutoTest):
self.wait_mode('LOITER')
# enable fence, disable avoidance
self.set_parameter("FENCE_ENABLE", 1)
self.set_parameter("FENCE_AUTOENABLE", 1)
self.set_parameter("AVOID_ENABLE", 0)
self.set_parameter("FENCE_TYPE", 8)
self.set_parameter("FENCE_ALT_MIN", 20)
self.change_alt(10)
self.change_alt(50)
# first east
self.progress("turn east")
@ -5068,7 +5071,7 @@ class AutoTestCopter(AutoTest): @@ -5068,7 +5071,7 @@ class AutoTestCopter(AutoTest):
ex = None
try:
self.load_fence("copter-avoidance-fence.txt")
self.set_parameter("FENCE_AUTOENABLE", 1)
self.set_parameter("FENCE_ENABLE", 1)
self.set_parameter("PRX_TYPE", 10)
self.set_parameter("RC10_OPTION", 40) # proximity-enable
self.reboot_sitl()
@ -5171,7 +5174,7 @@ class AutoTestCopter(AutoTest): @@ -5171,7 +5174,7 @@ class AutoTestCopter(AutoTest):
ex = None
try:
self.load_fence("copter-avoidance-fence.txt")
self.set_parameter("FENCE_AUTOENABLE", 1)
self.set_parameter("FENCE_ENABLE", 1)
self.check_avoidance_corners()
except Exception as e:
self.print_exception_caught(e)
@ -6516,7 +6519,7 @@ class AutoTestCopter(AutoTest): @@ -6516,7 +6519,7 @@ class AutoTestCopter(AutoTest):
self.fly_alt_max_fence_test), # 26s
("MinAltFence",
"Test Max Alt Fence",
"Test Min Alt Fence",
self.fly_alt_min_fence_test), #26s
("AutoTuneSwitch",

Loading…
Cancel
Save