1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-14 21:23:52 +01:00
Commit Graph

1223 Commits

Author SHA1 Message Date
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
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
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
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
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
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