Stacey Sheldon
f7467cbb47
makefile: generate multiple versions of UAVOs
...
This will allow a single GCS to have access to multiple
sets of UAVO libraries.
2012-10-10 00:35:14 -04:00
Stacey Sheldon
6da6274543
version-info: add subst for text version of UAVO sha1sum
2012-10-10 00:35:13 -04:00
Fredrik Arvidsson
befa5da671
Fixed layouts in the setup wizard and made the wizard resizeable.
2012-10-10 00:36:29 +02:00
Laura Sebesta
4b3994a550
Merge branch 'next' into kenz/hitl_merge
...
Conflicts:
ground/openpilotgcs/src/plugins/plugins.pro
2012-10-09 22:47:20 +02:00
Fredrik Arvidsson
fc69eaa205
Merge branch 'next' into pt/wiz_layouts
2012-10-09 21:56:27 +02:00
Fredrik Arvidsson
8bb4a14e28
Merge branch 'pt/wiz_layouts' of ssh://git.openpilot.org/OpenPilot into pt/wiz_layouts
2012-10-09 21:56:14 +02:00
Oleg Semyonov
d60be79133
GCS: fix plugin build dependencies
...
They should reflect the pro/pri files included and be sufficient to
build. Chained dependencies should be built by the make system.
2012-10-09 21:57:58 +03:00
PT_Dreamer
d1b78faeb3
Revert "GCS-Config wizard"
...
This reverts commit 4b5c88589c
2012-10-09 18:59:01 +01:00
Fredrik Arvidsson
d98c2aacf3
Merge branch 'next' into pt/wiz_layouts
2012-10-09 19:56:04 +02:00
PT_Dreamer
4b5c88589c
GCS-Config wizard
...
Made the wizard set stab1,2,3 as default flight modes for multis
2012-10-09 00:16:22 +01:00
PT_Dreamer
047201211b
GCS-Change config file name
...
This is to force a new configuration to be loaded and used.
2012-10-08 22:36:32 +01:00
Stacey Sheldon
80f038f579
Merge remote-tracking branch 'origin/stac/linux-64bit-qt' into next
2012-10-08 13:17:31 -04:00
Laura Sebesta
c2b49b6ef3
Merge branch 'kenz/cc_hitl_merge' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.ui
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
2012-10-08 15:30:27 +02:00
Laura Sebesta
993cd0f8f6
Added conversion from rotation matrix to quaternions.
2012-10-08 15:17:47 +02:00
Laura Sebesta
db8563f69f
Fix aerosimrc hitl merge issues.
2012-10-08 00:41:58 +02:00
Stacey Sheldon
4f6bca2a8a
makefile: choose correct qt installer for 64-bit machines
2012-10-07 17:29:27 -04:00
PT_Dreamer
64d2922e71
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate
...
Conflicts:
ground/openpilotgcs/share/share.pro
2012-10-07 21:01:21 +01:00
Fredrik Arvidsson
c03ac35780
Added functionality for skipping autoupdate page if no firmware is available in resource bundle.
2012-10-07 21:49:07 +02:00
chris pember
bb2637054b
hopefully fixed any conflicts
2012-10-07 10:57:53 -07:00
chris pember
ee031fe80d
Merge branch 'next' into cp/extraGUIchanges
...
Conflicts:
ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowseroptionspage.ui
2012-10-07 10:32:21 -07:00
chris pember
423513efad
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-10-07 10:29:34 -07:00
chris pember
1d345d6916
Merge branch 'next' into cp/extraGUIchanges
...
Conflicts:
ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadgetoptionspage.ui
2012-10-07 10:20:38 -07:00
PT_Dreamer
d664ec9705
GCS-Try to fix linux file copy without braking Win
2012-10-07 16:50:04 +01:00
PT_Dreamer
5095249015
Revert "GCS-Auto update function"
...
This reverts commit 5556ed15b9
2012-10-07 13:34:46 +01:00
PT_Dreamer
25bb91682b
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-10-07 13:21:04 +01:00
Laura Sebesta
b0182a47e3
Fixed csv export error, and increased resolution of all variables to 10 significant digits.
...
(10 sig. dig. are required for full resolution GPS latitude and longitude output.)
2012-10-07 09:09:15 +02:00
Laura Sebesta
22d7c8947e
Removed extraneous comments.
2012-10-07 08:50:24 +02:00
Stacey Sheldon
b4fb4911cb
HISTORY: Mentioned new ppm+pwm feature
2012-10-06 23:09:09 -04:00
Stacey Sheldon
157aeac9fc
Merge remote-tracking branch 'origin/stac/ppm-and-pwm-inputs' into next
2012-10-06 23:04:49 -04:00
sambas
9212bbeb20
DSMx bindmode delay was too long, satellite binding works again.
2012-10-07 12:09:42 +11:00
PT_Dreamer
5c879d5238
GCS-Fix file copying on linux
...
It got reverted on a merge
2012-10-06 23:41:14 +01:00
PT_Dreamer
4ef8b78ff8
GCS-Made autouploader fetch fw from fw bundle
...
Fw bundle is built with "make package_resource".
This target is a dependency of the package target but needs testing
on the different systems.
If the bundle is not present the build will not fail and
the wizard will jump the autoupdate page (not working FIXME)
2012-10-06 23:24:21 +01:00
PT_Dreamer
f6443fc995
Merge branch 'stac/package-opfw-resources' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate
2012-10-06 19:50:17 +01:00
PT_Dreamer
4e4ed172c1
GCS-Added fw bundle resource to the uploader plugin
2012-10-06 19:46:33 +01:00
chris pember
827b8b9486
added groupboxes to the pages that were loose
2012-10-06 11:43:03 -07:00
Fredrik Arvidsson
2af2a732fb
Complete set of new icons.
2012-10-06 16:12:15 +02:00
chris pember
f6c4b4b57b
fixed one last settings page
2012-10-06 02:09:50 -07:00
chris pember
c2641fd21d
added scroll areas to all the preference settings screens
2012-10-06 01:55:24 -07:00
Fredrik Arvidsson
08be8f5e8f
Merge branch 'next' into thread/config_art
2012-10-06 10:45:08 +02:00
Fredrik Arvidsson
ffe6c0bcb5
Added icons and updated some other code.
2012-10-06 10:42:57 +02:00
PT_Dreamer
ce338fdf4f
GCS-Make the resources target dependent of the flight package target
2012-10-06 03:20:15 +01:00
PT_Dreamer
f74b149152
GCS-Generate resources file
2012-10-06 03:02:21 +01:00
Stacey Sheldon
4f53a88c35
makefile: remove debug cruft
2012-10-05 21:00:17 -04:00
Stacey Sheldon
45676f9355
androidgcs: add ignores for command-line android builds
...
Unfortunately, the android command-line tools insist on
putting a few files under the source tree. Ideally, these
files would go into ./build/androidgcs somewhere.
Tell git to ignore them until someone figures out how to
force them into the right place.
2012-10-05 20:54:01 -04:00
Stacey Sheldon
5ffe555bae
androidgcs: use symlink to autogenerated uavo java code
2012-10-05 20:54:01 -04:00
Stacey Sheldon
45fe7193af
androidgcs: remove pre-built uavo code
...
The UAVO java code will be autogenerated.
2012-10-05 20:54:01 -04:00
Stacey Sheldon
6b4f60b263
makefile: add support for building androidgcs
2012-10-05 20:54:01 -04:00
Stacey Sheldon
bc2080fec7
makefile: add function for computing relative paths
2012-10-05 20:54:00 -04:00
PT_Dreamer
519e240a6e
GCS-Fix file copying on linux
...
It got reverted on a merge
2012-10-06 01:44:20 +01:00
PT_Dreamer
a313a54c17
GCS-Added temp resource file containing fw
2012-10-06 01:43:44 +01:00
