1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Commit Graph

4466 Commits

Author SHA1 Message Date
Corvus Corax
30e0c9f6c1 somone forgot uncrustification again 2013-12-07 23:28:25 +01:00
Corvus Corax
a4d53c18ac got rid of altholdsmoothed uavobject 2013-12-07 20:14:02 +01:00
Fredrik Arvidsson
1d6df555eb Merge branch 'thread/OP-1119_Flight_Side_Logs_Plugin' into next 2013-12-07 19:12:15 +01:00
Philippe Renon
853174b4ca OP-963 fixed bad merge 2013-12-07 17:36:14 +01:00
Fredrik Arvidsson
517cf53b76 Merge remote-tracking branch 'origin/next' into thread/OP-1119_Flight_Side_Logs_Plugin
Conflicts:
	ground/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.cpp
2013-12-07 17:06:09 +01:00
Philippe Renon
17c9c8d8b0 Merge remote-tracking branch 'origin/next' into filnet/telemetry
Conflicts:
	ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro
2013-12-07 16:39:19 +01:00
Corvus Corax
2f2cff3dc6 uncrustification 2013-12-07 15:25:15 +01:00
Corvus Corax
e8150399f6 Merge branch 'corvuscorax/onboardlogging' into next OP-56 OPReview-586 OPReview-587 OPReview-585 2013-12-07 15:21:10 +01:00
Fredrik Arvidsson
a68c4da62d Disable dragging of icons in the configuration plugin. 2013-12-06 18:46:58 +01:00
Fredrik Arvidsson
07c7faa144 Merge remote-tracking branch 'origin/shared/OP-1109_qtquick2' into next
Conflicts:
	artwork/PFD/pfd.svg
2013-12-03 22:47:12 +01:00
Fredrik Arvidsson
fbea95e817 OP-1063 Fixed text 2013-12-03 22:03:32 +01:00
Fredrik Arvidsson
336510c3e6 OP-771 Added some descriptive text.
OP-1059 Fixed typos.
2013-12-03 20:48:40 +01:00
Philippe Renon
035c8afcba OP-963 minor UI tweak to the status bar icon tray margins 2013-12-02 23:51:01 +01:00
Philippe Renon
b627b71d0e uncrustification 2013-12-02 23:49:03 +01:00
Philippe Renon
37dab0e4fc Merge remote-tracking branch 'origin/next' into filnet/telemetry
Conflicts:
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
	ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp
	ground/openpilotgcs/src/plugins/coreplugin/telemetrymonitorwidget.cpp
	ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp
	ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp
2013-12-02 22:54:00 +01:00
Philippe Renon
56c404e778 OP-1132 added new openssl-install that downloads and install the required SSL libraries for Windows
the missing SSLEAY32.DLL and LIBEAY32.DLL are copied to GCS bin dir
OpenSSL version 1.0.1e was downloaded from http://slproweb.com/products/Win32OpenSSL.html
2013-12-01 23:17:48 +01:00
Fredrik Arvidsson
2d3683d511 OP-1119 Added option to base log flight time on the time when log started, not when the board was booted. 2013-12-01 21:22:58 +01:00
Philippe Renon
f2115e270f OP-1122 OP-1133 UAVTalk.cpp - fixed stupid compilation error... 2013-12-01 19:42:41 +01:00
Philippe Renon
398a3ab0e6 OP-112 OP-1120 waypoint editor now sends and requests Waypoints and PathActions in a transacted and asynchronous manner. Board does not send Waypoints and PathActions periodically anymore. 2013-12-01 19:38:23 +01:00
Philippe Renon
0dc334adea OP-1122 OP-1133 exposed send/request all instances of multi instance uav objects and made related uavtalk fixes 2013-12-01 19:25:44 +01:00
Fredrik Arvidsson
2fce485e26 Merge remote-tracking branch 'origin/patrickh/OP-1118_QComboBox_Focus_issue' into next 2013-12-01 10:39:41 +01:00
Fredrik Arvidsson
38f7d9b28e OP-1119 Minor fixes 2013-11-30 16:54:18 +01:00
Fredrik Arvidsson
74ad0fd40a OP-1119 Added cancel functionality on download. Added soem more gui update logic. 2013-11-30 13:02:52 +01:00
Fredrik Arvidsson
a3c555f8bb OP-1119 Fixed support for saving multiple flights when saving logs to .opl format. 2013-11-30 11:44:55 +01:00
Philippe Renon
a6d0f09d21 OP-1122 OP-1125 minor change to uavobject::toStringBrief() method 2013-11-29 19:40:10 +01:00
Philippe Renon
cb902900de OP-1122 OP-1125 uavtalk - fixed minor typos 2013-11-29 09:23:27 +01:00
Philippe Renon
1a25e87fde OP-1122 removed debug spurious debug logging when using waypoint editor + fixed compilation warnings 2013-11-29 09:14:29 +01:00
Philippe Renon
390c88b92a OP-1122 OP-1125 uavtalk - object request messages are now acked only by object messages and acked object messages are acked only by ack messages 2013-11-29 02:51:46 +01:00
Philippe Renon
15c4392ed5 OP-1122 OP-1125 uavtalk - more OPReview-593 related cleanups 2013-11-29 01:21:45 +01:00
Philippe Renon
50a0a4f512 OP-1122 OP-1125 uavtalk - minor OPReview-593 related cleanups 2013-11-28 23:42:08 +01:00
Philippe Renon
2f0974fda9 OP-1122 OP-1125 uavtalk - fixed a number of issues concerning acked multi instance messages :
- all messages now systematically include an instance ID (fixes parsing of messages containing unknown object)
- added missing NACK of object request on fight side
- added more logging and warnings
- misc fixes and cleanups
this commit affects both the firmware and GCS (need to flash new version of firmware)
2013-11-28 01:14:29 +01:00
m_thread
d14044431e OP-1119 WIP export of logs to .opl file 2013-11-27 16:07:34 +01:00
m_thread
81443570ab OP-1119 Moved class LogFile from Logging plugin to libs/utils 2013-11-27 16:07:15 +01:00
m_thread
bc9bbebfdf OP-1119 Starting to implement the export functionality. Aiming to do it so it is compatible with the standard .opl file format and replayable in the logging plugin. 2013-11-26 23:45:38 +01:00
m_thread
144b2c587d OP-1119 Added real-time updates of the flights combobox. Added some cleanup code. 2013-11-26 22:52:24 +01:00
m_thread
7bb127445d OP-1119 Added some progress indication with cursors and disabling of controls during operation. 2013-11-26 17:00:01 +01:00
m_thread
5738a87141 OP-1119 Added code to format log flash on flight controller 2013-11-26 16:22:44 +01:00
m_thread
8054cd5296 OP-1119 Code cleanup and more uncrustification 2013-11-26 16:06:12 +01:00
m_thread
a11d98aa0d OP-1119 Uncrustify 2013-11-26 15:42:49 +01:00
m_thread
3f3245b749 OP-1119 Added some mem management improvements 2013-11-26 15:25:27 +01:00
m_thread
daf589d9ce OP-1119 Added Functions.js to host functions needed in qml.
Added de-serialization of UAVDataObjects in table.
Started to clean up memory management tasks in code.
2013-11-25 17:58:29 +01:00
m_thread
00d710a324 OP-1119 Downloading from firmware now works. Added columns for log data and some table formatting quirks. 2013-11-25 14:59:23 +01:00
Fredrik Arvidsson
d41f99aca8 OP-1119 Bug fixin 2013-11-24 21:47:57 +01:00
Fredrik Arvidsson
71ec5a9a64 OP-1119 Added helper class for synchronous uavo stuff. Added code for retrieval of flight side logs. 2013-11-24 17:50:07 +01:00
m_thread
077c2b0921 OP-1119 Changed from ListView to TableView. Starting to implement the log entry population and retrieveng code. 2013-11-21 18:07:48 +01:00
m_thread
e693d94637 OP-1119 Added more gui elements. Fixed layouts and alignments. 2013-11-21 12:10:06 +01:00
Philippe Renon
87725ded48 OP-1122 OP-1123 fixed assertion errors when loading waypoint file in wp editor 2013-11-21 00:22:19 +01:00
Philippe Renon
aff543561b OP-1122 OP-1120 refactored code to retreive board waypoints + fixed compilation error 2013-11-20 22:25:19 +01:00
Fredrik Arvidsson
72d1744676 OP-1119 More gui 2013-11-20 21:08:26 +01:00
m_thread
ed18e372db OP-1119 Some more gui work 2013-11-20 16:56:43 +01:00
m_thread
e42c53de74 OP-1119 Added QmlProperty to handle list of log events downloaded from board. 2013-11-20 16:24:57 +01:00
m_thread
2191acd22f OP-1119 Adding dialog and qml 2013-11-20 12:24:34 +01:00
Fredrik Arvidsson
1b33f48048 OP-1119 Some glue code between qml and c++ 2013-11-20 00:07:04 +01:00
Philippe Renon
3efea32507 OP-1122 OP-1120 fixed regressions introduced by previous refactoring of waypoint to board transmission - re-introduced calls to updated() which are needed for some reason I don't yet understand
- without the updated() call the waypoint are not sent to the board (or at least they get overwritten by the board waypoint)
- with the updated() call i see lots of "!!!!!! Making request for an object:  Waypoint"  for which a request is already in progress!!!!!! messages.
2013-11-19 23:30:56 +01:00
Philippe Renon
f942cdf9d6 OP-1122 OP-1120 intial refactoring of code to send waypoints to board
- all uavobject sends are now in the same method
- removed uncessary updated() calls
2013-11-19 22:03:03 +01:00
m_thread
04f4083d4d OP-1119 Minor change 2013-11-19 22:00:16 +01:00
Philippe Renon
2da7c24bb7 OP-1122 OP-1121 close all windows when closing main GCS windows
this fixes failures to exit GCS when some dialogs are still open (for example the Waypoint Editor)
2013-11-19 21:54:07 +01:00
Corvus Corax
d235a24e23 Merge branch 'next' into corvuscorax/onboardlogging 2013-11-19 18:49:58 +01:00
m_thread
19fbefbdec Merge remote-tracking branch 'origin/shared/OP-1109_qtquick2' into thread/OP-1119_Flight_Side_Logs_Plugin
Conflicts:
	artwork/PFD/pfd.svg
