chris pember
086232406d
Merge branch 'kenz/extraGUIchanges' of ssh://git.openpilot.org/OpenPilot into cp/extraGUIchanges
2012-09-24 20:26:04 -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
Laura Sebesta
c3a402e52f
Add support for coaxial helicopter.
...
Untested.
2012-09-24 19:17:38 +02:00
PT_Dreamer
c04318493a
GCS- Fixes compile error
2012-09-24 13:38:14 +01: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
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
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
PT_Dreamer
8f23905a99
GCS- Input config gadget
...
Text changes only from Berkely
2012-09-21 18:40:55 +01:00
chris pember
d5661bec3e
adjusted the autotune page into 2 tabbed pages
2012-09-20 22:19:40 -07: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
PT_Dreamer
8bd4a8c6fd
GCS - Very small UI fix on the autotuning page
2012-09-20 10:22:52 +01: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
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
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
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
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
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
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
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
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
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
PT_Dreamer
c11958c9b6
GCS-Review comments changes
...
Added font mixer curve font size to linux default and wide stylesheets
Change Node class name to MixerNode to ease stylesheet access
Changed language selection to top of the list
2012-09-12 11:09:30 +01:00
James Cotton
223a3473c2
Merge branch 'next' into revo-mini
2012-09-12 02:03:39 -05:00
James Cotton
f9fd2bd1af
Merge branch 'pidt1' into next
2012-09-11 23:39:50 -05:00
James Cotton
509e7a2ec1
Merge remote-tracking branch 'origin/hyper/gcs-levelling-fixes' into next
2012-09-11 03:05:47 -05:00
James Cotton
38e9d105aa
Merge branch 'pidt1' into test2
...
Conflicts:
flight/Modules/ManualControl/inc/manualcontrol.h
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-09-10 14:37:52 -05:00
James Cotton
386a9d41ef
Merge branch 'next' into test2
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m
2012-09-10 14:29:26 -05:00
Richard Flay (Hyper)
5b7fb6bcef
Minor improvement to GCS bias calibration logic, plus minor UI behaviour tweak
2012-09-10 22:22:36 +09:30
Fredrik Arvidsson
b889035a24
Merge branch 'next' into thread/OP-39
2012-09-09 23:46:39 +02:00
PT_Dreamer
78a4241ba2
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
2012-09-09 13:04:29 +01:00
PT_Dreamer
ba575edbbc
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
...
OPReview 248
2012-09-09 12:30:09 +01:00
chris pember
6a94cd49b5
reworked ALL the ui pages in windows so they work there, so pushing this for now, it just needs love in osx
2012-09-08 18:35:14 -07:00
Richard Flay (Hyper)
c5745b0817
Fixes/tweaks to GCS levelling code. Fixed a deadlock and take more samples
2012-09-08 15:58:39 +09:30
PT_Dreamer
6325263a1d
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
2012-09-06 12:41:08 +01:00
James Cotton
2f65fc1e8e
Merge branch 'next' into relay_tuning
...
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-09-04 10:43:04 -05:00
Fredrik Arvidsson
b150375ff5
Merge branch 'next' into thread/OP-39
2012-09-03 01:05:47 +02:00
James Cotton
6bfb2a5e45
Merge branch 'next' into revo
...
Conflicts:
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapripper.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.h
ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
ground/openpilotgcs/src/libs/utils/coordinateconversions.h
ground/openpilotgcs/src/plugins/opmap/opmap.pro
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
shared/uavobjectdefinition/taskinfo.xml
shared/uavobjectdefinition/waypoint.xml
2012-09-01 16:18:03 -05:00
chris pember
26b682122b
fixed the text on the mixer, need mike or someone to hook up the reverse button for the yaw mixer, as well as change the range on the slider
2012-09-01 11:11:44 -07:00
chris pember
77ea0277d0
made some more adjustments to the stylesheet for osx, sliders in particular
2012-09-01 01:20:51 -07:00
chris pember
704cad9313
fixed up the feed forward tab, as well as renamed advanced to feed forward on the tab
2012-08-31 21:55:10 -07:00
