1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-12 20:08:48 +01:00
Commit Graph

6692 Commits

Author SHA1 Message Date
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
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
PT_Dreamer
5d24bc55a6 GCS-Created wizard firmware autoupdate page 2012-10-06 01:42:33 +01:00
PT_Dreamer
2c4f50c4f5 GCS-Export uploader functions 2012-10-06 01:40:25 +01:00
PT_Dreamer
8c2a5e9d06 GCS-Uploader Auto update function
Quick and dirty autoupdate function.
The uploader plugin is in need of a major refactoring to separate the
logic from the UI. This will be on my TODO list.
2012-10-06 01:35:34 +01:00
Stacey Sheldon
40251afd6e makefile: add update target for android SDK
This installs the components required for actually building
a full APK.
2012-10-05 19:48:08 -04:00
Stacey Sheldon
4305cf942d makefile: Add installer target for the android SDK 2012-10-05 19:48:08 -04:00
Stacey Sheldon
94134b82f7 androidgcs: remove unicode chars to eliminate warnings 2012-10-05 19:48:08 -04:00
Stacey Sheldon
b0b1d9b681 androidgcs: dropped dependency on JUnit
Can't figure out how to get the build to find JUnit.
2012-10-05 19:48:08 -04:00
Stacey Sheldon
4eb485bdde package: auto-generate Qt resource file for OPFW images 2012-10-05 16:23:42 -04:00
PT_Dreamer
5556ed15b9 GCS-Auto update function
Quick and dirty autoupdate function.
The uploader plugin is in need of a major refactoring to separate the
logic from the UI. This will be on my TODO list.
2012-10-05 19:55:43 +01:00
Fredrik Arvidsson
eb35ba4cbb Added even more new icons. 2012-10-05 18:16:04 +02:00
Fredrik Arvidsson
a57435f183 Added more new icons. 2012-10-05 16:24:56 +02:00
Fredrik Arvidsson
d765ac01d5 Added new icons and fixed icon states when selected/highlighted. 2012-10-05 14:30:37 +02:00
chris pember
919202875e temp fix for the sizing of the hitlv2 page to stop the squashing 2012-10-05 19:35:25 +10:00
David Ankers
bcc39b7fad Make options window taller, turn on OpenGL by default on the map, we
already use this for the QML PFD and no issues reported.
2012-10-05 18:47:00 +10:00
David Ankers
7e8aa7079c Make uploader plugin board images looks nicer, spotted by Steve, fixed by
Steve.
2012-10-05 17:39:13 +10:00
Fredrik Arvidsson
28afadf8b9 Added first icons and started to fix with icon states. 2012-10-05 08:16:26 +02:00
David Ankers
d42f4089ed Updated tab Icons from Steve, match the welcome screen icons 2012-10-05 15:26:45 +10:00
chris pember
649a5b4b1e temp fix for the sizing of the hitlv2 page to stop the squashing 2012-10-04 21:12:19 -07:00
chris pember
a536f74722 temp fix for the sizing of the multi page that will allow folks on tiny screens to have a uavo browser if they want 2012-10-05 13:25:49 +10:00
David Ankers
aaea66a5d0 Fix splitter on Scopes screen 2012-10-05 11:18:16 +10:00
David Ankers
2573e84e76 Change Welcome screen icon by popular request 2012-10-05 10:18:29 +10:00