Stacey Sheldon
ed24d93ab1
gcs gamepad: teach GCS that an accel is not a gamepad
...
The gcscontrolgadget expects all gamepad devices to have
at least 4 axes of control. The SDL layer (on Linux anyway)
will detect the accelerometer that's built into some laptops
as a gamepad with 3 axes.
This change prevents the accel from being selected and
subsequently flooding the console with errors from
gcscontrolgadget every 10ms.
2012-09-29 21:47:26 -04:00
PT_Dreamer
4edf78d1cd
GCS-No more hidden settings.
2012-09-29 22:44:52 +01:00
Fredrik Arvidsson
fdec9ce149
OP-39 Fixed a lot of textual stuff.
...
Changed layout on some pages to make room for longer texts.
Changed default neutral value for output from 1080 to 1000.
Renamed 'Hexacopter H' to 'Hexacopter X'
2012-09-29 11:47:16 +02:00
Fredrik Arvidsson
3b9e50ad51
Merge branch 'next' into thread/OP-39
2012-09-29 09:43:50 +02:00
PT_Dreamer
b637bfaca9
Revert "Changed UAVO browser erase icon to reset icon."
...
This reverts commit 85ed1c364d
.
2012-09-28 19:36:46 +01:00
PT_Dreamer
399fc7fe85
Merge branch 'cp/extraGUIchanges' of ssh://git.openpilot.org/OpenPilot into next
2012-09-28 11:55:33 +01:00
PT_Dreamer
dfa60f16b3
Revert "Changed UAVO browser erase icon to reset icon."
...
This reverts commit 85ed1c364d
.
Change voted against by 2 lead devs on the review.
2012-09-28 11:53:19 +01:00
James Cotton
e4faece356
Merge remote-tracking branch 'origin/cp/extraGUIchanges' into next
2012-09-28 01:12:46 -05:00
chris pember
e2389af30d
fixed the stylesheets vertical sliders. pushing to correct branch
2012-09-27 21:06:19 -07:00
chris pember
c6c8ff9487
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-09-27 20:41:33 -07:00
chris pember
5306b2cb71
fixed the stylesheets so the vertical sliders arent broken looking anymore
2012-09-27 20:41:01 -07:00
James Cotton
29a970564f
Merge remote-tracking branch 'origin/kenz/uavo_util_fixes' into next
2012-09-27 14:07:47 -05:00
Laura Sebesta
a899c87c56
Remove superflous UAVO update call.
...
Add documentation.
Remove commented code.
2012-09-27 19:21:00 +02:00
Laura Sebesta
09b8980881
Fixed copy-pasta error.
2012-09-27 18:06:48 +02:00
Laura Sebesta
9ec05d8928
Added dialog to request altitude when settings HomeLocation via the map.
...
Fixed bug in setHomeLocation, by which altitude was scaled inappropriately.
2012-09-27 14:44:26 +02:00
Laura Sebesta
f532f3cda5
Rewrote uavobjectutilmanager.cpp, such that upon UAVO changes it returns com
...
Updated homelocationutil to remove references to ECEF and RNE.
2012-09-27 11:45:59 +02:00
Fredrik Arvidsson
efd953b00c
OP-39 Fixed a bug in Welcome page button.
2012-09-27 08:18:50 +02:00
Fredrik Arvidsson
f42085f6ac
Merge branch 'next' into thread/OP-39
2012-09-26 00:44:34 +02:00
Fredrik Arvidsson
e7e95412e8
OP-39 Fixed Wizard Style so that it looks ok on Mac and Windows
...
Changed the output calibration part of the wizard so that it is a part of the wizard flow instead of a separate flow inside one page.
2012-09-26 00:42:17 +02:00
James Cotton
f77df97699
OSGEarth: Remove function definition without implementation.
2012-09-25 13:24:08 -05:00
James Cotton
7d8c61d33d
OSGEarth: Remove reference to caching. Uses old API.
2012-09-25 13:19:18 -05:00
PT_Dreamer
43f85d9617
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-09-25 10:44:32 +01:00
PT_Dreamer
551c56f3c0
Merge branch 'pt/UAVO_Hash' of ssh://git.openpilot.org/OpenPilot into next
2012-09-25 10:43:59 +01:00
chris pember
b09041cb9f
moved the autotune checkbox up top like the other modules
2012-09-25 00:16:31 -07:00
chris pember
b4ac6a0b86
couple little tweaks, is perfect on linux and windows, close enough on osx
2012-09-24 23:46:34 -07:00
chris pember
36f830e4d3
couple little tweaks, ys, this is endless
2012-09-24 23:28:43 -07:00
chris pember
fc55a52ff4
merged kens branches, changed the wording a little on the pre-autotune page, just need someone to look at one small bit of oddness with the save and apply buttons on autotune page
2012-09-24 21:41:41 -07:00
chris pember
d7eb662761
Merge branch 'kenz/erase2reset' of ssh://git.openpilot.org/OpenPilot into cp/extraGUIchanges
2012-09-24 20:26:30 -07:00
chris pember
086232406d
Merge branch 'kenz/extraGUIchanges' of ssh://git.openpilot.org/OpenPilot into cp/extraGUIchanges
2012-09-24 20:26:04 -07:00
chris pember
ee801431d6
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-09-24 19:41:59 -07:00
Laura Sebesta
2caf635acd
A couple artwork fixes for reversed motors.
2012-09-24 22:36:39 +02:00
Laura Sebesta
9d5d67a45a
Added swapping of artwork when multirotor direction reversed.
2012-09-24 22:01:19 +02:00
PT_Dreamer
af36409e80
Merge branch 'dmytro/pfd_qml' of ssh://git.openpilot.org/OpenPilot into next
2012-09-24 19:02:51 +01:00
PT_Dreamer
c04318493a
GCS- Fixes compile error
2012-09-24 13:38:14 +01:00
PT_Dreamer
8b91e19733
GCS/Telemetry Fixes reconnection loop
...
This fixes a situation where the telemetry would keep looping from the
connected to the reconnecting state. One of the situations this was
happening was going from "halt" to "boot"
2012-09-24 12:32:46 +01:00
PT_Dreamer
c8de27cbaf
GCS/Uploader Changes acording to review
...
Changed template comments.
Added UAVO hash to the GCS help dialog
2012-09-24 12:17:32 +01:00
PT_Dreamer
4e08fa548f
GCS/Uploader- Added leading zeros to git hash
2012-09-24 11:50:15 +01:00
Laura Sebesta
85ed1c364d
Changed UAVO browser erase icon to reset icon.
2012-09-24 10:24:37 +02:00
chris pember
616a27ca82
fixed that path error PT brought up in forum i hope
2012-09-23 22:34:40 -07:00
PT_Dreamer
dc10917f70
GCS-Yaw mixing level reverse button
...
Changed the slider values from -100/+100 to 0/100 and wrote the code for
the invert checkbox.
NOT TESTED
2012-09-23 22:50:05 +01:00
Fredrik Arvidsson
3ef26a633a
OP-39 Moved reboot page to directly after Rx config page.
...
Added partial save to support changed hardware settings.
Made it possible to skip leveling procedure.
Changed some texts.
Changed isRebootRequired() criteria.
2012-09-23 21:58:37 +02:00
Fredrik Arvidsson
5ecf04fb15
OP-39 Restricting connection device to USB when using the wizard. Changed text accordingly.
2012-09-23 14:11:32 +02:00
Dmytro Poplavskiy
dbbdb62173
Added the readymap based earth files
2012-09-23 19:30:10 +10:00
Dmytro Poplavskiy
28f028064a
Fixed the osgearth cache only configuration
...
osgEarth enables it even if OSGEARTH_CACHE_ONLY is set to false
it's necessary to unset it instead
2012-09-23 19:13:05 +10:00
PT_Dreamer
4e1081179b
GCS-Auto Tuning
...
Added code to allow module to be enabled using the checkbox
2012-09-22 23:17:06 +01:00
chris pember
de924ccf5f
just doing local commits so I can grab it in my own branch, just spacing changes and a little rearrangement
2012-09-22 11:09:08 -07:00
chris pember
2e89db5315
Merge branch 'cp/extraGUIchanges' into next
2012-09-22 10:40:09 -07:00
chris pember
7d8c662aef
added the auto tune checkbox, changed the wording on the pre-autotune page
2012-09-22 10:37:22 -07:00
Fredrik Arvidsson
6eaa2daab1
OP-39 Fixed some layout issues on the output calibration page.
2012-09-22 11:21:12 +02:00
Fredrik Arvidsson
81efc2a931
Merge branch 'next' into thread/OP-39
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
2012-09-22 10:58:55 +02:00
chris pember
8551f837b4
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-09-21 20:44:51 -07:00
David Ankers
570917f331
Remove old versions from source, however, they are still in the Artwork
...
folder.
2012-09-22 10:47:10 +10:00
Nuno Guedes
432642952c
Test Quad updated with CC3D
...
- Old Test Quad versions (OP Pro+AHRS+GPS) renamed to "old".
- New Test Quad versions updated with CC3D
2012-09-22 10:43:23 +10:00
PT_Dreamer
c3b9e7a992
GCS-UAVObject Browser
...
Changed the save and load buttons order
2012-09-21 19:03:40 +01:00
PT_Dreamer
738cc44930
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2012-09-21 18:56:21 +01:00
PT_Dreamer
8f23905a99
GCS- Input config gadget
...
Text changes only from Berkely
2012-09-21 18:40:55 +01:00
Kevin Vertucio
98db6469f9
copy/content revisions and corrections
...
Fixed some corrections missed in SetupWizard
Signed-off-by: Kevin Vertucio <kevin.vertucio@eurorscg.com>
2012-09-21 07:52:24 -04:00
chris pember
d5661bec3e
adjusted the autotune page into 2 tabbed pages
2012-09-20 22:19:40 -07:00
Kevin Vertucio
7797a99bb1
copy/content revisions and corrections.
...
More corrections in SetupWizard plugin
Signed-off-by: Kevin Vertucio <kevin.vertucio@eurorscg.com>
2012-09-20 21:34:14 -04:00
Fredrik Arvidsson
69621ba2f8
Merge branch 'next' into thread/OP-39
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
2012-09-20 23:53:33 +02:00
Fredrik Arvidsson
607497758f
OP-39 Changed to one single wizard button on the welcome page. KISS :)
2012-09-20 23:08:09 +02:00
James Cotton
aff29b5af5
GCS: Add some plugin dependencies. Thanks to Amedee for finding these.
2012-09-20 15:55:16 -05:00
James Cotton
64d8f64ea7
Matlab parser: small fix from Kenz
2012-09-20 15:28:47 -05:00
PT_Dreamer
8bd4a8c6fd
GCS - Very small UI fix on the autotuning page
2012-09-20 10:22:52 +01:00
David Ankers
7f71769c5b
Add Nuno's new models
2012-09-20 13:17:18 +10:00
David Ankers
b921e3213f
Minor tweak to make top row splitters better on smaller screens
2012-09-20 12:55:42 +10:00
Dmytro Poplavskiy
6174fa2d7f
PFD: display the side-slip indicator
2012-09-20 09:17:10 +10:00
Dmytro Poplavskiy
608297fbd3
Changed the default PFD widget to qml based one
2012-09-20 09:14:49 +10:00
Kevin Vertucio
8f8dd12615
copy revisions and corrections in SetupWizard plugin
...
Signed-off-by: Kevin Vertucio <kevin.vertucio@eurorscg.com>
2012-09-19 10:14:59 -04:00
PT_Dreamer
f8387bfaaa
GCS-Only update the aiframe config widget after all relevant objects are updated
...
This was deleted by someone with any aparent reason.
2012-09-18 14:23:35 +01:00
PT_Dreamer
0d30138571
GCS-Reduced UAVO hash bytes displayed from 20 to 8
2012-09-18 13:51:44 +01:00
Fredrik Arvidsson
d80954e13a
OP-39 Changed the layout of the welcome screen and placed the wizard buttons grouped with all other buttons.
2012-09-18 12:48:57 +02:00
Fredrik Arvidsson
57169ceeb2
OP-39 Fixed a bug when changing receiver type in wizard. The channel group type was not correctly set in manual control settings.
...
Added support in code for all known DSM types (2/X10Bit/X11Bit). Still have to add/create GUI/Icons to enable selection of specific protocol.
Renamed some enums to have better and more correct names.
2012-09-17 21:40:42 +02:00
Fredrik Arvidsson
30c1523b80
OP-39 Fixed a bug causing output rate for channel 2 and max channel rate for channel 0 to be wrong when configuring a hexacopter.
2012-09-17 20:00:26 +02:00
PT_Dreamer
fb073059ad
GCS-Use uavo definition hash to check for compatability
...
Unfortunately had to change the iap object.
2012-09-17 17:08:15 +01:00
David Ankers
633286ab73
Grammar change: accidently added and extra extra word. Drifter credit
2012-09-17 22:30:01 +10:00
David Ankers
715aa6543b
Fixed a couple of more spelling mistakes spotted by Drifter (Thanks!)
2012-09-17 22:26:21 +10:00
David Ankers
b9597e96f9
Spelling fix with input wizard, add a t to transmitter spotted by Drifter.
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
2012-09-17 22:20:33 +10:00
David Ankers
ca7ce48a4e
Spelling fix with input wizard, add a t to transmitter spotted by Drifter.
2012-09-17 22:11:51 +10:00
Fredrik Arvidsson
7363a2a266
OP-39 Unmade the mistake :)
2012-09-17 07:12:30 +02:00
David Ankers
410a9a1837
Add Steve's curve bg
2012-09-17 09:04:36 +10:00
Fredrik Arvidsson
806097fd56
OP-39 Added reboot page to wizard. User needing to reboot should NOT forget it now.
...
Added code to invoke Vehicle Setup Wizard and Radio Wizard from Welcome page.
2012-09-16 23:03:15 +02:00
Fredrik Arvidsson
098c0d43fd
OP-39 Hopefully fixed the servo calibration neutral value issue.
2012-09-16 16:21:51 +02:00
Fredrik Arvidsson
bd3d3708eb
Merge branch 'next' into thread/OP-39
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadget.h
ground/openpilotgcs/src/plugins/plugins.pro
ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.cpp
ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.h
ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.ui
ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.cpp
ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.ui
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.h
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.ui
ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.ui
ground/openpilotgcs/src/plugins/setupwizard/pages/vehiclepage.ui
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.pro
ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc
2012-09-16 15:14:47 +02:00
Dmytro Poplavskiy
6049f47296
Merge branch 'next' into dmytro/pfd_qml
2012-09-16 13:31:06 +10:00
Dmytro Poplavskiy
150314ff98
PFD qml: align elements to pixels grid
...
It improves the rendering quality,
sub pixels accuracy gives no benefits in placing PFD elements
2012-09-16 10:03:28 +10:00
PT_Dreamer
fa2aa81079
First pass on using the uavo hash to check compatability between GCS and FW
2012-09-15 23:02:45 +01:00
chris pember
80c86b0b26
omg I think I fixed the mac spacing,linux and windows tweak test
2012-09-15 12:59:16 -07:00
chris pember
556c8b4464
omg I think I fixed the mac spacing, just checking on windows build now
2012-09-15 12:27:59 -07:00
Fredrik Arvidsson
e3b5727dc1
OP-39 Fixed some layout stuff.
2012-09-15 11:06:19 +02:00
Kevin Vertucio
3236f432b9
Content revisions and updates to SetupWizard plugin
...
Corrected grammar and spelling.
Revised Wizard introduction, multirotor platform descriptions for QuadX, Quad+, Tricopter.
Signed-off-by: Kevin Vertucio <kevin.vertucio@eurorscg.com>
2012-09-14 11:32:09 -04:00
PT_Dreamer
c88c4f0fc0
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
2012-09-14 14:12:16 +01:00
Dmytro Poplavskiy
a8e6f4991b
Added "use OpenGL" option to qml based PFD
2012-09-14 08:50:02 +10:00
Fredrik Arvidsson
463c14bf84
OP-39 Removed the motor max rate calibration steps from the wizard. Hardcoded max rate to 1900 ms for now.
...
Fixed a bug with button enable/disable in the output calibration page.
2012-09-13 23:49:08 +02:00
Fredrik Arvidsson
4a09886e91
Merge branch 'next' into thread/OP-39
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.h
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
2012-09-13 22:11:37 +02:00
PT_Dreamer
9f0ad56745
GCS-Minor cleaning acording to review comments
2012-09-13 16:25:32 +01:00
James Cotton
42213b21f7
Make OSG selection a QMake config option (OSG)
...
To include this module from the command line:
make GCS_QMAKE_OPTS="CONFIG+=OSG" -j7 gcs
2012-09-13 09:46:03 -05:00
James Cotton
69688813b5
GCS Build: Include UAVTalk in SystemHealth dependencies
2012-09-13 09:28:46 -05:00
chris pember
9fbaa4410f
new quick gui fixes branch, changed input form so the checkbox for calibrate is now a button, resized that and the wizard button to not be ginormous. no new functionality added, just desing changes
2012-09-12 19:12:23 -07:00
James Cotton
36242fa70e
Delete file that shouldn't have been committed
2012-09-12 16:06:47 -05:00