2013-11-19 12:59:20 +01:00
Fredrik Arvidsson
a4d302bcc7 OP-1119 Adding some more boilerplate code. 2013-11-19 07:39:52 +01:00
Fredrik Arvidsson
a2c4cb0454 OP-1119 Fixed .pro file dependency issue. 2013-11-19 00:26:38 +01:00
Fredrik Arvidsson
3ec280b74f Merge remote-tracking branch 'origin/corvuscorax/onboardlogging' into thread/OP-1119_Flight_Side_Logs_Plugin 2013-11-18 23:48:03 +01:00
m_thread
8a064b27b9 OP-1119 Initial commit of empty plugin with only menu item added to GCS. 2013-11-18 15:51:56 +01:00
Bertrand Songis
9183e2bb20 Fix for OP-1099: Hidden icons in Configuration tab 2013-11-18 14:10:17 +01:00
Patrick Huebner
42ad960044 OP-1109 Fix uninitialised use of m_container in welcomemode 2013-11-18 22:43:14 +11:00
Fredrik Larrson
0afbed5995 Doh, stupid type in comment, sorry. 2013-11-18 20:13:05 +11:00
Fredrik Larrson
d8772c5529 Clean this up, so debug DDLs don't hang around in a release and vice versa 2013-11-18 20:04:11 +11:00
Corvus Corax
fcc479f5cb more intelligent log interfacing, including flash formatting option 2013-11-17 20:14:50 +01:00
Corvus Corax
354ca88cd6 Updated UAVObject metadata to include correct flags needed for on board logging 2013-11-17 14:00:42 +01:00
Corvus Corax
a0746d87fa Logging facility: logs debug data to logfs and exports it through container UAVObject 2013-11-17 02:54:26 +01:00
Corvus Corax
89f7dab2de uncrustification for ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h 2013-11-16 17:34:43 +01:00
Corvus Corax
cf5d59a677 uncrustification for ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h 2013-11-16 17:34:43 +01:00
Corvus Corax
31d4234c79 uncrustification for ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h 2013-11-16 17:34:43 +01:00
Corvus Corax
7420276a06 uncrustification for ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.h 2013-11-16 17:34:43 +01:00
Corvus Corax
2582eefaed uncrustification for ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp 2013-11-16 17:34:42 +01:00
Corvus Corax
28d79420c1 uncrustification for ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h 2013-11-16 17:34:42 +01:00
Corvus Corax
f73e2c1a75 uncrustification for ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h 2013-11-16 17:34:42 +01:00
Corvus Corax
0e8f01baa8 uncrustification for ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h 2013-11-16 17:34:42 +01:00
Corvus Corax
e7bd28e14c uncrustification for ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h 2013-11-16 17:34:42 +01:00
Corvus Corax
436293dbaf uncrustification for ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h 2013-11-16 17:34:42 +01:00
Corvus Corax
5c6885caf4 uncrustification for ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h 2013-11-16 17:34:42 +01:00
Corvus Corax
68a8863fbd uncrustification for ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h 2013-11-16 17:34:42 +01:00
Corvus Corax
406daf316c uncrustification for ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h 2013-11-16 17:34:42 +01:00
Corvus Corax
a21357d8e9 uncrustification for ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp 2013-11-16 17:34:42 +01:00
Corvus Corax
2c04a338b4 uncrustification for ground/openpilotgcs/src/plugins/scope/scopeplugin.h 2013-11-16 17:34:42 +01:00
Corvus Corax
cef290ddca uncrustification for ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h 2013-11-16 17:34:42 +01:00
Corvus Corax
04b7fbbf35 uncrustification for ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h 2013-11-16 17:34:41 +01:00
Corvus Corax
9b5c7e20c3 uncrustification for ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h 2013-11-16 17:34:41 +01:00
Corvus Corax
0fd357ae61 uncrustification for ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h 2013-11-16 17:34:41 +01:00
Corvus Corax
4babcedfe2 uncrustification for ground/openpilotgcs/src/plugins/opmap/opmapplugin.h 2013-11-16 17:34:41 +01:00
Corvus Corax
55eb581e45 uncrustification for ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h 2013-11-16 17:34:41 +01:00
Corvus Corax
df77cd7613 uncrustification for ground/openpilotgcs/src/plugins/notify/notifyplugin.h 2013-11-16 17:34:41 +01:00
Corvus Corax
2cbe028cd5 uncrustification for ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h 2013-11-16 17:34:41 +01:00
Corvus Corax
cc04e31b5d uncrustification for ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h 2013-11-16 17:34:41 +01:00
Corvus Corax
bc83fd6ffa uncrustification for ground/openpilotgcs/src/plugins/logging/loggingplugin.h 2013-11-16 17:34:41 +01:00
Corvus Corax
3c23b1f464 uncrustification for ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp 2013-11-16 17:34:41 +01:00
Corvus Corax
968470037f uncrustification for ground/openpilotgcs/src/plugins/logging/logfile.cpp 2013-11-16 17:34:41 +01:00
Corvus Corax
98d213f1a2 uncrustification for ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h 2013-11-16 17:34:41 +01:00
Corvus Corax
33616e6af4 uncrustification for ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h 2013-11-16 17:34:40 +01:00
Corvus Corax
bcc651ddc8 uncrustification for ground/openpilotgcs/src/plugins/importexport/importexportplugin.h 2013-11-16 17:34:40 +01:00
Corvus Corax
4adca55693 uncrustification for ground/openpilotgcs/src/plugins/hitl/hitlplugin.h 2013-11-16 17:34:40 +01:00
Corvus Corax
58109f8461 uncrustification for ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h 2013-11-16 17:34:40 +01:00
Corvus Corax
65e8c0dc6f uncrustification for ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h 2013-11-16 17:34:40 +01:00
Corvus Corax
a499b92d9d uncrustification for ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h 2013-11-16 17:34:40 +01:00
Corvus Corax
765bd0a7ff uncrustification for ground/openpilotgcs/src/plugins/dial/dialplugin.h 2013-11-16 17:34:40 +01:00
Corvus Corax
2e5c179fa4 uncrustification for ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h 2013-11-16 17:34:40 +01:00
Corvus Corax
6030b1ba0a uncrustification for ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h 2013-11-16 17:34:40 +01:00
Corvus Corax
17da3a6c7a uncrustification for ground/openpilotgcs/src/plugins/config/configplugin.h 2013-11-16 17:34:40 +01:00
Corvus Corax
9a753e5c77 uncrustification for ground/openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h 2013-11-16 17:34:39 +01:00
Fredrik Larrson
1edfd56d48 For controls and Dialogs, use Copydir directive as all qml files are
needed and this is the "easy way", the other solution is to list every
single qml file by hand, these will likely be added to in upcomming
releases of Qt and cause maintaince.

