Skip to content

WIP: adding mavlink log support #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndreasAntener wants to merge 1 commit into
base: master
Choose a base branch
from
Open

WIP: adding mavlink log support #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/me/drton/flightplot/FlightPlot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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;
Expand Down