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
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
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
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
m_thread
04f4083d4d
OP-1119 Minor change
2013-11-19 22:00:16 +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
