rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-10 18:24:11 +01:00
Code Issues Releases Activity
6,827 Commits 5 Branches 8 Tags 266 MiB
0f4a0526ac
Commit Graph

2981 Commits

Author SHA1 Message Date
Fredrik Arvidsson
d83bff100b Merge branch 'next' into thread/OP-642 2012-07-01 12:25:23 +02:00
Fredrik Arvidsson
069b5dda44 OP-642 Added a checkbox in the UAVOBrowser widget to select if the objects should be shown in a categorized manner or not. 
It is now possible to switch between categorized and 'classic' view.
 2012-07-01 09:58:55 +02:00
Stacey Sheldon
d9dca0b553 Merge branch 'wireshark-plugins' into next 2012-06-30 22:42:38 -04:00
Brian Webb
3405bc3ebe Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-30 10:06:51 -07:00
Fredrik Arvidsson
32abd2e32f Merge branch 'next' into thread/OP-642 2012-06-30 16:51:19 +02:00
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
2dcc28cea3 uavobjectgenerator: for consistency with flight and gcs code, change order of update modes. This is a cosmetic change, it does ot change the generated code since update modes are always identified by string, not numerically. 2012-06-29 10:33:33 +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
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
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
Brian Webb
3da382e828 Merge remote-tracking branch 'origin/next' into brian/multi-trans-telem 2012-06-20 17:43:17 -07:00
Fredrik Arvidsson
b73cde1787 OP-642 Changed from using an xml element for category to have it defined 
as an attribute on the uav object definition. This attribute is
optional. If absent no category (empty string) is assigned to the uav
object type.
Added category attribute to a small selection of uavo definition files
to test parsing.
 2012-06-20 22:23:06 +02: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
Fredrik Arvidsson
3c754af484 OP-642 Added <category> element which is a string in uavo object type definition to be used in uavo browser to categorise uavo:s visually into subtrees. Category value is assigned in generated code and accessible via getter method. OP-644 Fixed option for uavo browser to enable disable hilights for objects which values wasn't really changed to indicate stream activity in uavo object tree. 2012-06-20 21:26:18 +02:00
PT_Dreamer
7425547b33 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-06-20 16:16:29 +01:00
PT_Dreamer
5216835e18 GCS - OPMap - test functions 2012-06-20 15:02:57 +01:00
PT_Dreamer
09a67af3e1 GCS - MapLib - added home item editor 2012-06-20 15:01:03 +01:00
PT_Dreamer
b8b46e90a3 GCS - OPMapLib - data model cleaning 2012-06-20 15:00:15 +01:00
PT_Dreamer
1299bbda93 GCS -OPMapLib - add relative altitude to waypoints 2012-06-20 14:59:23 +01:00
PT_Dreamer
3cf4676aef GCS - OPMap - create doubleclick signal on the home item 2012-06-20 14:58:33 +01:00
James Cotton
621c78e5cb Merge remote-tracking branch 'origin/MikeL_ConfigVehicle' into next 2012-06-20 09:35:18 +02:00
James Cotton
28c5a038d1 Merge remote-tracking branch 'origin/amorale/fix_osx_multiple_usb_serial' into next 2012-06-20 09:02:33 +02:00
Mike LaBranche
02cdc6feff MixerCurveWidget: make Node smarter by storing a value whenever pos changes; 
getCurve now reports back the list of node->getValue()
 2012-06-19 16:51:22 -07:00
Mike LaBranche
9da2ffff2f MixerCurveWidget: incorporate m_thread's delete leak fix, combined node+edge init 2012-06-19 15:22:11 -07:00
Mike LaBranche
04ea5f24fa MixerCurveWidget: first pass refactoring for performance; bugfix for negative values 2012-06-19 10:28:42 -07:00
Mike LaBranche
fe2aed328e bugfix: configccpmwidget, updatethrottlecurvevalue using wrong table index 2012-06-19 10:27:08 -07:00
Brian Webb
c05b41aca6 Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-19 06:16:30 -07:00
Stacey Sheldon
4c47a36bda uavobjgenerator: Add generator for wireshark UAVO plugin 
Using 'make uavobjects_wireshark' now generates a complete
wireshark dissector that can decode all fields of the available
UAVObjects.
 2012-06-19 00:21:35 -04:00
PT_Dreamer
88a089804b GCS - added uavo per instance "new instance" signal. 2012-06-18 00:16:23 +01: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
PT_Dreamer
35cf2fe374 GCS/OPMap - pathplanner - added modelUavoProxy class. 2012-06-17 20:09:21 +01:00
PT_Dreamer
5d07b67922 GCS/OPMap - pathplanner - graphical stuff and GUI done. UAVO interfacing left. 2012-06-17 19:24:02 +01:00
Fredrik Arvidsson
c8b4abc71f Added comments to the code. 2012-06-17 12:46:45 +02:00
Fredrik Arvidsson
0e4ffa7f6d Merge branch 'next' into thread/uavobrowser_perf 2012-06-17 09:21:22 +02:00
Mike LaBranche
4650d4909d Add virtual keyword ConfigTaskWidget:: dtor; assures correct child deletion 2012-06-16 13:39:58 -07:00
Mike LaBranche
4807eb730f Compiler Warning kill: rearrange ctor member init order in ConfigInputWidget 2012-06-16 13:38:05 -07:00
Oleg Semyonov
4120eb300c HITLv2: fix shared object name captitalization 2012-06-16 20:13:41 +03:00
Fredrik Arvidsson
d03282d9b0 Changed the way change hilight of three cells works to bring down the 
number of QTimer instances and the number of redraws to hopefully
increase performance.
Changed so that when a child gets hilighted it will hilight its parent.
 2012-06-16 17:38:05 +02:00
