Kenz Dale
9ebc32da3d
Eliminated several (dozen) compiler warnings.
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
2012-08-23 18:03:17 +02:00
Laura Sebesta
a94142ec30
Fixed several compile warning complaints.
...
Conflicts:
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/uavitem.cpp
2012-08-21 16:18:58 +01:00
PT_Dreamer
fa465c54a8
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/input.ui
2012-08-21 14:46:16 +01:00
James Cotton
4a0d43cb54
GCS: When PipX is detected do not make it the active configuration tab to prevent the dialog about dirty tabs appearing.
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
2012-08-19 21:20:18 -05:00
PT_Dreamer
2a4c54a073
Revert "Fixed several compile warning complaints."
...
These touch much more than the map lib and plugin so they should
be base on next and sent for review
This reverts commit ca4fbd5102a742132369da9f7a62e3c26423730f.
2012-08-18 20:09:04 +01:00
Laura Sebesta
ca4fbd5102
Fixed several compile warning complaints.
2012-08-18 14:18:10 +02:00
Kenz Dale
f3e1e768ad
Refactored variable names to be more helpful.
2012-08-08 20:57:41 +02:00
PT_Dreamer
4d19062059
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/boardbased_ui_limits
2012-08-03 18:14:51 +01:00
James Cotton
6948f1dc41
Merge remote-tracking branch 'origin/master' into next
...
Conflicts:
package/winx86/translations/strings_de.nsh
2012-08-03 09:35:18 -05:00
PT_Dreamer
205d370eec
GCS-Made the UI limits board specific
2012-08-02 16:34:48 +01:00
PT_Dreamer
bf6790f554
GCS-Made the changes to vehicleconfig final and reenabled the
...
system settings update call.
2012-07-27 16:12:15 -05:00
PT_Dreamer
1955e8b842
GCS-Comment out the updated statements on vehicleconfig.cpp
...
TODO check if this brings other problems. REVERT commit if it does
2012-07-27 16:12:12 -05:00
PT_Dreamer
4003cd70a8
GCS-Made rate Kd roll and pitch link when checkbox is checked.
2012-07-27 09:13:53 -05:00
David
86d6724739
Change the wording to be less harsh
2012-07-19 07:04:09 +10:00
David
707f63b884
Change the wording to be less harsh
2012-07-19 07:02:49 +10:00
Mike LaBranche
9507a79c6d
MultiRotor Config, Bugfix: include TriYaw channel in getChannelDescriptions
2012-07-16 17:01:51 -05:00
Mike LaBranche
9f67e24ee5
MultiRotor Config, Bugfix: include TriYaw channel in getChannelDescriptions
2012-07-16 17:01:39 -05:00
Oleg Semyonov
1d1915d2be
GCS Input widget: make RC inputs the default tab
2012-07-13 01:55:00 +03:00
Brian Webb
3fabdb9963
Fixed conflicted merge with origin/next.
2012-07-11 19:25:05 -07:00
Oleg Semyonov
cfb8d24941
GCS Input widget: make RC inputs the default tab
2012-07-12 01:41:24 +03:00
David
452e3d6a22
spacing
2012-07-07 21:39:21 +10:00
David
99c033bc3b
Case issue with the SVG, updated comments
2012-07-07 21:08:11 +10:00
David
ec864c71cb
Add update from dcat, fix prop directions
2012-07-07 20:46:57 +10:00
David
9ed60a2283
Lets default to MultiRotor and to a Quad X type as it is most common
2012-07-07 20:10:36 +10:00
David
4d5ddba2f9
Rename quad-shapes to multi-rotor shapes
2012-07-07 16:44:15 +10:00
James Cotton
bdfefa25f2
Fix input label width to fit properly
2012-07-04 12:02:13 +02:00
James Cotton
58abe910d0
Merge remote-tracking branch 'origin/os/extended-flightmode-switch' into next
2012-07-04 11:52:38 +02:00
Oleg Semyonov
954cd9febc
FlightMode GUI: remove ugly right slider
2012-07-04 07:46:38 +03:00
Oleg Semyonov
dd398e9bd5
FlightMode GUI: update right slider on settings change
2012-07-04 00:13:20 +03:00
Oleg Semyonov
4a75e226eb
FlightMode GUI: attempt to fix label overlap on linux and OSX
2012-07-04 00:06:55 +03:00
Oleg Semyonov
12106c5549
FlightMode GUI: replace numeric value by slider
2012-07-03 17:20:10 +03:00
Oleg Semyonov
3cd293a5e6
Cosmetic FlightMode GUI fix (OPReview-228)
2012-07-03 11:04:18 +03:00
Mike LaBranche
604a8e06cd
Enhancement: change mixercurve points from pass by value to pass by const ref;
2012-06-28 15:56:40 -07:00
Mike LaBranche
5b64393f7f
ConfigVehicle, all airframes: change return from throwConfigError to bool;
...
eliminates channel checking redundancy. Smart ptr new VehicleConfig()'s.
2012-06-27 21:32:32 -07:00
zedamota
ee81296872
Merge remote-tracking branch 'remotes/origin/next' into MapEnhancements
2012-06-28 00:00:15 +01:00
Mike LaBranche
3a8429d89b
Merge branch 'next' of ssh://gitolite@git.openpilot.org/OpenPilot.git into MikeL_ConfigVehicle
2012-06-26 16:43:06 -07:00
Mike LaBranche
94ba42a3a9
MultirotorConfig, Bugfix: no default mixer values set for Tricopter;
...
setting defaults now to roll(100), pitch(100), yaw(50)
2012-06-26 16:34:36 -07:00
Oleg Semyonov
727e67d7fd
Even more optimize FlightMode switch position calculation
...
This runs in a high frequency loop and should use as little of
floating point as possible. Thanks to Kenn for the idea.
2012-06-25 11:41:42 +03:00
Oleg Semyonov
2c896c9e91
Do not care about FlightMode channel if only one flight mode configured
2012-06-25 01:52:06 +03:00
Oleg Semyonov
02fa6fde09
Optimize FlightMode switch position calculation
2012-06-25 00:30:42 +03:00
Mike LaBranche
fc5d0a0175
ConfigVehicleType, bugfix: set/get feedforward settings;
...
refactor set/getMixerValue into vehicleConfig;
2012-06-24 11:11:53 -07:00
Brian Webb
43786c914d
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-06-23 15:01:53 -07:00
David
d43afddd14
Another Update from Chris
2012-06-24 06:54:24 +10:00
Oleg Semyonov
cd6387d0a6
Add support for more than 3-pos FlightMode switches
...
It is now possible to have 1 to 6 flight mode switch positions
(usefull for guidance, position hold and similar use).
The input channel range is divided into N (1 to 6) zones and each
zone represents a flight mode. Default is 3 zones (backward compatible),
but more can be chosen.
How to use: configure Tx mixers in a way they provide required number
of different values for the same FlightMode channel. For instance,
using Turnigy 9X radio with ER9X firmware, one can create a mixer like
this:
-100 MAX ID0 Manual
R -50 MAX ID1 Stabilized1 (Rate)
R 0 MAX ID2 Stabilized2 (Attitude)
R 50 MAX RUD PositionHold
R 100 MAX ELE ReturnToBase
And set number of flight mode positions to 5. As a result, the 3-pos
switch (ID0, ID1, ID2) will provide first three flight modes, the rudder
D/R switch will override those and enable the 4th flight mode, and
elevator D/R switch will have highest precedence and activate the 5th
flight mode.
This will change the ManualControlSettings objectID.
2012-06-23 22:10:19 +03:00
David
a242c2f383
From Gunnah, remove the odd letters from the QC artwork
2012-06-23 18:09:51 +10:00
Mike LaBranche
9b25f68898
MixerCurveWidget: bugfix- don't delete edges in initNodes, just remove from scene;
...
simplify and remove unused objects in configccpm; respect min/max in initLinearCurve.
2012-06-22 17:01:33 -07:00
Brian Webb
04f49498b2
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-06-20 18:34:56 -07:00
Mike LaBranche
5edd952ed6
VehicleConfig/mixer bugfix: keep the ui in synch when 'Save'ing from uavbrowser;
...
spruce up vehicleconfig with a couple more helpers;
2012-06-20 12:46:07 -07:00
Mike LaBranche
fe2aed328e
bugfix: configccpmwidget, updatethrottlecurvevalue using wrong table index
2012-06-19 10:27:08 -07:00
PT_Dreamer
e71ab57ffa
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/MapEnhancements
...
Conflicts:
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-06-17 23:56:27 +01:00