Fredrik Arvidsson
ee9912c45d
OP-642 Added code to create category items in tree. Changed some support methods to handle the the now arbitrary depth of the uavo tree. Removed several hard coded functions depending on tree only being two levels deep.
...
Changed implementation to use maps instead of lists to find tree items and meta items. This is probably much better performance wise, and the code gets much cleaner.
Changed the background highlight code to highlight all tree nodes that aren't TopTreeItem:s to enable category items to be highlighted.
Cleaned up some code.
2012-06-30 16:45:08 +02:00
Corvus Corax
bf0bea49da
Merge remote branch 'baseorigin/kenz/math_scope' into basenext
2012-06-29 11:22:38 +02:00
Corvus Corax
d2606e64e4
bitfields: bugfix for bugfix: forgot one line
2012-06-29 09:48:35 +02:00
Corvus Corax
8e790642a0
GCS Bitfield: size bugfix
2012-06-29 09:48:20 +02:00
Corvus Corax
2540ee53dc
Merge commit '80f53b185c67d475ead43df97c4a62bcc36d7d90' into gcsbitfields
2012-06-29 09:45:44 +02:00
PT_Dreamer
8bc83d49a5
GCS/OPMap-Make the overlays opacity user selectable and persistent.
2012-06-29 01:20:38 +01:00
Mike LaBranche
1e985f3aed
MixerCurve: start branch with integrated mixer curve widget featuring all heli coolness for every curve.
2012-06-28 16:01:27 -07: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
David Willis
3125f4089d
Add remaing alarm descriptions
2012-06-28 22:37:34 +01:00
PT_Dreamer
70bdbf49c3
GCS/OPMap- Fixes bad coordinate calculation on home drag.
2012-06-28 20:17:16 +01:00
James Cotton
cd311642dd
Merge branch 'next' into revo
2012-06-28 10:35:47 +02: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
zedamota
5eff06bdc1
GCS/OPMap-Fixes compilation under windows...again...
2012-06-27 23:54:41 +01:00
David Willis
7da39b23de
Update alarm text. Add attitude critical and error descriptions
2012-06-27 23:33:40 +01:00
PT_Dreamer
b467a3e81e
GCS/OPMap-Fixes compile under windows.
2012-06-27 15:06:53 +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
PT_Dreamer
6a85da9b46
GCS/OPMap-Fixes relative altitude refresh issue.
2012-06-27 00:25:40 +01:00
David Willis
bac7d171b0
Tweaked actuator critical text. Added r/c input critical and warning text
2012-06-26 23:17:19 +01:00
David Willis
14708a2e45
Updated to use html file as source of popup text. Updated to latest system health svg file. Support popup for actuator critical.
2012-06-26 22:14:56 +01:00
PT_Dreamer
96a8ff3a34
GCS/OPMap-Added relative altitude info to waypoint tooltip.
2012-06-26 20:47:14 +01:00
PT_Dreamer
2074889c9d
GCS/OPMap-Clean commented out code. Delete some qDebugs
2012-06-26 20:22:55 +01:00
Fredrik Arvidsson
88a9b4cf89
Merge branch 'next' into thread/OP-642
2012-06-26 21:13:40 +02:00
PT_Dreamer
89d7f0adfd
GCS/OPmap-Changed slot names to get rid of the automatic signal conection failure warning.
2012-06-25 21:11:07 +01:00
PT_Dreamer
2e97f1ac6a
GCS/OPmap-Changed slot names to get rid of the automatic signal
...
conection failure warning.
2012-06-25 21:10:40 +01:00
PT_Dreamer
ecbf02fd33
GCS/OPMap-Added missing header information. Did some cleaning
2012-06-25 19:41:59 +01: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
PT_Dreamer
55af80ffaf
GCS/OPMap- handles home icon doubleclick.
...
Visual changes to the waypoint editor.
2012-06-24 20:05:27 +01:00
PT_Dreamer
b84af5c338
GCS/OPMap-Model/UAVO proxy class.
...
Handles the convertion between flight plan data from the model
to/from UAVObjects.
2012-06-24 20:04:13 +01:00
PT_Dreamer
2b85f1a9fd
GCS/OPMap- Bugfixes to the model/map proxy.
...
Dynamic overlay creation based on the path plan actions.
2012-06-24 20:02:45 +01:00
PT_Dreamer
ff48babb46
GCS/OPMap- Small visual changes to the pathplanner editor.
...
Add buttons to synchronize planner data with UAVObjects.
2012-06-24 20:00:35 +01:00
PT_Dreamer
3466420a32
GCS - OPMap - small changes to the home editor.
2012-06-24 19:58:09 +01:00
PT_Dreamer
e34fc5be71
GCS - OPMap - allow different colors for overlays.
...
This is so we can use a different color for each kind
of route ex:error destination, jump destination, next destination
2012-06-24 19:57:02 +01:00
PT_Dreamer
2b9ad9dcb9
GCS - OPMap - Handle magic waypoint as special case with
...
different picture. This is not used now but can be needed in
the future
2012-06-24 19:55:23 +01:00
Mike LaBranche
fc5d0a0175
ConfigVehicleType, bugfix: set/get feedforward settings;
...
refactor set/getMixerValue into vehicleConfig;
2012-06-24 11:11:53 -07:00
David Willis
f492ea8527
First pass at popup info for alarms in system health widget
2012-06-24 01:22:43 +01: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
f6f98aa091
MixerCurveWidget refine setCurve logic
2012-06-22 17:31:14 -07: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
Mike LaBranche
7eb0105886
MixerCurveWidget: enhance node value handling; draw node mixer value inside node;
2012-06-21 11:53:51 -07:00
Stacey Sheldon
f475088585
Merge remote-tracking branch 'op-public/next' into revo-next
2012-06-20 22:45:41 -04:00
Stacey Sheldon
5c7295549e
gcs: fix incorrect file case on include path
...
This breaks the Linux build. Introduced in d03282d.
2012-06-20 22:07:14 -04:00
Brian Webb
04f49498b2
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-06-20 18:34:56 -07:00
Brian Webb
7bd32253e5
Removed debug from GCS telemetry.
2012-06-20 18:34:16 -07:00