Brian Webb
0bf27de28d Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-16 08:28:03 -07:00
James Cotton
574cc13052 Add other states for bootfault such as Ok. 2012-06-15 23:20:09 -05:00
James Cotton
aea60198e8 Remove uSD from graphics now it's removed from alarms 2012-06-15 20:05:59 -05:00
James Cotton
62a60392e0 Fix system health to show sensors again 2012-06-15 20:03:55 -05:00
James Cotton
f8d196ffe8 Added support for board voltage monitor to battery module. 
The module can be configured to enable what's needed from board voltage, battery voltage and battery current measurement.
In GCS the POWER box in system healt will show alarm related to the supply voltage to the board.
If a power warning/critical alarm is raised, the warning condition is left even if the board voltage return to an acceptable value.

Conflicts:

	ground/openpilotgcs/share/openpilotgcs/diagrams/default/system-health.svg
	shared/uavobjectdefinition/systemalarms.xml
 2012-06-15 19:43:34 -05:00
James Cotton
416618a26f Show the altitude on the map 2012-06-15 16:01:15 -05:00
James Cotton
495bb280c7 Suppress long standing error message from telemetry we've had for ages. It 
probably should be fixed properly though.
 2012-06-15 15:51:40 -05:00
James Cotton
be360d3c21 Fix waypoint visualization in OPMap to work for multiple maps 2012-06-15 15:51:12 -05:00
James Cotton
5b2f4d6d91 Remove an outdated connect in waypointeditor 2012-06-15 14:56:55 -05:00
James Cotton
62436270e3 When moving waypoints on the map, keep the previous altitude 2012-06-15 13:15:45 -05:00
James Cotton
1ac807e1e0 Fix small bugt in the revo calibration 2012-06-15 13:15:21 -05:00
James Cotton
07f8922f2f Merge remote-tracking branch 'origin/MikeL_ConfigVehicle' into revo 2012-06-14 19:18:23 -05:00
Mike LaBranche
c1689b2205 VehicleConfig: add set/getThrottleCurve, enhance configwidgets to consume; 
add resetMixerVector call in multirotor; ConfigVehicleType now VehicleConfig aware
 2012-06-14 15:40:17 -07:00
PT_Dreamer
82b7f9f08d GCS/OPmap lib - changed the flight planner to a model view aproach 2012-06-14 23:06:37 +01:00
James Cotton
97483bddad Fix some indentation in the mag calibration code and no need to clear the gyro 
accumulator.
 2012-06-14 10:07:45 -05:00
James Cotton
f1aad76f71 Reorder functions for six point calibration to make more sense (the order they 
are run) and add some comments
 2012-06-14 10:06:39 -05:00
James Cotton
a91c21f53f Don't restore the accel metadata after six point calibration unless it was 
actually saved and changed
 2012-06-14 09:57:46 -05:00
Brian Webb
6c8d8aeafb Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-14 06:55:52 -07:00
James Cotton
4f37be785e Merge branch 'next' into revo 2012-06-14 01:02:03 -05:00
James Cotton
70606a46a1 Include initial gyro bias calibration into the level calibration of revo like 
it is with CC.
 2012-06-13 23:07:23 -05:00
James Cotton
03705771dd Get the sensor noise measurement working again, but through GCS now 2012-06-13 22:11:00 -05:00
James Cotton
ce487c9b0a Fix the bias calculation for revo accels 2012-06-13 21:15:46 -05:00
James Cotton
293a2ee573 Rename some of the revo calibration methods 2012-06-13 18:14:20 -05:00
James Cotton
f07e1fc4e1 Separately store initial meta data for accel and mag 2012-06-13 18:09:10 -05:00
Mike LaBranche
a7ae258bc8 Bugfix, oops: missed a couple resetMixerVector opportunities. 2012-06-13 15:14:18 -07:00
Mike LaBranche
8de40c7847 BugFix: ConfigFixedWing reset the mixer vectors to zero prior to writing anew. 2012-06-13 15:09:54 -07:00
Mike LaBranche
8283d4280e UAVTalk, change private member QIODevice* io to smart pointer QPointer<QIODevice> 2012-06-13 14:57:43 -07:00
James Cotton
fc6f0f5d4d Actually disable the 6 point calibration define 2012-06-13 14:52:34 -05:00
James Cotton
28b967689f Remove some debugging output from configTaskWidget. In the case of the sensor 
calibration which doesn't have any fields associated this caused a null pointer
crash and wasn't useful anyway.
 2012-06-13 13:22:39 -05:00
