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

LogAnalyzer: Update to include the new "format" argument, and fix scoping on two new tests.

This commit is contained in:
Aaron Curtis 2014-07-08 10:49:42 -10:00 committed by Craig Elder
parent 406fedf727
commit 179d854a26
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/LogAnalyzer/DataflashLog.py
View File

@ -393,7 +393,7 @@ class DataflashLog(object):
floatTypes = "fcCeEL" floatTypes = "fcCeEL"
charTypes = "nNZ" charTypes = "nNZ"
def __init__(self, logfile=None, ignoreBadlines=False): def __init__(self, logfile=None, format="auto", ignoreBadlines=False):
self.filename = None self.filename = None
self.vehicleType = "" # ArduCopter, ArduPlane, ArduRover, etc, verbatim as given by header self.vehicleType = "" # ArduCopter, ArduPlane, ArduRover, etc, verbatim as given by header
@ -414,7 +414,7 @@ class DataflashLog(object):
self.skippedLines = 0 self.skippedLines = 0
if logfile: if logfile:
self.read(logfile, ignoreBadlines) self.read(logfile, format, ignoreBadlines)
def getCopterType(self): def getCopterType(self):
'''returns quad/hex/octo/tradheli if this is a copter log''' '''returns quad/hex/octo/tradheli if this is a copter log'''

2
Tools/LogAnalyzer/LogAnalyzer.py
View File

@ -222,7 +222,7 @@ def main():
# load the log # load the log
startTime = time.time() startTime = time.time()
logdata = DataflashLog.DataflashLog(args.logfile.name, ignoreBadlines=args.skip_bad) # read log logdata = DataflashLog.DataflashLog(args.logfile.name, format='auto', ignoreBadlines=args.skip_bad) # read log
endTime = time.time() endTime = time.time()
if args.profile: if args.profile:
print "Log file read time: %.2f seconds" % (endTime-startTime) print "Log file read time: %.2f seconds" % (endTime-startTime)

2
Tools/LogAnalyzer/tests/TestAutotune.py
View File

@ -6,7 +6,7 @@ class TestAutotune(Test):
'''test for autotune success (copter only)''' '''test for autotune success (copter only)'''
def __init__(self): def __init__(self):
# Test.__init__(self) Test.__init__(self)
self.name = "Autotune" self.name = "Autotune"
def run(self, logdata, verbose): def run(self, logdata, verbose):

2
Tools/LogAnalyzer/tests/TestBalanceTwist.py
View File

@ -6,8 +6,8 @@ class TestBalanceTwist(Test):
'''test for badly unbalanced copter, including yaw twist''' '''test for badly unbalanced copter, including yaw twist'''
def __init__(self): def __init__(self):
Test.__init__(self)
self.name = "Balance/Twist" self.name = "Balance/Twist"
self.enable = False # TEMP
def run(self, logdata, verbose): def run(self, logdata, verbose):
self.result = TestResult() self.result = TestResult()