Fredrik Arvidsson
538bedeb93
Merge remote-tracking branch 'origin/kevinv033/OP-791' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml
2013-04-22 20:14:05 +02:00
Fredrik Arvidsson
78d47e4185
Merge remote-tracking branch 'origin/filnet/OP-769_remove_hardcoded_en_locale' into next
2013-04-22 19:27:18 +02:00
Oleg Semyonov
97d4e9178b
Merge remote-tracking branch 'origin/lilvinz/dsmx_zero_fix' into next
2013-04-20 22:14:23 +02:00
Oleg Semyonov
927e952a9d
Merge remote-tracking branch 'origin/os/OP-897_hide-unsupported-modes' into next
2013-04-20 21:23:00 +02:00
Alessio Morale
8011a9476d
OP-886 fixed a bug caused by wrong check for xSemaphoreTakeRecursive return code
...
Conflicts:
flight/Libraries/alarms.c
2013-04-20 17:17:55 +02:00
Alessio Morale
dd37c31a07
OP-886 Fixes to styles, used enum for ExtendedAlarmStatus
...
Conflicts:
flight/Libraries/inc/sanitycheck.h
shared/uavobjectdefinition/systemalarms.xml
2013-04-20 16:33:38 +02:00
Philippe Renon
cfbd9b2728
OP-769 main.cpp various cleanups
2013-04-20 14:04:28 +02:00
Oleg Semyonov
220b4b5042
OP-886: use enum for extended alarm status field
...
See also:
http://reviews.openpilot.org/cru/OPReview-430
http://progress.openpilot.org/browse/OP-915
2013-04-20 02:10:40 +03:00
Philippe Renon
6074828807
OP-769 main.cpp fixed review comments (OPReview-440)
2013-04-20 00:04:06 +02:00
Oleg Semyonov
343a4b9015
OP-886: cosmetic style and spacing fixes
2013-04-20 00:56:45 +03:00
Oleg Semyonov
cb068f507b
Merge remote-tracking branch 'origin/next' into amorale/OP-886_sanitychecks
2013-04-19 23:43:42 +02:00
Oleg Semyonov
5e942bbd6d
gcs: fix weird Windows build error if python is called w/o quotes
...
This fixes two problems:
- if OPENPILOT_TOOLS_DIR is set using backslashes, they should be
converted to forward ones. Otherwise on Windows it can't run the
program.
- for some weird reason the python called without quotes (regardless
of full path used or not) tries to open whole command line as a file
instead of the 1st parameter only. This works as it should from bash
prompt. But executed by make it fails on Windows.
2013-04-19 22:54:55 +03:00
Oleg Semyonov
491e89b165
make: sort wildcard sources to make binaries identical on all platforms
...
Thanks to Amedee for finding the cause of the difference and CorvusCorax
for participating in the discussion.
2013-04-19 20:43:31 +02:00
Oleg Semyonov
72a2d1a50e
style: use 2 spaces and full stop for UAVO comments (as used in other objects)
...
+review OPReview-430
2013-04-19 18:47:56 +03:00
Oleg Semyonov
efeb7c4890
Merge remote-tracking branch 'origin/cyr/yawzero' into next
2013-04-19 15:30:57 +03:00
Oleg Semyonov
da68ac1c8b
Merge remote-tracking branch 'origin/amedee/OP-678' into next
...
+review OPReview-433
OP-678 #resolve #comment Thanks Philippe! Merged to next. Needs testing.
2013-04-19 12:58:56 +03:00
Oleg Semyonov
f15249ff07
make: fix bu_* targets
2013-04-18 17:50:34 +03:00
Oleg Semyonov
509a1b4fe1
make: fix *_program targets (were broken for firmware)
2013-04-18 17:37:12 +03:00
Oleg Semyonov
b7de3c99d8
tools: fix typo in comments
2013-04-18 16:03:05 +02:00
Oleg Semyonov
f7236eb180
tools: add Linux 64bit native ARM toolchain
2013-04-18 15:45:38 +03:00
Philippe Renon
208e97f476
OP-769 cleaned up handling of options in main + other cleanups
2013-04-18 01:28:11 +02:00
Oleg Semyonov
61bb82ca15
gcs: find python in tools building with Qt-Creator
...
This fix uses the same approach as OpenPilot toolchain system,
but for build started from Qt-Creator.
2013-04-17 19:08:02 +02:00
Oleg Semyonov
59f8a99ab7
make: warn users about old ARM toolchain instead of cryptic 'no such file' error
2013-04-16 21:26:36 +02:00
Oleg Semyonov
ecad4ec0f3
gcs: bump minimum Qt version to 4.8 (4.7 is not supported anymore)
2013-04-16 10:08:53 +02:00
Oleg Semyonov
3b3377e6f4
Merge remote-tracking branch 'origin/os/friendly-toolchain-install' into next
2013-04-15 01:24:42 +02:00
Oleg Semyonov
354924deed
OP-719: suggest to use native Qt 4.8.x package on Linux and OSX
...
+review OPReview-441
2013-04-14 23:46:15 +02:00
Oleg Semyonov
d3ad4d3106
OP-719: provide pre-fetch and post-extract options to install template
...
+review OPReview-441
2013-04-14 23:46:14 +02:00
Fredrik Arvidsson
361f8397c9
OP-885 Fixed some code formatting issues.
2013-04-14 13:24:07 +02:00
Oleg Semyonov
cb4cfac0f3
OP-719: fix +x for openpilotgcs on linux
2013-04-14 14:09:46 +03:00
Fredrik Arvidsson
471afde5f8
Merge remote-tracking branch 'origin/next' into thread/OP-885_Update_Boards_Artwork
...
Conflicts:
ground/openpilotgcs/share/share.pro
2013-04-14 11:30:40 +02:00
Oleg Semyonov
159dae9c9b
OP-719: print error message if curl is not available and stop
...
+review OPReview-441
2013-04-14 04:17:10 +03:00
Oleg Semyonov
afbb11f43e
Fix 'variable not used' warning. Still needs to be reworked for timing
2013-04-14 02:11:23 +02:00
Oleg Semyonov
28314ec170
OP-719: add linux x64 version of qt-4.8.4
...
It seems we must ship GCS with all Qt libs like we do for Windows.
On Ubuntu x64 the GCS built with this crashes using system libs.
But since it's possible to build GCS using natively installed
Qt SDK, it is not a problem for now. Something is better than
nothing, and two ways of building are better then just one.
+review OPReview-441
2013-04-13 22:51:33 +03:00
Philippe Renon
3c3080a441
OP-769 OP-723 GCS main cleanups as per OPReview-440
...
+ documented new -no-splash switch
2013-04-13 14:49:11 +02:00
Oleg Semyonov
273d6cb1d2
OP-892: fix broken op_overo path in .gitmodules
...
The submodule itself was deleted in commit b621b057b60e426ff191f1a983406b9134b514a8
This commit updates the reference, so it can be reenabled if desired.
2013-04-12 20:10:20 +03:00
Oleg Semyonov
9cc0abe262
makefile: use correct opfw_resource file name as dependancy
...
When 'opfw_resource' target is used as a dependency, it seems that make
can't determine when the resource file is remade, and sometimes may
start building GCS before the resource really exists. This is an attempt
to fix that issue by referencing the real file instead of phony target.
2013-04-12 17:55:23 +03:00
Oleg Semyonov
e15c40b35d
makefile: deprecate CLEAN_BUILD option (use clean_package or package instead)
2013-04-12 17:03:32 +03:00
Oleg Semyonov
03a4ca545f
Remove stray '}' in a makefile
2013-04-12 11:51:18 +02:00
Oleg Semyonov
8ab580ae82
Remove stray '}' in a makefile
2013-04-12 12:50:12 +03:00
Oleg Semyonov
5be0a1919e
OP-719: add md5 checksumming
2013-04-12 10:56:12 +02:00
Oleg Semyonov
3967874996
OP-719: use common tool install template
2013-04-12 10:56:11 +02:00
Oleg Semyonov
34b15fedaf
OP-719: make python_install (Windows)
2013-04-12 10:56:10 +02:00
Oleg Semyonov
c0878f290d
OP-719: make qt_sdk_install (Linux)
2013-04-12 10:56:08 +02:00
Oleg Semyonov
e4d91218b6
OP-719: make qt_sdk_install mingw_install (Windows)
2013-04-12 10:56:07 +02:00
Oleg Semyonov
ea06337573
OP-719: make/scripts/win_sdk_install.sh
2013-04-12 10:56:06 +02:00
Oleg Semyonov
5040a13efb
gcs: set default UDP port to 9000 as used by simposix firmware
2013-04-12 10:56:05 +02:00
Oleg Semyonov
a12470f7a7
makefile: if all_fw or all_flight are requested, gcs will depend on opfw_resource
2013-04-12 10:55:58 +02:00
Oleg Semyonov
bc4d25242f
makefile: use the same coding style for all make variables
2013-04-12 10:55:23 +02:00
Philippe Renon
42022df009
OP-69 allow to set language (translation) in use for first launch through
...
factory defaults
OP-723 do not hard code locale to en_US in order to allow locale specific
display and entry of numbers and dates
+ revisited the GCS startup sequence
2013-04-11 19:47:05 +02:00
Brian Webb
28bfc2725c
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-04-11 14:42:49 +01:00