mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-01-29 14:52:12 +01:00
Merge remote-tracking branch 'origin/next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI
Conflicts: ground/openpilotgcs/src/plugins/flightlog/flightlogmanager.h
This commit is contained in:
commit
bd90dcc9e9
@ -286,6 +286,10 @@ private:
|
||||
bool m_cancelDownload;
|
||||
bool m_adjustExportedTimestamps;
|
||||
bool m_boardConnected;
|
||||
|
||||
void exportToOPL(QString fileName);
|
||||
void exportToCSV(QString fileName);
|
||||
void exportToXML(QString fileName);
|
||||
};
|
||||
|
||||
#endif // FLIGHTLOGMANAGER_H
|
||||
|
Loading…
x
Reference in New Issue
Block a user