aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

autotest: fix and re-enable button test

Browse Source 
A recent commit to fix the setting-of-pullup-resistors in SITL makes it
possible to re-enable this.

Closes #15259
This commit is contained in:
Peter Barker 2020-10-14 11:29:22 +11:00 committed by Peter Barker
parent f2c63e13be
commit 49fd762f26
4 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Tools/autotest/arducopter.py
View File

@ -5599,7 +5599,6 @@ class AutoTestCopter(AutoTest):
"Parachute": "See https://github.com/ArduPilot/ardupilot/issues/4702",
"HorizontalAvoidFence": "See https://github.com/ArduPilot/ardupilot/issues/11525",
"AltEstimation": "See https://github.com/ArduPilot/ardupilot/issues/15191",
"Button": "See https://github.com/ArduPilot/ardupilot/issues/15259",
}
class AutoTestHeli(AutoTestCopter):

1
Tools/autotest/arduplane.py
View File

@ -2134,5 +2134,4 @@ class AutoTestPlane(AutoTest):
def disabled_tests(self):
return {
"Button": "See https://github.com/ArduPilot/ardupilot/issues/15259",
}

42
Tools/autotest/common.py
View File

@ -6746,9 +6746,16 @@ switch value'''
self.set_parameter("BTN_PIN%u" % btn, pin)
m = self.mav.recv_match(type='BUTTON_CHANGE', blocking=True, timeout=1)
self.progress("### m: %s" % str(m))
if m is None:
raise NotAchievedException("Did not get BUTTON_CHANGE event")
if m is not None:
# should not get a button-changed event here. The pins
# are simulated pull-down
raise NotAchievedException("Received BUTTON_CHANGE event")
mask = 1<<pin
self.set_parameter("SIM_PIN_MASK", mask)
m = self.mav.recv_match(type='BUTTON_CHANGE', blocking=True, timeout=1)
self.progress("### m: %s" % str(m))
if m is None:
raise NotAchievedException("Did not receive BUTTON_CHANGE event")
if not (m.state & mask):
raise NotAchievedException("Bit not set in mask (got=%u want=%u)" % (m.state, mask))
m2 = self.mav.recv_match(type='BUTTON_CHANGE', blocking=True, timeout=1)
@ -6758,28 +6765,19 @@ switch value'''
# wait for messages to stop coming:
self.drain_mav_seconds(15)
# NOTE: SIM_PIN_MASK is *magic*. You might set it to zero,
# but it *will* end up as 1<<btn immediately afterwards. Thus
# not attempting to fetch the value back here:
new_mask = 0
self.send_set_parameter("SIM_PIN_MASK", new_mask, verbose=True)
tstart = self.get_sim_time_cached()
while True:
now = self.get_sim_time_cached()
if now - tstart > 10:
raise AutoTestTimeoutException("No BUTTON_CHANGE received")
m3 = self.mav.recv_match(type='BUTTON_CHANGE', blocking=True, timeout=1)
self.progress("### m3: %s" % str(m3))
if m3 is None:
continue
if m.last_change_ms == m3.last_change_ms:
self.progress("last_change_ms same as first message")
continue
if m3.state != new_mask:
raise NotAchievedException("Unexpected mask (want=%u got=%u)" %
(new_mask, m3.state))
self.progress("correct BUTTON_CHANGE event received")
break
m3 = self.mav.recv_match(type='BUTTON_CHANGE', blocking=True, timeout=1)
self.progress("### m3: %s" % str(m3))
if m3 is None:
raise NotAchievedException("Did not get 'off' message")
if m.last_change_ms == m3.last_change_ms:
raise NotAchievedException("last_change_ms same as first message")
if m3.state != new_mask:
raise NotAchievedException("Unexpected mask (want=%u got=%u)" %
(new_mask, m3.state))
self.progress("correct BUTTON_CHANGE event received")
def compare_number_percent(self, num1, num2, percent):
if num1 == 0 and num2 == 0:

1
Tools/autotest/rover.py
View File

@ -5455,7 +5455,6 @@ Brakes have negligible effect (with=%0.2fm without=%0.2fm delta=%0.2fm)
def disabled_tests(self):
return {
"DriveMaxRCIN": "currently triggers Arithmetic Exception",
"Button": "See https://github.com/ArduPilot/ardupilot/issues/15259",
}
def rc_defaults(self):