James Cotton
d94ab30616 Make sure we don't use null pointers when refreshing the revo sensor bar graphs 2012-06-13 13:19:17 -05:00
James Cotton
7f15e87890 Make revo calibration UI use teh configtaskwidget system 2012-06-13 13:12:46 -05:00
James Cotton
7c8700b4e5 Suppress a warning and fix indentation in configgadgetwidget 2012-06-13 13:01:41 -05:00
James Cotton
49b51163bc Rename method and UI in revo calibration to fit new uavos and stop referring to 
things as AHRS
 2012-06-13 12:41:21 -05:00
James Cotton
8ded4618ef Only perform six point calibration on the mag. This code is #ifdef'd out 
because we might still want the option or need it for factory calibration.  I
usually find the accel scale is reproducibly at 0.98.
 2012-06-13 12:28:59 -05:00
James Cotton
c9e99295ed Merge branch 'next' into revo 2012-06-13 00:46:19 -05:00
Laura Sebesta
9409ea53da Minor GUI settings upgrades, to fit small screens better. 2012-06-13 08:40:29 +03:00
James Cotton
295fa4a8f3 Fix bug where the aircraft gadget initially shows the quad tab but the selector 
says plane.
 2012-06-12 23:12:53 -05:00
James Cotton
9218145aa9 Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo 2012-06-12 22:53:30 -05:00
Brian Webb
c06412f83b Removed some qDebug from PipX configuration widget. 2012-06-12 20:00:58 -07:00
Brian Webb
aa8ba898fc Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-12 19:49:03 -07:00
Brian Webb
69a38ddd77 PipX configuration screen improvements. 2012-06-12 19:48:31 -07:00
James Cotton
1fad5c9fc2 Fix the stabilization expert UI so the label is in the right place 2012-06-12 01:52:32 -05:00
James Cotton
bfdda0e645 Fix the stabilization expert UI so the label is in the right place 2012-06-12 01:51:57 -05:00
Brian Webb
ce9d96e1b1 Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-06-11 21:30:31 -07:00
Brian Webb
9c1549e6a2 Change return type from Telemetry::transactionTimeout back to void. 2012-06-11 21:24:56 -07:00
Brian Webb
952c6d9f32 Added support for multiple transactions to GCS telemetry. 2012-06-11 21:06:50 -07:00
James Cotton
9870abcd2f Fix some slots in config revo calibration 2012-06-11 14:42:08 -05:00
James Cotton
8b9c7277a6 Remove the connection to refreshWidgetValues() in output widget. Mike was 
right and it's not needed since hte configTaskWidget takes care of this
connection.
 2012-06-11 13:24:37 -05:00
James Cotton
dba47a7d41 Remove the connection to refreshWidgetValues() in output widget. Mike was 
right and it's not needed since hte configTaskWidget takes care of this
connection.
 2012-06-11 13:22:37 -05:00
James Cotton
a029fc4656 Merge branch 'next' into revo 
Conflicts:
	Makefile
 2012-06-11 12:05:38 -05:00
James Cotton
93b77becc0 More the system task priority down and increase the timeout for erasing the 
flash so it says completed.  However, it still blocks the system for a long
time.  During an erase the heartbeat will flash at 10 Hz to indicate what's
happening.

This still blocks telemetry even after lowering hte system priority (and there
is a vTaskDelay) which makes me think that the SPI bus being locked is blocking
Sensors or somethign else.  This should not be permited when the system is
armed.

The reason the system locks up during the erase is that the file system
operations occur within the event dispatcher thread.  It is very bad practice
for anything to block this (i.e. callbacks should never take very long).  We
should probably move the object persistence handling into the system thread or
something but that can be a separate issue.
 2012-06-11 12:03:32 -05:00
James Cotton
6f09b6d087 Fix misnamed slot in the output widget 2012-06-11 11:31:28 -05:00
James Cotton
c5a881086a Fix some slots in config revo calibration 2012-06-11 11:30:16 -05:00
James Cotton
ec64a50ef9 Fix the slot name in map gadget 2012-06-11 11:27:08 -05:00
James Cotton
6d06daa7cd Fix misnamed slot in the output widget 2012-06-11 11:21:08 -05:00
Brian Webb
71287e4cb4 Fixed setting of the PairID on PipX GCS and added selection for broadcast mode. 2012-06-09 10:54:24 -07:00
James Cotton
2db95a6b4f Move the Sensors label position to teh correct spot 2012-06-09 12:19:08 -05:00
James Cotton
207cc93af0 Update the system health diagram to include warnings from the sensors module 
and no longer show ahrs
 2012-06-09 12:11:45 -05:00
James Cotton
3af9ea9174 In OSG load an airframe model that matches the system settings. This needs to 
come from a resource file though.
 2012-06-08 13:01:50 -05:00
James Cotton
823538dbbb Forgot the fixed wing follower status 2012-06-08 10:46:40 -05:00
James Cotton
4c3ca17e34 Backport the fixed wing path follower 2012-06-08 10:46:39 -05:00
James Cotton
574ab3fcaa Make the VtolPathFollower an optional module 
Note that RTH mode right now checks that throttle control is enabled, but this
should only occur if the system is a VTOL.
 2012-06-08 10:46:38 -05:00
James Cotton
d54970a58a Fix from merging the UAV Trail option 2012-06-08 10:45:13 -05:00
James Cotton
f5b2575c88 Merge branch 'next' into revo 
Conflicts:
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/Revolution/System/inc/pios_config.h
	package/Makefile
 2012-06-07 12:45:06 -05:00
