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

autotest: plane: fix flyeachframe param loading 

This was previously fixed in copter
This commit is contained in:
Bob Long 2024-12-19 13:34:16 +11:00 committed by Peter Barker
parent 5c9003dd02
commit 058f66fbe6
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tools/autotest/arducopter.py
View File

@ -9462,9 +9462,6 @@ class AutoTestCopter(vehicle_test_suite.TestSuite):
self.progress("Actually, no I'm not - it is an external simulation") self.progress("Actually, no I'm not - it is an external simulation")
continue continue
model = frame_bits.get("model", frame) model = frame_bits.get("model", frame)
# the model string for Callisto has crap in it.... we
# should really have another entry in the vehicleinfo data
# to carry the path to the JSON.
defaults = self.model_defaults_filepath(frame) defaults = self.model_defaults_filepath(frame)
if not isinstance(defaults, list): if not isinstance(defaults, list):
defaults = [defaults] defaults = [defaults]

6
Tools/autotest/arduplane.py
View File

@ -4219,11 +4219,7 @@ class AutoTestPlane(vehicle_test_suite.TestSuite):
self.progress("Actually, no I'm not - it is an external simulation") self.progress("Actually, no I'm not - it is an external simulation")
continue continue
model = frame_bits.get("model", frame) model = frame_bits.get("model", frame)
# the model string for Callisto has crap in it.... we defaults = self.model_defaults_filepath(frame)
# should really have another entry in the vehicleinfo data
# to carry the path to the JSON.
actual_model = model.split(":")[0]
defaults = self.model_defaults_filepath(actual_model)
if not isinstance(defaults, list): if not isinstance(defaults, list):
defaults = [defaults] defaults = [defaults]
self.customise_SITL_commandline( self.customise_SITL_commandline(