The downside is three debug DLLs get copied also, if required I can expand
copydata.pro to delete them after the copy if required.

As we are making some changes to the build system, this at least enables
working builds of QtQuick2, if before packaging we do not have a better
solution, I will make sure the extra debug DLLs are removed.
2013-11-16 19:18:36 +11:00
Patrick Huebner
b1fd5db4f5 OP-1118 Fix for QComboBox focus bug in UAVObjectBrowser on Mac OSX 2013-11-16 17:22:51 +11:00
Fredrik Larrson
e53db99d89 Add private shared QtQuick types 2013-11-16 05:57:39 +11:00
Fredrik Larrson
94b9ef10d5 Merge branch 'about' into qtquick2 2013-11-16 05:38:38 +11:00
Fredrik Larrson
f1dd376b79 Standard QtQuick2 working, welcome, PFD etc 2013-11-16 04:35:09 +11:00
Fredrik Larrson
d868c12a09 QtQuick2 DLLs copied, fixed directory name with missing period also 2013-11-16 04:11:53 +11:00
Fredrik Larrson
85387f000a Only make controls directory once 2013-11-16 03:46:04 +11:00
Fredrik Larrson
16c157591b Create QtQuick directories 2013-11-16 03:42:11 +11:00
m_thread
674af2cf35 OP-1107 :/ 2013-11-15 13:18:35 +01:00
m_thread
01423dba8a OP-1107 Another mistake 2013-11-15 13:16:11 +01:00
m_thread
c48c4f5088 OP-1107 removed a faulty include 2013-11-15 12:58:43 +01:00
m_thread
f7a832bc06 Merge remote-tracking branch 'opgit/shared/OP-1109_qtquick2' into thread/OP-1107_About_dialog_enhancements 2013-11-15 12:26:46 +01:00
m_thread
300888e8b1 OP-1107 Implements the new About dialog in QtQuick 2.0. 2013-11-15 11:58:59 +01:00
Patrick Huebner
28de9f1d48 OP-1114 Bug fix for QGLWidget mouse click issue 2013-11-15 21:03:03 +11:00
Philippe Renon
89e261c3f8 OP-1109: added required DLLs 2013-11-14 22:41:39 +01:00
m_thread
63ad5e69da Merge remote-tracking branch 'origin/shared/OP-1109_qtquick2' into thread/OP-1107_About_dialog_enhancements
Conflicts:
	ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.cpp
	ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro
	ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml
	ground/openpilotgcs/src/plugins/coreplugin/qml/ScrollDecorator.qml
	ground/openpilotgcs/src/plugins/coreplugin/qml/TabWidget.qml
