Bertrand Songis
117c2fb97f
Fix for issue OP-1108: Mutex not correctly released in GCS
2013-12-14 16:57:55 +01:00
Alessio Morale
82c05be41d
Merge branch 'amorale/OP-1143_add_revo_udev_rules' into next
2013-12-13 19:22:04 +01:00
Alessio Morale
c4f4916590
OP-1143: add missing ids to udev rules
...
+review OPReview
2013-12-13 18:40:05 +01:00
Fredrik Larsson
8a742179a7
Merge branch 'hayvosh/OP-1137_Check_remove_config_by_default' into next
2013-12-08 16:28:25 +11:00
Corvus Corax
30e0c9f6c1
somone forgot uncrustification again
2013-12-07 23:28:25 +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 Larsson
8fadcd85d2
Rename GCS Configuration, check it to be removed by default
2013-12-08 03:28:32 +11: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
Fredrik Arvidsson
2fce485e26
Merge remote-tracking branch 'origin/patrickh/OP-1118_QComboBox_Focus_issue' into next
2013-12-01 10:39:41 +01:00
Corvus Corax
9c6abef89b
fixed enabled and disabled messages for logging in all cases
2013-12-01 00:03:24 +01:00
Fredrik Arvidsson
f37f6540a9
Merge remote-tracking branch 'origin/corvuscorax/onboardlogging' into thread/OP-1119_Flight_Side_Logs_Plugin
2013-11-30 23:37:52 +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
Fredrik Arvidsson
79c13b55c5
Merge remote-tracking branch 'origin/corvuscorax/onboardlogging' into thread/OP-1119_Flight_Side_Logs_Plugin
...
Conflicts:
flight/modules/Logging/Logging.c
flight/pios/common/pios_debuglog.c
2013-11-26 07:24:07 +01:00
Corvus Corax
25fd3d5740
Just uncrustification
2013-11-26 00:43:02 +01:00
Fredrik Arvidsson
2fc34910e0
OP-1119 Fix in pios function for debuglogging uavo.
2013-11-26 00:36:59 +01:00
Corvus Corax
be9faabe92
Merge branch 'next' into corvuscorax/onboardlogging
2013-11-26 00:34:01 +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
m_thread
0a085ce106
OP-1119 Added logging event for disabling logging.
2013-11-25 14:58:08 +01:00
m_thread
06924d335a
Merge remote-tracking branch 'origin/next' into thread/OP-1119_Flight_Side_Logs_Plugin
2013-11-25 09:29:45 +01:00
Alessio Morale
bacc4d3d79
Merge branch 'master' into next
...
Conflicts:
flight/targets/boards/oplinkmini/firmware/pios_board.c
ground/openpilotgcs/copydata.pro
2013-11-25 01:12:10 +01:00
Fredrik Arvidsson
d41f99aca8
OP-1119 Bug fixin
2013-11-24 21:47:57 +01:00
Corvus Corax
1c83d3ee28
BUGFIX to OpLinkMini: oplinkmod needs to initialize the Callback Scheduler
...
OPLMini does not use Systemmod but its own system module called
oplinkmod - which did not initialize the callback scheduler. Making the
event dispatcher a callback caused it to no longer run due to the
missing callback scheduler initialization
2013-11-24 21:24:55 +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
Corvus Corax
18ad56d4ed
removed identical files from pios/posix (use files from common instead)
2013-11-24 15:40:32 +01:00
Corvus Corax
89afbde58a
initialized log packages with 0xff instead of 0x0 to reduce flash wear
2013-11-24 15:36:26 +01:00