James Cotton
7b8110a457 Merge branch 'MikeL' into next 2012-06-07 11:31:41 -05:00
James Cotton
9b7a8dc15f Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next 2012-06-07 11:27:51 -05:00
James Cotton
51a6370733 Separate GPS/UAV trails and context menu settings 
Conflicts:

	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
 2012-06-07 09:51:11 -05:00
James Cotton
c689bcfb80 Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into revo 2012-06-07 09:49:18 -05:00
James Cotton
1e041e5788 Merge remote-tracking branch 'origin/next' into revo 2012-06-07 09:49:09 -05:00
Oleg Semyonov
95f66ddd76 AeroSimRC: add default simulatorId to prevent GCS crashes w/o config 
GCS will crash when HITLv2 plugin is started if there is no
HITLv2 configuration in the OpenPilotGCS.xml. This is a workaround
to prevent this behavior. Better way might be to rework the GCS config
handling, but as a workaround this should work.
 2012-06-07 12:52:08 +03:00
PT_Dreamer
5da9efd673 GCS/MapLib - Several fixes, changes and enhancements. 2012-06-06 20:52:00 +01:00
James Cotton
aa5832b1e8 Remove some style sheets that got dragged back in from conflict 2012-06-06 13:01:15 -05:00
James Cotton
5e01617cbd Merge branch 'next' into MikeL 
Conflicts:
	ground/openpilotgcs/src/plugins/config/airframe.ui
	ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
	ground/openpilotgcs/src/plugins/config/configoutputwidget.h
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.h
 2012-06-06 11:58:06 -05:00
Mike LaBranche
01820904a2 Merge conflict resolution: alter configvehicle,configoutput refreshWidgetsValues 
signatures to conform to virtual in ConfigTaskWidget;
add multirotor mixer sliders to apply/save dirty monitor, fix slider signals;
 2012-06-06 08:58:18 -07:00
Brian Webb
6f9c6ae86d Only show PipX config gadget when the PipX is connected. 2012-06-05 19:34:42 -07:00
James Cotton
983153d87b Waypoint importing now works 2012-06-05 18:06:43 -05:00
James Cotton
4550eafa02 Add the ability to export waypoints to an xml file 2012-06-05 17:38:01 -05:00
James Cotton
b4d59d3e3e Dragging and dropping waypoints now works and updates the FC immediately. 2012-06-05 10:01:12 -05:00
James Cotton
302575714f Filter updates from the UAVOs if the waypoints haven't changed since they are 
set to periodic (and need to be right now until FC telemetry is fixed and sends
new instances).
 2012-06-05 08:30:42 -05:00
James Cotton
ff36e880e9 Fix for pathcompiler and waypoint table regarding signals and new instances 2012-06-05 08:10:20 -05:00
Brian Webb
4e68f6543e Added tracking of dropped packets to PipX and turned off visible text on signal strength meters. 2012-06-04 21:18:13 -07:00
Brian Webb
7abf32e4c2 Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2-gui-upgrades 2012-06-04 18:24:20 -07:00
Mike LaBranche
682ab20f94 add accels.h, gyros.h zapped during conflict resolution 2012-06-04 17:13:55 -07:00
Mike LaBranche
0ba8345c51 Merge branch 'next' into MikeL 
Conflicts:
	flight/Bootloaders/Revolution/inc/pios_config.h
	flight/Modules/OveroSync/inc/overosync.h
	flight/Modules/Sensors/inc/sensors.h
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/STM32F4xx/pios_iap.c
	flight/Revolution/System/inc/pios_config.h
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
 2012-06-04 16:59:31 -07:00
Mike LaBranche
bf591ebe45 Merge branch 'next' into MikeL 
Conflicts:
	flight/Bootloaders/Revolution/inc/pios_config.h
	flight/Modules/OveroSync/inc/overosync.h
	flight/Modules/Sensors/inc/sensors.h
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/STM32F4xx/pios_iap.c
	flight/Revolution/System/inc/pios_config.h
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
 2012-06-04 15:38:57 -07:00
James Cotton
0b828fbdd0 Merge branch 'next' into revo 
Conflicts:
	Makefile
 2012-06-04 14:12:19 -05:00
James Cotton
ff0a3a156e Merge remote-tracking branch 'origin/os/AeroSimRC' into next 2012-06-04 12:25:59 -05:00
James Cotton
71e14a691e Merge branch 'next' into revo 2012-06-03 19:00:51 -05:00
Sambas
eb4f90f188 Check if Homelocation is set before calibration 2012-06-03 18:25:22 -05:00
Sambas
2ec8423334 Mag calibration, does this make any sense? 2012-06-03 18:25:22 -05:00
James Cotton
4d75718347 While change the util manager make a few other methods use static accessors. 2012-06-03 18:16:21 -05:00
James Cotton
2d80d59e93 Make the uavobjectutilmanager handle the error condition on saving and not 
segfault when a save fails.
 2012-06-03 17:41:51 -05:00
