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
Stacey Sheldon
14123069be
gdb: add gdb config file for CC BU image
2012-09-16 21:13:42 -04:00
David Ankers
410a9a1837
Add Steve's curve bg
2012-09-17 09:04:36 +10:00
Fredrik Arvidsson
ccf070a897
Merge branch 'next' into thread/OP-39
2012-09-16 23:04:54 +02: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
Stacey Sheldon
368d57bc92
Merge remote-tracking branch 'origin/lilvinz/OP-300' into next
2012-09-16 16:05:25 -04:00
Stacey Sheldon
3e236bd3e6
makefile: change QT SDK install dir so we can support multiple installs
...
QT SDK version was changed but the install dir wasn't changed
to match. This makes it impossible to keep both versions
installed at the same time which is essential in order to work
on/build old and new branches.
This update gives the new SDK version a unique install dir so
it can coexist with older versions.
2012-09-16 16:01:24 -04:00
lilvinz
a6a7ed8157
pios_exti: added returnvalues to exti handlers which allows to use portEND_SWITCHING_ISR
2012-09-16 21:44:09 +02:00
Stacey Sheldon
05483e2a74
simposix: adapt simposix to addition of relay tuning
2012-09-16 15:40:47 -04:00
lilvinz
524cff1c40
pios_mpu6000: fixed masked locals mistake
2012-09-16 21:25:06 +02:00
lilvinz
718062ed6e
pios_led: added support for active_high connected leds
2012-09-16 18:19:27 +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
PT_Dreamer
6d7fa8a083
Flight-Added sha1 uavo directory calculation to fw_version_info struct.
2012-09-14 23:31:13 +01: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