2013-11-14 20:09:05 +01:00
Alessio Morale
c179d388e3 OP-1109: fix uninitialized use of m_container 2013-11-14 00:48:34 +01:00
Alessio Morale
bac4f96d1c OP-1109: port plugins/pfdqml 2013-11-14 00:48:00 +01:00
Alessio Morale
710f73d219 OP-1109: port coreplugin/AutorsDialog.
TODO: fix dialog/view size handling
2013-11-14 00:25:24 +01:00
Alessio Morale
1c23dcd2e4 OP-1109: port plugin/welcome 2013-11-14 00:04:34 +01:00
Alessio Morale
067b2e61ae OP-1109: port plugins/QMLView 2013-11-14 00:04:12 +01:00
Alessio Morale
9507431cd6 OP-1109: port libs/utils - swgImageProvider 2013-11-13 23:07:03 +01:00
Dmytro Poplavskiy
cab2d22bbb PFD: Display altitude vector bar 2013-11-13 16:30:11 +01:00
Dmytro Poplavskiy
40629f62db Display the altitude waypoint 2013-11-13 16:30:09 +01:00
Dmytro Poplavskiy
071f81370a Display the speed waypoint element
if not 0
2013-11-13 16:30:08 +01:00
Dmytro Poplavskiy
454a81760e Correctly find the position of GPS fix element
using coordinates of "gps-mode-text" element
2013-11-13 16:30:06 +01:00
Dmytro Poplavskiy
64179a70a2 Updated pfd.svg file
With some text only items conveted to path,
so they can be used to find coordinates on the scene
2013-11-13 16:30:05 +01:00
Dmytro Poplavskiy
ecbbfd0891 PFD view: added Warning and incomplete Info views
Only GPS info is implemented
2013-11-13 16:30:03 +01:00
Dmytro Poplavskiy
bac42e92c4 GCS UAVO generator: generate properties for composed fields
Expose field elements as FieldName_Element properties.
it's more convenient if only certain element is used
and much easier to use from the qml side
2013-11-13 16:30:02 +01:00
Dmytro Poplavskiy
c51ea68621 Reload PFD qml widget on the middle mouse click
Makes qml files modifications and result check much faster
2013-11-13 16:30:00 +01:00
Dmytro Poplavskiy
c06bbdb5cc Updated pfd.svg and related PFD qml files
Still WIP, implemented:
* horizont rendering
* altitude scale
* speed scale
* vsi scale
* basic compass, without extra marks/points
* fixed horizont center mark
2013-11-13 16:29:59 +01:00
Alessio Morale
12661f79a8 Merge remote-tracking branch 'origin/bsongis/OP-1095_GCS_crashing_on_MacOSX_10.9_upon_connection_of_OPLinkMini' into next 2013-11-13 15:54:03 +01:00
Alessio Morale
c3f059d057 Merge remote-tracking branch 'origin/bsongis/OP-1080_Unreliable_detection_of_board_through_OPLink' into next 2013-11-13 15:42:40 +01:00
Patrick Huebner
b4d0a93133 OP-1103 Some minor cleanup work and adding a version check for Qt5.1 2013-11-13 21:04:57 +11:00
m_thread
6d57536ff3 OP-1107 Still not working but all gui elements are in place. 2013-11-11 10:01:16 +01:00
Patrick Huebner
b151ff3fed OP-1103 OpenGL/OpenGL.h should only be included on OSX, otherwise it breaks Windows and Linux builds 2013-11-10 22:42:34 +11:00
Patrick Huebner
c0f6d9d7bc OP-1103 Fixes a build problem where the CoreFoundation framework wasn’t found on some systems. 2013-11-10 09:36:37 +11:00
Bertrand Songis
6bb1ae6721 Fix for OP-1080: Unreliable detection of board through OPLink
Conflicts:
	ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp
2013-11-06 12:18:10 +01:00
Bertrand Songis
df0e51c986 Fix for [OP-1078]: GCS segfaults if you close it after playing a log file 2013-11-06 12:16:50 +01:00
Patrick Huebner
9a60d63c59 OP-1103 Fixes rendering issues related to QTabWidget DocumentMode 2013-11-04 00:13:15 +11:00
Patrick Huebner
0833cd206c OP-1103 Fix for build error on OSX 10.8 after Qt5.1.1 update 2013-11-04 00:13:14 +11:00