a*morale
37e5e0d2a2 Fixes a problem in OSX that prevent to use two serial ports with the same displayed name (for example from USB multiple serial adapter) 
Now serial ports are internally referred using their physName instead of friendName
 2012-06-03 20:31:48 +02:00
PT_Dreamer
08040ab5cf GCS/MapLib - massive cleaning of the plugin 2012-06-03 19:19:00 +01:00
Laura Sebesta
054f15c529 Added digital RSSI output to GUI. 2012-06-03 12:06:07 +03:00
James Cotton
e82621cbeb Fix waypoint deletion 2012-06-02 18:40:55 -05:00
James Cotton
8aab4755e4 Try and cover a case that was making the waypointitem crash 2012-06-02 18:40:55 -05:00
James Cotton
0a842ac639 After deleting a waypoint (which really sets the last one to stop and shifts 
the rest) any added waypoints were invisible.  This puts the new one after the
first stop and removes the stop.
 2012-06-02 18:40:54 -05:00
James Cotton
39657af8db More work on deleting waypoints 2012-06-02 18:40:54 -05:00
James Cotton
e686ac0b1d Start adding the ability to delete a waypoint 2012-06-02 18:40:53 -05:00
James Cotton
64ba15cf07 Add the ability to add waypoints via OPMap 2012-06-02 18:40:53 -05:00
James Cotton
4e1044589f Add a coordinate conversion method to go from LLA to NED 2012-06-02 18:40:52 -05:00
James Cotton
f7e0fc1065 Add a long comment describing pathcompiler and store the index for each 
waypoint in their description.
 2012-06-02 18:40:52 -05:00
James Cotton
7492c8fec8 UI Fix: Remove unnecessary spacer (that triggered a warning) from input page 2012-06-02 18:40:52 -05:00
James Cotton
6b662f9b9e Connect OPMapGadget to the PathCompiler so any changes in UAVOs are reflected 
on the map
 2012-06-02 18:40:52 -05:00
James Cotton
e348a1a582 Get the waypoints from UAVO, format them into LLA and emit the signal 2012-06-02 18:40:49 -05:00
James Cotton
6f6fdbe3e4 Finish stubbing out the path compiler class. 2012-06-02 18:40:41 -05:00
James Cotton
0f526fe67e Initial commit of pathcompiler stub 2012-06-02 18:40:19 -05:00
James Cotton
f3e3a2f16b Enable waypoints on the map again 2012-06-02 18:40:01 -05:00
PT_Dreamer
d0e012cbdb GCS/MapLib - Added path plan manager. 2012-06-02 22:32:56 +01:00
PT_Dreamer
ed92edc421 GCS - Should fix crashes when opening and closing settings page 2012-06-02 01:12:55 +01:00
PT_Dreamer
3b8ca57eef GCS/MapLib - added pathplanmanager class 2012-06-01 22:13:29 +01:00
PT_Dreamer
40cfe0f4d9 GCS/MapLib - Cleaned unused functions, added new UAVOs to objects.pro 2012-06-01 19:46:04 +01:00
PT_Dreamer
78db6d9853 GCS/MapLib-Added lines and circles between WPs overlay. 2012-06-01 15:28:35 +01:00
PT_Dreamer
ab78e1aca3 GCS - Make the welcome plugin use the workspace names instead 
of the mode names.
 2012-05-30 16:46:45 +01:00
PT_Dreamer
f7f6ffcab1 GCS/MapLib - Work continues on the future pathplaner 2012-05-30 16:19:36 +01:00
James Cotton
252f61bb8e A bit of preliminary cleanup and removing unused code to map gadget 2012-05-29 18:31:12 -05:00
James Cotton
fa20b0de63 Fix indentation in the map gadget widget before starting work on waypoints 2012-05-29 18:31:11 -05:00
PT_Dreamer
74d96d0073 Minor cleaning 2012-05-29 18:31:11 -05:00
jb
c95eeb92bb GCS some improvements to the ripping function of the map library. 2012-05-29 18:31:10 -05:00
jb
25456e3b80 GCS - Added support for map ripping 2012-05-29 18:31:09 -05:00
James Cotton
1e8db9f7e7 Merge remote-tracking branch 'origin/Brian-PipXtreme-V2-wheel' into next 2012-05-28 17:51:55 -05:00
James Cotton
1934752d50 Merge branch 'revo-next' into revo 2012-05-28 15:23:14 -05:00
James Cotton
f64adcfa58 Merge branch 'next' into revo-next 2012-05-28 15:17:13 -05:00
James Cotton
a6e9235888 Make the connections in the config gadget unique and add a flag to make sure 
the refreshWidgetValues is never caleld after disabling updates
 2012-05-28 14:11:29 -05:00
James Cotton
52a3d0079e Clean up the output widget a bit with whole it interfaces to the 
configTaskWidget.  Uses more of the parent functionality.
 2012-05-28 14:11:25 -05:00
Oleg Semyonov
5739dfbfc8 Merge remote-tracking branch 'origin/next' into os/aerosimrc 
Conflicts:
	shared/uavobjectdefinition/gcsreceiver.xml
 2012-05-28 21:46:43 +03:00
