1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Commit Graph

7776 Commits

Author SHA1 Message Date
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
James Cotton
497683e571 Fix OSX simulator 2012-09-18 13:29:11 -05: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
6f9f737c35 gcs uavo: remove obsolete UAVOs from project for GCS 2012-09-16 21:42:05 -05:00
Stacey Sheldon
14123069be gdb: add gdb config file for CC BU image 2012-09-16 21:13:42 -04:00
Stacey Sheldon
566f9d760e simposix: fix suplicate .c files in previous merge 2012-09-16 19:34:47 -04:00
David Ankers
410a9a1837 Add Steve's curve bg 2012-09-17 09:04:36 +10:00
Stacey Sheldon
ffe88eec5e Merge remote-tracking branch 'op-public/next' into revo-next 2012-09-16 17:14:20 -04: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
Stacey Sheldon
754f58c33a Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
	flight/Modules/ManualControl/inc/manualcontrol.h
	flight/Revolution/Makefile.osx
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/taskinfo.xml
2012-09-16 09:56:35 -04: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
Stacey Sheldon
c5fda86e96 Merge branch 'next-merge' into revo-next 2012-09-15 21:47:32 -04: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
Stacey Sheldon
9a5ba841cf Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/pathaction.xml
	shared/uavobjectdefinition/waypointactive.xml
2012-09-15 19:55:47 -04: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
James Cotton
51683ffb65 Merge branch 'next' into revo
Conflicts:
	ground/openpilotgcs/src/plugins/config/input.ui
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/plugins.pro
2012-09-15 16:31:30 -05:00