zrzk
/
ardupilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

LogAnalyzer: combined statusMessage and extraFeedback

mission-4.1.18
Andrew Chapman 11 years ago committed by Andrew Tridgell
parent
1356d53e7b
commit
81fcf4bda7
7 changed files with 32 additions and 49 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      Tools/LogAnalyzer/DataflashLog.py
  2. 23
      Tools/LogAnalyzer/LogAnalyzer.py
  3. 11
      Tools/LogAnalyzer/example_output.xml
  4. 23
      Tools/LogAnalyzer/tests/TestCompass.py
  5. 2
      Tools/LogAnalyzer/tests/TestGPSGlitch.py
  6. 12
      Tools/LogAnalyzer/tests/TestParams.py
  7. 4
      Tools/LogAnalyzer/tests/TestPerformance.py

6
Tools/LogAnalyzer/DataflashLog.py
Unescape View File

@ -261,7 +261,7 @@ class DataflashLog: @@ -261,7 +261,7 @@ class DataflashLog:
print errorMsg + " (skipping line)"
self.skippedLines += 1
else:
raise Exception(errorMsg)
raise Exception("")
# now handle the non-log data stuff, format descriptions, params, etc
elif tokens[0] == "FMT":
format = None
@ -270,7 +270,7 @@ class DataflashLog: @@ -270,7 +270,7 @@ class DataflashLog:
elif len(tokens) == 5: # some logs have FMT STRT with no labels
format = Format(tokens[1],tokens[2],tokens[3],tokens[4],"")
else:
raise Exception("FMT error on line %d, nTokens: %d" % (lineNumber, len(tokens)))
raise Exception("FMT error, nTokens: %d" % len(tokens))
#print format # TEMP
self.formats[tokens[3]] = format
elif tokens[0] == "PARM":
@ -296,7 +296,7 @@ class DataflashLog: @@ -296,7 +296,7 @@ class DataflashLog:
self.channels[groupName][label] = Channel()
# check the number of tokens matches between the line and what we're expecting from the FMT definition
if (len(tokens2)-1) != len(self.formats[groupName].labels):
errorMsg = "Error on line %d of log file: %s, %s line's value count (%d) not matching FMT specification (%d)" % (lineNumber, self.filename, groupName, len(tokens2)-1, len(self.formats[groupName].labels))
errorMsg = "%s line's value count (%d) not matching FMT specification (%d) on line %d" % (groupName, len(tokens2)-1, len(self.formats[groupName].labels), lineNumber)
if ignoreBadlines:
print errorMsg + " (skipping line)"
self.skippedLines += 1

23
Tools/LogAnalyzer/LogAnalyzer.py
Unescape View File

