Philippe Renon
0417b361b7
Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization
2013-12-15 13:27:26 +01:00
Alessio Morale
e472b167e4
Uncrustification
2013-12-14 17:58:27 +01:00
Alessio Morale
08ce27a6d6
Merge remote-tracking branch 'origin/voha/fix_build_error_with_clang' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/ophid/ophid.pro
2013-12-14 17:55:43 +01:00
Bertrand Songis
117c2fb97f
Fix for issue OP-1108: Mutex not correctly released in GCS
2013-12-14 16:57:55 +01:00
Philippe Renon
d668153b6d
OP-1122 OP-1125 fixed copy/paste error in rfm22b flight code
2013-12-14 16:03:42 +01:00
Philippe Renon
f105ca4d41
OP-1122 OP-1125 commented out uavtalk verbose mode defines
2013-12-14 16:02:50 +01:00
Philippe Renon
2d1a17e267
OP-1122 OP-1125 minor uavtalk cleanups
...
- removed some magic numbers
- improved some error messages
- minor error handling improvments
2013-12-14 16:02:14 +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
Philippe Renon
625d7d53fc
OP-1122 OP-1125 reworked uavtalk encoding/decoding to fix issues found during OPLM testing
...
Packet sizes are now again properly calculated and sent by GCS
Made the ground and flight side more symmetric and robust
Fixed few error handling issues
Replaced UAVTALK_QXTLOG_DEBUG define with qWarning() calls
Known issue : GCS sometimes reports bad CRC on messages received over USB connection
2013-12-12 00:05:58 +01:00
Philippe Renon
df7db8a01a
OP-1122 OP-1125 removed spurious qDebug() calls
2013-12-11 23:57:27 +01:00
Philippe Renon
c3506d07ad
OP-112 OP-1120 bring waypoint editor to the front it case it was open and hidden away
2013-12-11 23:56:04 +01:00
Philippe Renon
5f88078256
Merge remote-tracking branch 'origin/filnet/OP-1122_gcs_waypoint_editor_stabilization' into filnet/OP-1122_gcs_waypoint_editor_stabilization
2013-12-11 23:17:27 +01:00
Philippe Renon
bbdef44344
OP-112 OP-1120 waypoint editor - added popup notification for success or failure of uploading/downloading a flight path to the board + minor header file reorg
2013-12-11 23:13:32 +01:00
Philippe Renon
9a24f12235
OP-1122 OP-1125 fixed object connection leak in TelemetryMonitor
...
At each board connection a new connection would be added to the firmwareIAPObj
This would also cause some code to be later signaled mutliple times on board connection
2013-12-11 22:42:27 +01:00
Philippe Renon
ff14b8d28c
OP-1122 OP-1125 renamed method autoUpdated to instanceAutoUpdated
...
also fixed some method help comments
2013-12-11 22:24:38 +01:00
Philippe Renon
e0115a25b0
OP-1122 OP-1125 cleaned up GCS side uavtalk includes
2013-12-11 22:22:28 +01:00
Philippe Renon
617924e64d
Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization
...
Conflicts:
flight/uavobjects/uavobjectmanager.c
ground/openpilotgcs/src/plugins/uavtalk/telemetrymanager.cpp
ground/openpilotgcs/src/plugins/uavtalk/uavtalk.pro
shared/uavobjectdefinition/pathaction.xml
shared/uavobjectdefinition/waypoint.xml
2013-12-08 14:58:01 +01:00
Philippe Renon
95b5f38556
OP-1122 OP-1125 flight side UAVObjectManager was wrongly emitting EV_UPDATED_MANUAL events when new uavobject instances were created. Now properly emits EV_UPDATED.
2013-12-08 14:34:11 +01:00
Philippe Renon
612e66367a
OP-1122 OP-1125 made GCS telemetry and uavtalk a bit more robust (more error case handling)
...
minor cleanup and code reorganization
some preparatory work to read from IODevice from its own thread
2013-12-08 14:30:51 +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
Philippe Renon
4f9231e247
OP-1122 OP-1125 fixed regression in flight side uavtalk introduced in a recent commit
2013-12-04 20:54:07 +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
Philippe Renon
ab89d6a491
OP-1122 OP-1125 fixed defect raised in OPReview-593 : two occurences of connection->respObj clearing were removed when they should not have been removed
2013-12-01 21:44:14 +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
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
Philippe Renon
a6d0f09d21
OP-1122 OP-1125 minor change to uavobject::toStringBrief() method
2013-11-29 19:40:10 +01:00