Oleg Semyonov
2ef1943c0c AeroSimRC: change default ports to the same as in the AeroSimRC config 2012-05-28 19:44:36 +03:00
Oleg Semyonov
d463cd322a AeroSimRC: fix metadata access functions 2012-05-28 19:44:36 +03:00
Oleg Semyonov
9f0edd803e AeroSimRC: change HITLv2 code to reflect changed sensor data objects 2012-05-28 19:44:35 +03:00
James Cotton
4360d8adfd Merge branch 'next' into revo-next 2012-05-28 11:25:40 -05:00
James Cotton
ea03f8f220 Remove the specific function for the setSpinningArmed flag. This is now done 
differently with the configTaskWidget style.
 2012-05-28 11:23:43 -05:00
James Cotton
1689424620 Merge branch 'ui_unbreak' into next 2012-05-28 11:23:35 -05:00
James Cotton
3fa7b30f22 Merge branch 'ui_unbreak' into revo 2012-05-28 09:42:10 -05:00
James Cotton
33e39713d1 Make GCS aware of revo board number again 2012-05-28 09:34:23 -05:00
James Cotton
8a6073fbaf Merge remote-tracking branch 'revo/revo-next' into testing 
Conflicts:
	Makefile
	flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c
	flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/task.c
	flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/portable/GCC/Posix/port_posix.c
	flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
	flight/Revolution/Makefile
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
	shared/uavobjectdefinition/taskinfo.xml
 2012-05-28 09:13:26 -05:00
PT_Dreamer
9024a21af7 GCS-MapLib - Reenabled waypoint features on the plugin. 
Added go_to_place feature to the plugin.
 2012-05-28 14:12:06 +01:00
Corvus Corax
978ab5b96c Merge remote branch 'origin/stac/etasv3' into revo-next 2012-05-28 12:56:27 +02:00
PT_Dreamer
28b754183f GCS - MapLib change relative waypoint to distance and 
bearing definition
 2012-05-27 21:55:47 +01:00
Mike LaBranche
e2d1f67d9e Add virtual updateObjectsFromWidgets to configccattitude; 
reset calibration progress bar to 0% upon successful apply/save.
 2012-05-27 10:20:31 -07:00
Mike LaBranche
1b2ffde116 Keep up: spelling disableWheelEvents; add pushbutton setAttribute for osx. 2012-05-26 16:49:02 -07:00
PT_Dreamer
7a1501eea3 GCS - Relative WPs are now working 2012-05-26 21:23:53 +01:00
James Cotton
5fb615c3e5 Remove stylesheet on subpanel of input.ui as it doesn't look consistent across 
platforms.
 2012-05-26 14:09:42 -05:00
PT_Dreamer
8fbef19f5b GCS - Map cleaning 2012-05-26 17:18:55 +01:00
Corvus Corax
8c94e931d2 Bugfix: Fixed and reenabled HITL (backport of working code from revo repo) 2012-05-26 17:38:32 +02:00
James Cotton
126671ae4c Add line from Kenz that fixes button overlap on OSX 2012-05-26 10:33:27 -05:00
James Cotton
f1f01f2b4b Fix uploader gadget to not throw warnings when uploading to CC3D. Also added a 
different icon to it.  The description is still "CC3D" for "CopterControl".
The whole names/board types/etc really needs centralizing into
devicedescriptorstructure which should become a general class for checking if
firmware is good etc.
 2012-05-26 09:46:29 -05:00
Laura Sebesta
888b8fb0c9 Disabled wheel scrolling, improved tab order. 2012-05-26 12:00:16 +03:00
James Cotton
dd9e2de4b9 Match small spacing between TxPid and CameraStab 2012-05-26 03:11:39 -05:00
James Cotton
1a4e358f7c Remove custom style from airframe 2012-05-26 03:11:38 -05:00
James Cotton
8682937f8a Remove custom style sheets from camerastab. At least that was applied widget 
wide, but still should be done to look nice cross platform (or from a window
specific runtime command).
 2012-05-26 03:11:38 -05:00
James Cotton
60af442f27 Remove the custom stylesheet from the txpid .ui group boxes 2012-05-26 03:11:38 -05:00
James Cotton
a6e1837161 Remove stylesheets for stabilization ui group boxes as they don't work properly 
on all platforms.  Also removed custom fonts as these don't work consistently
across platforms.

Basically don't customize shit in the .ui file.  Generate a stylesheet and
let's properly validate them and/or have one per platform.  Even things like
changing font sizes behave inconsistently.

Don't specify the size of buttons, at least to any precision.  It will not work
across platforms.
 2012-05-26 03:11:38 -05:00
Laura Sebesta
0e505a396e Fixed scrolling issues in plugin by adding all elements to a parent QFrame widget, 
and then activating scrolling in configpipxtremewidget.cpp constructor.
 2012-05-26 03:11:38 -05:00
James Cotton
4683a1dcc3 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-05-26 03:09:16 -05:00
James Cotton
a24375ca71 Fix bug introduced with PiPX merge where the refreshWidgetsValues(UAVObject *) 
gained the parameter.  However, objects that had overriden that method were now
creating a new method and not getting called at the right time.  This fixes the
Output and Aircraft type panels
 2012-05-26 03:07:36 -05:00
