From d6b091c39f750a2c33686bc51fe1aea3aa1a1e21 Mon Sep 17 00:00:00 2001 From: Andrew Chapman Date: Sat, 22 Feb 2014 20:52:53 +0100 Subject: [PATCH] LogAnalyzer: added BETA feedback info to output --- Tools/LogAnalyzer/DataflashLog.py | 4 ++-- Tools/LogAnalyzer/LogAnalyzer.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Tools/LogAnalyzer/DataflashLog.py b/Tools/LogAnalyzer/DataflashLog.py index 380e572571..ea90f4155b 100644 --- a/Tools/LogAnalyzer/DataflashLog.py +++ b/Tools/LogAnalyzer/DataflashLog.py @@ -275,8 +275,8 @@ class DataflashLog: #print "Channel definition for group %s, data at address %s" % (groupName, hex(id(self.channels[groupName][label].dictData))) #pprint.pprint(self.channels[groupName]) # TEMP!!! # check the number of tokens matches between the line and what we're expecting from the FMT definition - if len(tokens2) != (len(self.formats[groupName].labels) + 1): - 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), len(self.formats[groupName].labels)) + 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)) if ignoreBadlines: print errorMsg + " (skipping line)" continue diff --git a/Tools/LogAnalyzer/LogAnalyzer.py b/Tools/LogAnalyzer/LogAnalyzer.py index 54b1fc3951..d25e161f41 100755 --- a/Tools/LogAnalyzer/LogAnalyzer.py +++ b/Tools/LogAnalyzer/LogAnalyzer.py @@ -119,8 +119,11 @@ class TestSuite: if test.result.extraFeedback: for line in test.result.extraFeedback.strip().split('\n'): print " %20s %s" % ("",line) - print '\n' + print '\n' + print 'The Log Analyzer is currently BETA code. For any support or feedback on the log analyzer please email Andrew Chapman (amchapman@gmail.com)' + print '\n' + def outputXML(self, xmlFile): # open the file for writing xml = None