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

2751 Commits

Author SHA1 Message Date
PT_Dreamer
917f777ce5 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-07-03 23:29:35 +01:00
PT_Dreamer
bf5d4bf5e0 GCS - Strangely QtCreator builds stopped working for me after compiling Wireshark on Ubuntu. 
This seems to fix that.
 2012-07-03 23:28:17 +01: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
David
e0c4c97601 Remove redundant dial 2012-07-03 22:44:35 +10:00
James Cotton
e309ff7f2d Merge remote-tracking branch 'origin/MikeL_ConfigVehicle' into next 2012-07-03 14:19:33 +02:00
Oleg Semyonov
3cd293a5e6 Cosmetic FlightMode GUI fix (OPReview-228) 2012-07-03 11:04:18 +03:00
James Cotton
534d559501 Merge remote-tracking branch 'origin/brian/multi-trans-telem' into next 2012-07-02 18:21:19 +02:00
James Cotton
9de47330b5 Indentation fix. Fixed copyright dates. 2012-07-02 17:55:00 +02:00
James Cotton
305d881724 Merge remote-tracking branch 'origin/dwillis/OP-646' into next 2012-07-02 17:45:08 +02:00
PT_Dreamer
5fd4daa8f8 GCS/Uploader - Some changes to fix "halt" on Linux 2012-07-02 16:11:34 +01:00
James Cotton
c9bf5f5d06 Merge branch 'next' into revo 2012-07-01 14:44:22 +02:00
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
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
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
David Willis
7da39b23de Update alarm text. Add attitude critical and error descriptions 2012-06-27 23:33:40 +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
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
Fredrik Arvidsson
88a9b4cf89 Merge branch 'next' into thread/OP-642 2012-06-26 21:13:40 +02: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
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
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
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
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