James Cotton
7698913d38 Merge remote-tracking branch 'origin/Brian-PipXtreme-V2-scroll' into next 2012-05-25 23:51:30 -05:00
Mike LaBranche
94df1847fc Bugfix: update ccpm swash mix slider visibility via ui instead of stored config; 
sliders now appear/disappear as user selects link checkboxes
 2012-05-25 19:36:39 -07:00
James Cotton
5a6e02a688 Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next 2012-05-25 20:37:23 -05:00
Mike LaBranche
b5ac4306d3 Delete commented code using direct vector object referencing 2012-05-25 11:47:38 -07:00
Mike LaBranche
e9e6aece21 Bugfix: ccpm_ui - change sliders signal sliderMoved to valueChanged; 
resolves related spinboxes not always staying in synch
 2012-05-25 11:29:38 -07:00
Laura Sebesta
5061f86e00 Fixed scrolling issues in plugin by adding all elements to a parent QFrame widget, 
and then activating scrolling in configpipxtremewidget.cpp constructor.
 2012-05-25 11:45:28 +03:00
Laura Sebesta
423e287494 Added zoom functionality to scopes. There is a minor bias error when zooming with the legends activated. 
This is due principally to the fact that retreiving the Qt coordinate in the frame
references to a slightly different system from Qwt invTranformation when the
legend is active.
 2012-05-25 00:48:58 +03:00
Mike LaBranche
7fb96f1acd Bugfixes in configwidgets; 
Refactor mixer type and vector set/get, named vector elements;
 2012-05-24 09:38:34 -07:00
Laura Sebesta
534559680b Fixed tiny bug in ChronoPlotData. 2012-05-23 01:18:30 +03:00
Mike LaBranche
2db4f6b2b6 Resolves mixer/advanced tab switching issue; 
semi-centralized channelNames;
renames ConfigCcpmWidget
 2012-05-22 09:55:50 -07:00
Laura Sebesta
5f7944bff1 Fixed display problem for in scope for math function type. Updated 
OpenPilotGCS.xml to include default of "None" for scope math type.
 2012-05-22 18:14:21 +03:00
Laura Sebesta
6003d2d574 Changed order of scope math functions to be more logical. 
Added "Average" as  scope math function.
Changed averaging window size text edit box to be active only when math functions are selected.
Fixed bug introduced immediately prior by removing child redefinition of saveConfig.

Tried installing scroll wheel event filter for scope config plugin, but is not currently working.
 2012-05-22 12:34:01 +03:00
Laura Sebesta
a210b790b4 Added combo boxes to the mouse wheel filter. 2012-05-22 12:19:20 +03:00
Brian Webb
6e359c5933 Added PipX to Windows .inf file and updated ppm port definitions. 2012-05-21 19:22:46 -07:00
Laura Sebesta
aeca5c6741 Added Math Functions to the scope. Currently only support standard deviation. 2012-05-22 05:21:11 +03:00
Laura Sebesta
ce139a12cc Missed a final typo. 2012-05-22 01:22:47 +03:00
Laura Sebesta
f4376b3445 Corrected small typo: disbleMouseWheelEvents vs. disableMouseWheelEvents 2012-05-22 01:20:23 +03:00
Laura Sebesta
3a1b15a65b Reworked scale plot entry to have a more descriptive name and function. 2012-05-22 00:40:01 +03:00
Laura Sebesta
cae53915d3 Fixed small typo: "sequencial" vs. "sequential" 2012-05-22 00:34:29 +03:00
Mike LaBranche
64688be0a1 Refactor configwidgets for multirotor,fixedwing,heli,ground; 
VehicleConfig subclasses ConfigTaskWidget and adds guiconfigdata bit storage;
Align channelbox items so 'None' is first;
 2012-05-21 11:28:29 -07:00
Brian Webb
bc9dcd415f Reverted unnecessary changes to configtaskwidget.cpp 2012-05-19 15:05:17 -07:00
Brian Webb
723f68f763 Reverted unnecessary changes to configtaskwidget.cpp 2012-05-19 14:18:29 -07:00
Brian Webb
c25884bcaf Cleanup on the PipX branch. 2012-05-18 17:42:25 -07:00
Brian Webb
68d66d4181 Fixed firmware description in PipX status. 2012-05-17 20:35:17 -07:00
PT_Dreamer
bb7e85cf2c GCS - Changes to the map lib. Preparatory steps 
to allow WPs to be defined relative to home.
GPS fed UAV map item is only visible when diagnostics are enabled.
Should make users not be confused by 2 UAVs on screen.
 2012-05-17 17:27:08 +01:00