@ -14,8 +14,6 @@ @@ -14,8 +14,6 @@
# - copter+plane use 'V' in their vehicle type/version/build line, rover uses lower case 'v'. Copter+Rover give a build number, plane does not
# - CTUN.ThrOut on copter is 0-1000, on plane+rover it is 0-100
# TODO - unify result statusMessage and extraOutput. simple tests set statusMessage, complex ones append to it with newlines
import DataflashLog
@ -36,7 +34,6 @@ class TestResult: @@ -36,7 +34,6 @@ class TestResult:
PASS, FAIL, WARN, UNKNOWN, NA = range(5)
status = None
statusMessage = ""
extraFeedback = ""
class Test:
@ -104,23 +101,25 @@ class TestSuite: @@ -104,23 +101,25 @@ class TestSuite:
for test in self.tests:
if not test.enable:
continue
statusMessageFirstLine = test.result.statusMessage.strip('\n\r').split('\n')[0]
statusMessageExtra = test.result.statusMessage.strip('\n\r').split('\n')[1:]
execTime = ""
if outputStats:
execTime = " (%.2fms)" % (test.execTime)
if test.result.status == TestResult.StatusType.PASS:
print " %20s: PASS %-50s%s" % (test.name, test.result.statusMessage,execTime)
print " %20s: PASS %-55s%s" % (test.name, statusMessageFirstLine, execTime)
elif test.result.status == TestResult.StatusType.FAIL:
print " %20s: FAIL %-50s%s [GRAPH]" % (test.name, test.result.statusMessage,execTime)
print " %20s: FAIL %-55s%s [GRAPH]" % (test.name, statusMessageFirstLine, execTime)
elif test.result.status == TestResult.StatusType.WARN:
print " %20s: WARN %-50s%s [GRAPH]" % (test.name, test.result.statusMessage,execTime)
print " %20s: WARN %-55s%s [GRAPH]" % (test.name, statusMessageFirstLine, execTime)
elif test.result.status == TestResult.StatusType.NA:
# skip any that aren't relevant for this vehicle/hardware/etc
continue
else:
print " %20s: UNKNOWN %-50s%s" % (test.name, test.result.statusMessage,execTime)
if test.result.extraFeedback:
for line in test.result.extraFeedback.strip().split('\n'):
print " %29s %s" % ("",line)
print " %20s: UNKNOWN %-55s%s" % (test.name, statusMessageFirstLine, execTime)
#if statusMessageExtra:
for line in statusMessageExtra:
print " %29s %s" % ("",line)
print '\n'
print 'The Log Analyzer is currently BETA code.\nFor any support or feedback on the log analyzer please email Andrew Chapman (amchapman@gmail.com)'
@ -173,18 +172,15 @@ class TestSuite: @@ -173,18 +172,15 @@ class TestSuite:
print >>xml, " <name>" + test.name + "</name>"
print >>xml, " <status>PASS</status>"
print >>xml, " <message>" + test.result.statusMessage + "</message>"
print >>xml, " <extrafeedback>" + test.result.extraFeedback + "</extrafeedback>"
elif test.result.status == TestResult.StatusType.FAIL:
print >>xml, " <name>" + test.name + "</name>"
print >>xml, " <status>FAIL</status>"
print >>xml, " <message>" + test.result.statusMessage + "</message>"
print >>xml, " <extrafeedback>" + test.result.extraFeedback + "</extrafeedback>"
print >>xml, " <data>(test data will be embeded here at some point)</data>"
elif test.result.status == TestResult.StatusType.WARN:
print >>xml, " <name>" + test.name + "</name>"
print >>xml, " <status>WARN</status>"
print >>xml, " <message>" + test.result.statusMessage + "</message>"
print >>xml, " <extrafeedback>" + test.result.extraFeedback + "</extrafeedback>"
print >>xml, " <data>(test data will be embeded here at some point)</data>"
elif test.result.status == TestResult.StatusType.NA:
# skip any that aren't relevant for this vehicle/hardware/etc
@ -193,7 +189,6 @@ class TestSuite: @@ -193,7 +189,6 @@ class TestSuite:
print >>xml, " <name>" + test.name + "</name>"
print >>xml, " <status>UNKNOWN</status>"
print >>xml, " <message>" + test.result.statusMessage + "</message>"
print >>xml, " <extrafeedback>" + test.result.extraFeedback + "</extrafeedback>"
print >>xml, " </result>"
print >>xml, "</results>"

11
Tools/LogAnalyzer/example_output.xml
Unescape View File

@ -292,70 +292,59 @@ @@ -292,70 +292,59 @@
<name>Brownout</name>
<status>PASS</status>
<message></message>
<extrafeedback></extrafeedback>
</result>
<result>
<name>Compass</name>
<status>PASS</status>
<message></message>
<extrafeedback></extrafeedback>
</result>
<result>
<name>Dupe Log Data</name>
<status>PASS</status>
<message></message>
<extrafeedback></extrafeedback>
</result>
<result>
<name>Empty</name>
<status>PASS</status>
<message></message>
<extrafeedback></extrafeedback>
</result>
<result>
<name>Event/Failsafe</name>
<status>FAIL</status>
<message>ERR found: GPS </message>
<extrafeedback></extrafeedback>
<data>(test data will be embeded here at some point)</data>
</result>
<result>
<name>GPS</name>
<status>WARN</status>
<message>Min satellites: 6, Max HDop: 4.68</message>
<extrafeedback></extrafeedback>
<data>(test data will be embeded here at some point)</data>
</result>
<result>
<name>Parameters</name>
<status>PASS</status>
<message></message>
<extrafeedback></extrafeedback>
</result>
<result>
<name>PM</name>
<status>FAIL</status>
<message>14 slow loop lines found, max 18.56% on line 2983</message>
<extrafeedback></extrafeedback>
<data>(test data will be embeded here at some point)</data>
</result>
<result>
<name>Underpowered</name>
<status>PASS</status>
<message></message>
<extrafeedback></extrafeedback>
</result>
<result>
<name>VCC</name>
<status>PASS</status>
<message></message>
<extrafeedback></extrafeedback>
</result>
<result>
<name>Vibration</name>
<status>UNKNOWN</status>
<message>No IMU log data</message>
<extrafeedback></extrafeedback>
</result>
</results>
</loganalysis>

