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 |
|
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 |
|
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 |
|
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 |
|
m_thread
|
81443570ab
|
OP-1119 Moved class LogFile from Logging plugin to libs/utils
|
2013-11-27 16:07:15 +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
|
3ec280b74f
|
Merge remote-tracking branch 'origin/corvuscorax/onboardlogging' into thread/OP-1119_Flight_Side_Logs_Plugin
|
2013-11-18 23:48:03 +01:00 |
|
Bertrand Songis
|
9183e2bb20
|
Fix for OP-1099: Hidden icons in Configuration tab
|
2013-11-18 14:10:17 +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 |
|
Alessio Morale
|
9507431cd6
|
OP-1109: port libs/utils - swgImageProvider
|
2013-11-13 23:07:03 +01: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 |
|
Philippe Renon
|
09408b40ca
|
[OP-835] Qt 5.1.0 - uncrustified gcs sources
|
2013-10-17 21:45:37 +02:00 |
|
Philippe Renon
|
28e57242f7
|
[OP-835] Qt 5.1.0 - disabled all compilation warnings for glc_lib and qwt libs as both use imported sources
|
2013-09-20 22:58:18 +02:00 |
|
Philippe Renon
|
2e02843e59
|
[OP-835] Qt 5.1.0 - migrated GCS libs/util
|
2013-09-15 23:37:19 +02:00 |
|
Philippe Renon
|
706c371ccc
|
[OP-835] Qt 5.1.0 - migrated GCS libs/qwt
|
2013-09-15 23:37:18 +02:00 |
|
Philippe Renon
|
0e347a90f9
|
[OP-835] Qt 5.1.0 - migrated GCS libs/qtconcurrent
|
2013-09-15 23:37:18 +02:00 |
|
Philippe Renon
|
df7f10fb08
|
[OP-835] Qt 5.1.0 - migrated GCS libs/qscispinbox
|
2013-09-15 23:36:52 +02:00 |
|
Philippe Renon
|
c10ffd0519
|
[OP-835] Qt 5.0.1 - migrated GCS libs/opmapcontrol
|
2013-09-15 23:35:23 +02:00 |
|
Philippe Renon
|
b249e58861
|
[OP-835] Qt 5.1.0 - migrated GCS libs/glc_lib
|
2013-09-15 23:35:22 +02:00 |
|
Philippe Renon
|
7e042a0bd3
|
[OP-835] Qt 5.1.0 - migrated GCS libs/extensionsystem
|
2013-09-15 23:35:15 +02:00 |
|
Philippe Renon
|
3149dc1144
|
[OP-835] Qt 5.1.0 - removed libqxt and qextserialport libraries as they are now included in Qt
|
2013-09-15 23:34:59 +02:00 |
|
Philippe Renon
|
a9f2cfdf3e
|
[OP-835] Qt 5.1.0 - removed libs/qextserialport as it is now part of Qt
|
2013-09-15 23:24:36 +02:00 |
|
Philippe Renon
|
7bcb82478d
|
[OP-835] Qt 5.1.0 - removed libs/qxt as it is now part of Qt
|
2013-09-15 23:24:14 +02:00 |
|
Alessio Morale
|
19a92ddc7e
|
OP-1044 Uncrustify
|
2013-07-19 14:23:41 +00:00 |
|
Alessio Morale
|
ab9f9cacec
|
OP-1044 fix slow tiles loading preventig to ask for version at each request
|
2013-07-19 14:14:24 +00:00 |
|
Andrew Finegan
|
6d00239e13
|
Updated urlfactory file, google maps now require ssl then recieving tiles, also updated the google map version parser to ssl
|
2013-07-19 01:34:09 -04:00 |
|
Oleg Semyonov
|
0a53a1a89d
|
OP-910: move PYTHON definition to a qmake include file for easy reuse
|
2013-06-05 16:00:43 +03:00 |
|
Oleg Semyonov
|
444431579e
|
OP-770: add/rename some version-info.py template variables
|
2013-05-25 23:02:29 +02:00 |
|
Oleg Semyonov
|
4f6c633815
|
OP-770: extend VersionInfo class to include most of the info available
|
2013-05-25 23:02:28 +02:00 |
|
Sexy Pony
|
900f643bbd
|
Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES
|
2013-05-19 17:37:30 +03:00 |
|
Oleg Semyonov
|
5274a6c6fa
|
OP-955: rename version_info related files an directories
|
2013-05-18 20:28:52 +02:00 |
|
Fredrik Arvidsson
|
62ee55fbb8
|
OP-955 Moved generated version info to its own lib. Updated code using version info in all referenced places.
|
2013-05-18 14:28:46 +02:00 |
|
Fredrik Arvidsson
|
5c906802f1
|
Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab
|
2013-05-03 08:01:14 +02:00 |
|
Sambas
|
f7b9223827
|
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
flight/modules/System/systemmod.c
shared/uavobjectdefinition/taskinfo.xml
|
2013-05-02 09:00:12 +03:00 |
|
Fredrik Arvidsson
|
11cb89930a
|
Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab
|
2013-05-01 16:16:16 +02:00 |
|
Fredrik Arvidsson
|
2d409188f8
|
OP-935 Adds checkbox for 'real time updates' to basic screen. Disables controls when no board is connected.
|
2013-05-01 12:59:07 +02:00 |
|
Oleg Semyonov
|
0394a3511c
|
Rename template files to *.template to screen from uncrustify processing
|
2013-04-30 16:54:27 +02:00 |
|
sambas
|
abe3742217
|
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
flight/Libraries/CoordinateConversions.c
flight/Libraries/paths.c
flight/Modules/System/systemmod.c
flight/PiOS/STM32F4xx/pios_sys.c
flight/targets/boards/coptercontrol/pios_board.h
flight/targets/boards/revolution/pios_board.h
flight/targets/boards/revoproto/pios_board.h
|
2013-04-25 17:26:49 +03:00 |
|
Oleg Semyonov
|
33ed88e696
|
Merge remote-tracking branch 'origin/next' into os/OP-899_board-rename-and-config-rework
|
2013-04-24 21:28:33 +02:00 |
|
Oleg Semyonov
|
f9f721a76a
|
Reset executable bits from non-executable files (Windows legacy)
|
2013-04-24 01:18:46 +03:00 |
|
Oleg Semyonov
|
8d1e1fdbc0
|
tools: make uncrustify_install target, script and base config file
See also: OPIN-3
|
2013-04-22 21:35:25 +02:00 |
|
sambas
|
6989468d17
|
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
.gitignore
|
2013-04-14 10:13:51 +03:00 |
|
Brian Webb
|
28bfc2725c
|
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
|
2013-04-11 14:42:49 +01:00 |
|
sambas
|
fb8273459f
|
Normalize line endings
|
2013-04-07 09:49:13 +03:00 |
|
Oleg Semyonov
|
5bb6b56b4a
|
OP-772: Normalize line endings
|
2013-04-05 23:46:56 +03:00 |
|
Brian Webb
|
538d854627
|
Changed test for GCSRECEIVER in OPLink to PIOS_INCLUDE_GCSRCVR to match new define in pios_config.
|
2013-03-31 16:37:14 +01:00 |
|
sambas
|
5ded8c6dfc
|
VTOL path fixes
Flight mode fixes
POI mode
AutoLand Tests
Simple stabilization Shortest way yaw fix
GCS map and pathplanner fixes
|
2013-03-28 18:29:26 +02:00 |
|