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
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
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
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
5040a13efb
gcs: set default UDP port to 9000 as used by simposix firmware
2013-04-12 10:56:05 +02:00
Brian Webb
28bfc2725c
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-04-11 14:42:49 +01:00
Brian Webb
8f51610776
Fixed some formatting issues.
2013-04-11 14:41:24 +01:00
Brian Webb
081c016dfa
Added braces around if body.
2013-04-07 16:04:24 +01:00
Oleg Semyonov
1eb6e3fd96
Merge remote-tracking branch 'origin/next-fixed-eol' into next
2013-04-07 15:41:26 +02:00
Fredrik Arvidsson
5dc467bda4
Fixed a copy&paste bug in configoutputwidget.cpp resulting in output rate for bank 5 & 6 not showing correctly in gui.
2013-04-07 11:15:24 +02:00
Brian Webb
2ade9abcff
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-04-07 03:29:39 +01:00
Alessio Morale
b5426aa761
Merge remote-tracking branch 'origin/amorale/OP-871_gcs_revo_reset_fix' into next
2013-04-06 19:59:03 +02:00
Brian Webb
ee96890b96
Initialize the Radio configuration widgets in the Revo HW configuration page correctly.
2013-04-06 16:59:03 +01:00
Brian Webb
4564718708
Added setting of max RF power and initial frequency on Revo.
2013-04-06 04:28:25 +01:00
Brian Webb
948038f655
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-04-06 01:32:36 +01:00
Brian Webb
c330db3a28
Added setting of min/max frequencies on OPLink coordinator.
2013-04-06 01:32:15 +01:00
Oleg Semyonov
5bb6b56b4a
OP-772: Normalize line endings
2013-04-05 23:46:56 +03:00
Oleg Semyonov
3bebec22f7
OP-772: Enforce line ending agreements (git 1.7.2+ required for this to work)
...
This is a part of OP-726, OP-727 tasks to normalize source code.
Use the following to normalise your local repository to be able to merge:
git rm --cached -r .
git diff --cached --name-only -z | xargs -0 git add
git commit -m "Normalise line endings"
git ls-files -z | xargs -0 rm
git checkout .
2013-04-05 23:43:58 +03:00
Fredrik Arvidsson
a338257b2d
OP-885 Added configuration for Zagi 3D model. Changed some rendering attributes and changed the name of Revomini to Revolution.
2013-04-03 19:56:41 +02:00
Fredrik Arvidsson
8dc2f23eb2
Merge remote-tracking branch 'origin/muralha/artwork' into thread/OP-885_Update_Boards_Artwork
2013-04-02 19:43:29 +02:00
Fredrik Arvidsson
a697f293b6
OP-885 Added and replaced some artwork for Revolution board and other.
2013-04-02 19:43:19 +02:00
Oleg Semyonov
e24b66897b
build: fix qmake ground/share copy commands for all platforms
...
Read share.pro comments for more details.
+review OPReview-429
2013-04-02 19:43:48 +03:00
Nuno Guedes
a2ddcf7f3b
Added the Zagi plane to the openpilotgcs
...
Added the Zagi plane to the openpilotgcs folder, because this model wasn't added to the ModelView before.
2013-04-02 15:08:28 +01:00
Nuno Guedes
460873884f
New OP 3D boards
...
- Revolution
- OP GPS
- OPLink
2013-04-02 14:39:42 +01:00
Oleg Semyonov
17a687e79d
Revert "Removed creation of extra directory level on Windows."
...
This reverts commit 7c85fa5885
.
2013-04-02 10:20:15 +02:00
Oleg Semyonov
80e668411f
build: remove extra libs, they are not used de-facto
...
+review OPReview-429
2013-03-31 18:06:43 +02: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
Oleg Semyonov
3e815ca8d5
build: get rid of build/ground subdirectory, fix qt-creator builds
...
This changeset:
- moves all ground targets one level up, under build directory. The
build/ground was created as a workaround, now unnecessary;
- fixes QtCreator builds, they are separated from command line builds;
- moves GCS autogenerated files into openpilotgcs-synthetics directory.
The resulting build subdirectory now looks like:
build
openpilotgcs <- Qt-Creator build directory
openpilotgcs-synthetics <- version-info and opfw_resource
openpilotgcs_debug
openpilotgcs_release <- Makefile build directory
uavobject-synthetics
uavobjgenerator
NOTE: you should update the shadow build path in QtCreator to build,
not build/ground as before.
+review OPReview
2013-03-30 17:33:38 +02:00
Brian Webb
2568f41cf3
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-30 01:18:37 +01:00
Brian Webb
1cac81b3e8
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
...
Conflicts:
flight/targets/PipXtreme/System/inc/pios_config.h
flight/targets/RevoMini/System/inc/pios_config.h
2013-03-29 17:17:55 -07:00
Oleg Semyonov
4be3cd4978
Merge remote-tracking branch 'origin/amedee/OP-882' into next
2013-03-29 10:44:47 +02:00
Oleg Semyonov
beb13b32a9
OP-883: The 1st cleanup pass through PIOS and Makefiles system
2013-03-28 11:26:34 +02:00
Fredrik Arvidsson
c549218873
Fixed a bug related to the FusionAlgorithm selection in Revolution configuration.
2013-03-27 13:09:48 +01:00
Fredrik Arvidsson
0adb2b5b6f
Merge remote-tracking branch 'origin/filnet/OP-853_fix_HITL_Options_page' into next
2013-03-27 11:09:52 +01:00
Fredrik Arvidsson
0d87f7509f
Merge remote-tracking branch 'origin/filnet/OP-857_various_gcs_ui_polishing' into next
2013-03-27 11:08:52 +01:00
Fredrik Arvidsson
8423681d41
Merge remote-tracking branch 'origin/filnet/OP-833_gcs_options_dialog_ui_polishing' into next
2013-03-27 11:07:52 +01:00
Philippe Vanhaesendonck
8625eba054
Fix for OSX Lions compiler
...
OSX 10.7 and above will need the -fpermissive flag to compile
2013-03-26 22:57:08 +01:00
Philippe Renon
caa9964fe5
OP-857 OP-876 made default Options dialog size even bigger
2013-03-26 00:37:39 +01:00
Philippe Renon
f00a972e0e
OP-833 cleaned up individual gadget options pages: dial and linear dial
2013-03-24 17:09:59 +01:00
Brian Webb
1979e8b57f
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-24 16:57:59 +01:00
Philippe Renon
eef25f4e9d
OP-857 OP-876 fixed regression introduced while fixing this issue
...
(settings were not handled well anymore)
- added timing debug messages
- minor cleanups
2013-03-24 16:50:17 +01:00
Oleg Semyonov
0957bbb498
Makefile: split GCS build directory into debug and release
...
Now by default GCS is built for release.
AeroSimRC also is placed under misc (as it is installed on Windows).
2013-03-24 13:06:13 +02:00
Oleg Semyonov
4082b1498a
Makefile: move opfw_resource rules from packaging to top Makefile
...
opfw_resource make target now depends on built firmware images. They are
referenced directly from Qt resource file generated. No extra copies
are now necessary.
2013-03-24 13:06:11 +02:00
Brian Webb
2b6345850b
Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS
2013-03-24 00:58:41 +01:00
Alessio Morale
e06ab7f706
Merge remote-tracking branch 'origin/amorale/01-directory_move_sanity_simposix' into next
...
Conflicts:
Makefile
flight/PiOS.posix/inc/pios_com.h
flight/targets/RevoMini/UAVObjects.inc
flight/targets/Revolution/Makefile
2013-03-23 14:37:19 +01:00
Alessio Morale
9244b511ac
Merge branch 'amorale/OP-872_OP-867_thread-Config_revo_support' into next
2013-03-23 13:12:43 +01:00
Alessio Morale
2f2499f8c4
OP-867 fixed intentation
2013-03-23 13:10:57 +01:00