23
Tools/LogAnalyzer/tests/TestCompass.py
Unescape View File

@ -12,7 +12,7 @@ class TestCompass(Test): @@ -12,7 +12,7 @@ class TestCompass(Test):
self.result = TestResult()
self.result.status = TestResult.StatusType.PASS
# quick test that compass offset parameters are within recommended range (+/- 150)
# test that compass offset parameters are within recommended range (+/- 150)
maxOffset = 150
if logdata.hardwareType == "PX4":
maxOffset = 250 # Pixhawks have their offsets scaled larger
@ -22,33 +22,32 @@ class TestCompass(Test): @@ -22,33 +22,32 @@ class TestCompass(Test):
#print "MAG params: %.2f %.2f %.2f" % (compassOfsX,compassOfsY,compassOfsZ)
if abs(compassOfsX) > maxOffset or abs(compassOfsY) > maxOffset or abs(compassOfsZ) > maxOffset:
self.result.status = TestResult.StatusType.FAIL
self.result.statusMessage = "Large compass off params (X:%.2f, Y:%.2f, Z:%.2f)" % (compassOfsX,compassOfsY,compassOfsZ)
self.result.statusMessage = "Large compass off params (X:%.2f, Y:%.2f, Z:%.2f)\n" % (compassOfsX,compassOfsY,compassOfsZ)
# check for excessive compass offsets using MAG data if present (it can change during flight is compass learn is on)
if "MAG" in logdata.channels:
err = False
#print "MAG min/max xyz... %.2f %.2f %.2f %.2f %.2f %.2f " % (logdata.channels["MAG"]["OfsX"].min(), logdata.channels["MAG"]["OfsX"].max(), logdata.channels["MAG"]["OfsY"].min(), logdata.channels["MAG"]["OfsY"].min(), logdata.channels["MAG"]["OfsZ"].min(), logdata.channels["MAG"]["OfsZ"].max())
errMsg = ""
if logdata.channels["MAG"]["OfsX"].max() > maxOffset:
self.result.extraFeedback = self.result.extraFeedback + "X: %.2f\n" % logdata.channels["MAG"]["OfsX"].max()
errMsg = errMsg + "\nX: %.2f\n" % logdata.channels["MAG"]["OfsX"].max()
err = True
if logdata.channels["MAG"]["OfsX"].min() < -maxOffset:
self.result.extraFeedback = self.result.extraFeedback + "X: %.2f\n" % logdata.channels["MAG"]["OfsX"].min()
errMsg = errMsg + "\nX: %.2f\n" % logdata.channels["MAG"]["OfsX"].min()
err = True
if logdata.channels["MAG"]["OfsY"].max() > maxOffset:
self.result.extraFeedback = self.result.extraFeedback + "Y: %.2f\n" % logdata.channels["MAG"]["OfsY"].max()
errMsg = errMsg + "\nY: %.2f\n" % logdata.channels["MAG"]["OfsY"].max()
err = True
if logdata.channels["MAG"]["OfsY"].min() < -maxOffset:
self.result.extraFeedback = self.result.extraFeedback + "Y: %.2f\n" % logdata.channels["MAG"]["OfsY"].min()
errMsg = errMsg + "\nY: %.2f\n" % logdata.channels["MAG"]["OfsY"].min()
err = True
if logdata.channels["MAG"]["OfsZ"].max() > maxOffset:
self.result.extraFeedback = self.result.extraFeedback + "Z: %.2f\n" % logdata.channels["MAG"]["OfsZ"].max()
errMsg = errMsg + "\nZ: %.2f\n" % logdata.channels["MAG"]["OfsZ"].max()
err = True
if logdata.channels["MAG"]["OfsZ"].min() < -maxOffset:
self.result.extraFeedback = self.result.extraFeedback + "Z: %.2f\n" % logdata.channels["MAG"]["OfsZ"].min()
errMsg = errMsg + "\nZ: %.2f\n" % logdata.channels["MAG"]["OfsZ"].min()
err = True
if err:
if errMsg:
self.result.status = TestResult.StatusType.FAIL
self.result.statusMessage = "Large compass offset in MAG data"
self.result.statusMessage = self.result.statusMessage + "Large compass offset in MAG data:" + errMsg
# TODO: check for compass/throttle interference. Need to add mag_field to logging, or calc our own from MAG data if present
# TODO: can we derive a compassmot percentage from the params? Fail if >30%?

