From 214bca8b3020584e13d75cc1be6ac5ed68b95139 Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Thu, 8 Sep 2016 08:36:47 +1000 Subject: [PATCH] Tools: LogAnalyzer: correct CTUN test --- Tools/LogAnalyzer/DataflashLog.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Tools/LogAnalyzer/DataflashLog.py b/Tools/LogAnalyzer/DataflashLog.py index 285d463f0d..afdfc012a4 100644 --- a/Tools/LogAnalyzer/DataflashLog.py +++ b/Tools/LogAnalyzer/DataflashLog.py @@ -388,7 +388,13 @@ class DataflashLogHelper: if logdata.vehicleType == VehicleType.Copter: throttleThreshold = 200 # copter uses 0-1000, plane+rover use 0-100 if "CTUN" in logdata.channels: - maxThrottle = logdata.channels["CTUN"]["ThrOut"].max() + try: + maxThrottle = logdata.channels["CTUN"]["ThrOut"].max() + except KeyError as e: + # ThrOut was shorted to ThO at some stage... + maxThrottle = logdata.channels["CTUN"]["ThO"].max() + # at roughly the same time ThO became a range from 0 to 1 + throttleThreshold = 0.2 if maxThrottle < throttleThreshold: return "Throttle never above 20%" return None