From 481630f3caf44bdc085ae13b46af415d5277038f Mon Sep 17 00:00:00 2001 From: Andreas Antener Date: Thu, 17 Dec 2015 13:00:52 +0100 Subject: [PATCH] added handling to open mavlink logs --- src/me/drton/flightplot/FlightPlot.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/me/drton/flightplot/FlightPlot.java b/src/me/drton/flightplot/FlightPlot.java index e6aab42..6e867dd 100644 --- a/src/me/drton/flightplot/FlightPlot.java +++ b/src/me/drton/flightplot/FlightPlot.java @@ -9,8 +9,10 @@ import me.drton.flightplot.processors.Simple; import me.drton.jmavlib.log.FormatErrorException; import me.drton.jmavlib.log.LogReader; +import me.drton.jmavlib.log.MAVLinkLogReader; import me.drton.jmavlib.log.px4.PX4LogReader; import me.drton.jmavlib.log.ulog.ULogReader; +import me.drton.jmavlib.mavlink.MAVLinkSchema; import org.jfree.chart.ChartFactory; import org.jfree.chart.ChartPanel; import org.jfree.chart.JFreeChart; @@ -270,7 +272,8 @@ public void tableChanged(TableModelEvent e) { // Open Log Dialog FileNameExtensionFilter[] logExtensionfilters = new FileNameExtensionFilter[]{ new FileNameExtensionFilter("PX4/APM Log (*.px4log, *.bin)", "px4log", "bin"), - new FileNameExtensionFilter("ULog (*.ulg)", "ulg") + new FileNameExtensionFilter("ULog (*.ulg)", "ulg"), + new FileNameExtensionFilter("MAVLink Logs (*.mavlink)", "mavlink") }; openLogFileChooser = new JFileChooser(); @@ -805,6 +808,8 @@ private void openLog(String logFileName) { logReaderNew = new PX4LogReader(logFileName); } else if (logFileNameLower.endsWith(".ulg")) { logReaderNew = new ULogReader(logFileName); + } else if (logFileNameLower.endsWith(".mavlink")) { + logReaderNew = new MAVLinkLogReader(logFileName, new MAVLinkSchema("common.xml")); } else { setStatus("Log format not supported: " + logFileName); return;