PT_Dreamer
4c9327da7e
GCS-Fixes some crashes on hw disconnection.
2012-07-09 00:15:21 +01:00
David Willis
e15615b2e4
Add all new alarm descriptions to resource file. Modify to show OK message and general usage tooltip.
2012-07-08 23:04:39 +01:00
Fredrik Arvidsson
cbb66e5997
OP-642 Fixed meta data state bug.
2012-07-08 16:45:58 +02:00
Fredrik Arvidsson
3c32490f7e
OP-642 Hopefully fixed color and highlight time bug that occurred after changing categorized node mode.
2012-07-08 16:17:59 +02: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
David
a3956c9c7c
Change CPU gauge to be more meaningful
2012-07-04 15:07:06 +10: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
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
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
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
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
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
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
Brian Webb
6c8d8aeafb
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-06-14 06:55:52 -07: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
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
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
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
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
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
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
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
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