Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

autotest: disable terrain during frsky passthrough test 

If terrain isn't available then our expected statustext gets blatted with one which RCTelemetry library emits
This commit is contained in:
Peter Barker 2022-07-20 08:57:48 +10:00 committed by Peter Barker
parent aa7987a4fb
commit 3c700bdf44
2 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tools/autotest/arduplane.py
View File

@ -3897,9 +3897,13 @@ function'''
"Test FrSky SPort mode", "Test FrSky SPort mode",
self.test_frsky_sport), self.test_frsky_sport),
("FRSkyPassThrough", ("FRSkyPassThroughStatustext",
"Test FrSky PassThrough serial output", "Test FrSky PassThrough serial output - statustext",
self.test_frsky_passthrough), self.FRSkyPassThroughStatustext),
("FRSkyPassThroughSensorIDs",
"Test FrSky PassThrough serial output - sensor ids",
self.FRSkyPassThroughSensorIDs),
("FRSkyMAVlite", ("FRSkyMAVlite",
"Test FrSky MAVlite serial output", "Test FrSky MAVlite serial output",

28
Tools/autotest/common.py
View File

@ -11027,9 +11027,16 @@ switch value'''
self.progress(" Fulfilled") self.progress(" Fulfilled")
del wants[want] del wants[want]
def test_frsky_passthrough(self): def FRSkyPassThroughStatustext(self):
self.set_parameter("SERIAL5_PROTOCOL", 10) # serial5 is FRSky passthrough '''test FRSKy protocol's telem-passthrough functionality'''
self.set_parameter("RPM1_TYPE", 10) # enable RPM output # we disable terrain here as RCTelemetry can queue a lot of
# statustexts if terrain tiles aren't available which can
# happen on the autotest server.
self.set_parameters({
"SERIAL5_PROTOCOL": 10, # serial5 is FRSky passthrough
"RPM1_TYPE": 10, # enable RPM output
"TERRAIN_ENABLE": 0,
})
self.customise_SITL_commandline([ self.customise_SITL_commandline([
"--uartF=tcp:6735" # serial5 spews to localhost:6735 "--uartF=tcp:6735" # serial5 spews to localhost:6735
]) ])
@ -11047,6 +11054,7 @@ switch value'''
tstart = self.get_sim_time() tstart = self.get_sim_time()
old_data = None old_data = None
text = "" text = ""
self.context_collect('STATUSTEXT') self.context_collect('STATUSTEXT')
self.run_cmd(mavutil.mavlink.MAV_CMD_PREFLIGHT_CALIBRATION, self.run_cmd(mavutil.mavlink.MAV_CMD_PREFLIGHT_CALIBRATION,
0, # p1 0, # p1
@ -11112,12 +11120,22 @@ switch value'''
raise NotAchievedException("Incorrect severity; want=%u got=%u" % (want_sev, severity)) raise NotAchievedException("Incorrect severity; want=%u got=%u" % (want_sev, severity))
self.progress("Got statustext (%s)" % received_text) self.progress("Got statustext (%s)" % received_text)
break break
self.context_stop_collecting('STATUSTEXT')
def FRSkyPassThroughSensorIDs(self):
'''test FRSKy protocol's telem-passthrough functionality (sensor IDs)'''
self.set_parameters({
"SERIAL5_PROTOCOL": 10, # serial5 is FRSky passthrough
"RPM1_TYPE": 10, # enable RPM output
})
self.customise_SITL_commandline([
"--uartF=tcp:6735" # serial5 spews to localhost:6735
])
frsky = FRSkyPassThrough(("127.0.0.1", 6735),
get_time=self.get_sim_time_cached)
self.wait_ready_to_arm() self.wait_ready_to_arm()
# we need to start the engine to get some RPM readings, we do it for plane only # we need to start the engine to get some RPM readings, we do it for plane only
self.drain_mav()
# anything with a lambda in here needs a proper test written. # anything with a lambda in here needs a proper test written.
# This, at least makes sure we're getting some of each # This, at least makes sure we're getting some of each
# message. These are ordered according to the wfq scheduler # message. These are ordered according to the wfq scheduler