Brian Webb
44a1663eb9 Fixed transparent comm on PipX. 2012-05-16 19:02:53 -07:00
Corvus Corax
80f53b185c GCS: BITFIELD: Set lists of options hardcoded in uavobjectfield.cpp (can only be "0" or "1" ) 2012-05-15 19:40:58 +02:00
Corvus Corax
aa7788d04c UAVObjects: Bugfixes to BITFIELD type 2012-05-15 19:01:32 +02:00
Corvus Corax
8fc471463d UAVOBJECTS: On GCS side, handle Mode Bitfield in UAVOBJECT Metadata as a type BITFIELD. This has no effect on flight side, since the serialized form is identical to an UINT8 that's interpreted as a bitfield which is used there, so that can change later if necessary 2012-05-15 18:23:25 +02:00
Corvus Corax
31fd30b108 UABOBJECTS: Made GCS aware of new BITFIELD type in UAVObjects - so far not used by UAVObjectgenerator, but can be used (hardcoded) in metadata objects 2012-05-15 18:22:36 +02:00
Corvus Corax
badf509d1d UAVObjects: switched around order of update modes to give each bit semantic meaning - important to allow usage of a bitfield type later 2012-05-15 18:21:27 +02:00
Mike LaBranche
ed54716436 add gui config data bit storage to fixedwing,multirotor,ground vehicles 2012-05-14 10:05:40 -07:00
Brian Webb
a3269aaf2f Reverted some file permission changes. 2012-05-13 14:24:57 -07:00
Brian Webb
68d12b1b2f Fixed some bugs with setting PairIDs in GCS. 2012-05-13 14:24:00 -07:00
Brian Webb
ec67742ff6 Added configuration of COM ports on PipX. 2012-05-12 13:16:36 -07:00
James Cotton
5a67b8cc29 Add Revolution to the list of board names the DFU knows about so that the open 
firmware dialog opens in the correct location (useful for devs).  Honestly the
DFU should be rearranged so all the board ID information etc is in one location
instead of spread throughout various functions and remapped to various other
constants.
 2012-05-12 13:39:40 -05:00
James Cotton
9a32e637e9 Suppress the "plug other devices in" dialog for revo bootloader, at least until 
we can have other connected devices.
 2012-05-12 13:32:48 -05:00
James Cotton
46fc5fa4fb Create a PathPlannerSettings object and move the PathMode setting to there. 
Also add a (temporary) field to allow storing some custom paths to select on
the fly.  Later will be replaced with some code to fetch from the flash chip.
 2012-05-12 13:12:57 -05:00
James Cotton
af63f94da0 OP-107 Make the waypoint editor have the ability to add new waypoints and edit their 
positions.
 2012-05-12 13:12:56 -05:00
James Cotton
d42bdacc46 OP-107 Add the model connected to the waypoints so that the waypoints show up and 
update when connected
 2012-05-12 13:12:56 -05:00
James Cotton
15067b010f OP-107 New gadget for modifying a list of waypoints 2012-05-12 13:12:56 -05:00
Mike LaBranche
5e07e742ef revised to use GUIConfigManager.GetChannelDescriptions 2012-05-11 21:53:02 -07:00
Mike LaBranche
3a3dc4b888 extend GUIConfigData to support all vehicle types; add GUIConfigDataManager class to get/set 2012-05-11 21:48:46 -07:00
Brian Webb
dd02873908 Reverted changed mode. 2012-05-11 17:53:53 -07:00
Brian Webb
1f5dbcf57c Mostly complete PipX configuration GUI. 2012-05-11 17:51:18 -07:00
Brian Webb
513c014f5a Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2 2012-05-11 17:44:23 -07:00
PT_Dreamer
f716f16b60 Fixes compile issues on Ubuntu with qt 4.8.0 2012-05-10 14:47:30 +01:00
Mike LaBranche
c066fdc5e6 add support for output channel assignment descriptions for helicp 2012-05-09 15:24:15 -07:00
James Cotton
a857530832 Update the MagicWaypoint gadget to use PathDesired instead of PositionDesired 2012-05-09 11:01:20 -05:00
PT_Dreamer
9f1afacdaf Minor cleaning 2012-05-08 16:22:06 +01:00
James Cotton
37bb2cfb77 Finish getting rid of PositionDesired in favor of PathDesired and add the 
ability to move the magic waypoint with the transmitter
 2012-05-08 02:42:58 -05:00
James Cotton
0f2c41ac5d Merge branch 'revolution' into navigation 
Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/project.pbxproj
 2012-05-07 21:53:10 -05:00
zedamota
75b3547e89 Merge branch 'ui_fixes' into next 2012-05-07 15:14:55 +01:00
zedamota
f753105c0f GCS - disable the boot and safeboot buttons during flash 2012-05-07 15:11:51 +01:00
Oleg Semyonov
a3906aa7ea Merge remote-tracking branch 'origin/hhrhhr/AeroSimRC_plugin' into os/aerosimrc 2012-05-07 16:09:35 +03:00
zedamota
9481be90af GCS - Changes reload button behavior, now loads data from persistence memory. 2012-05-07 14:02:58 +01:00
Brian Webb
454144f46c Pairing and saving settings working. 2012-05-06 20:47:21 -07:00
Laura Sebesta
bcc1885785 Added tooltips to beginners stab. tab. 2012-05-06 17:53:43 -04:00
Brian Webb
ef4828032b Fixed failed merge with next. 2012-05-06 12:38:13 -07:00
Kenn Sebesta
40e215ae27 Fixed bug in configvehicletypewidget.cpp that prevented Octo Coax X from being selected. 
Fixed labelnames in airframes.ui that were causing compile warnings.
 2012-05-06 12:22:43 -04:00
Brian Webb
480371a43e Resolving merge with origin/next 2012-05-05 09:53:54 -07:00
Brian Webb
e83fec0463 Merged latest origin/next. 2012-05-05 09:40:44 -07:00