2
Tools/LogAnalyzer/tests/TestGPSGlitch.py
Unescape View File

@ -42,7 +42,7 @@ class TestGPSGlitch(Test): @@ -42,7 +42,7 @@ class TestGPSGlitch(Test):
foundBadHDopFail = logdata.channels["GPS"]["HDop"].max() > maxHDopFAIL
satsMsg = "Min satellites: %s, Max HDop: %s" % (logdata.channels["GPS"]["NSats"].min(), logdata.channels["GPS"]["HDop"].max())
if gpsGlitchCount:
self.result.extraFeedback = satsMsg
self.result.statusMessage = self.result.statusMessage + "\n" + satsMsg
if foundBadSatsFail or foundBadHDopFail:
if not gpsGlitchCount:
self.result.status = TestResult.StatusType.FAIL

12
Tools/LogAnalyzer/tests/TestParams.py
Unescape View File

@ -16,17 +16,17 @@ class TestParams(Test): @@ -16,17 +16,17 @@ class TestParams(Test):
value = logdata.parameters[paramName]
if value != expectedValue:
self.result.status = TestResult.StatusType.FAIL
self.result.extraFeedback = self.result.extraFeedback + "%s set to %s, expecting %s\n" % (paramName, `value`, `expectedValue`)
self.result.statusMessage = self.result.statusMessage + "%s set to %s, expecting %s\n" % (paramName, `value`, `expectedValue`)
def __checkParamIsLessThan(self, paramName, maxValue, logdata):
value = logdata.parameters[paramName]
if value >= maxValue:
self.result.status = TestResult.StatusType.FAIL
self.result.extraFeedback = self.result.extraFeedback + "%s set to %s, expecting less than %s\n" % (paramName, `value`, `maxValue`)
self.result.statusMessage = self.result.statusMessage + "%s set to %s, expecting less than %s\n" % (paramName, `value`, `maxValue`)
def __checkParamIsMoreThan(self, paramName, minValue, logdata):
value = logdata.parameters[paramName]
if value <= minValue:
self.result.status = TestResult.StatusType.FAIL
self.result.extraFeedback = self.result.extraFeedback + "%s set to %s, expecting less than %s\n" % (paramName, `value`, `minValue`)
self.result.statusMessage = self.result.statusMessage + "%s set to %s, expecting less than %s\n" % (paramName, `value`, `minValue`)
def run(self, logdata):
@ -37,9 +37,9 @@ class TestParams(Test): @@ -37,9 +37,9 @@ class TestParams(Test):
for name,value in logdata.parameters.iteritems():
if math.isnan(value):
self.result.status = TestResult.StatusType.FAIL
self.result.extraFeedback = self.result.extraFeedback + name + " is NaN\n"
self.result.statusMessage = self.result.statusMessage + name + " is NaN\n"
# add parameter checks below using the helper functions, any failures will trigger a FAIL status and accumulate info in extraFeedback
# add parameter checks below using the helper functions, any failures will trigger a FAIL status and accumulate info in statusMessage
# if more complex checking or correlations are required you can access parameter values directly using the logdata.parameters[paramName] dict
if logdata.vehicleType == "ArduCopter":
self.__checkParamIsEqual ("MAG_ENABLE", 1, logdata)
@ -55,4 +55,4 @@ class TestParams(Test): @@ -55,4 +55,4 @@ class TestParams(Test):
pass
if self.result.status == TestResult.StatusType.FAIL:
self.result.statusMessage = "Bad parameters found:"
self.result.statusMessage = "Bad parameters found:\n" + self.result.statusMessage

4
Tools/LogAnalyzer/tests/TestPerformance.py
Unescape View File

@ -59,5 +59,5 @@ class TestPerformance(Test): @@ -59,5 +59,5 @@ class TestPerformance(Test):
elif (maxPercentSlow > 6):
self.result.status = TestResult.StatusType.WARN
self.result.statusMessage = "%d slow loop lines found, max %.2f%% on line %d" % (slowLoopLineCount,maxPercentSlow,maxPercentSlowLine)
else:
self.result.extraFeedback = ""

Write Preview
Loading…
Cancel
Save