Mike LaBranche
|
a6568dc468
|
merge next conflict resolution
|
2012-07-07 12:47:07 -07:00 |
|
Mike LaBranche
|
0e3236553b
|
Merge next conflict resolution
|
2012-07-07 12:41:43 -07:00 |
|
Mike LaBranche
|
0a4101c915
|
VehicleConfig, multirotor, slight refactor;
|
2012-07-07 10:07:04 -07:00 |
|
Mike LaBranche
|
594453d191
|
MixerCurve, Tweek: use base curve min to init custom curve2
|
2012-07-07 09:00:59 -07:00 |
|
Mike LaBranche
|
9c1f9d6b74
|
MixerCurve, Bugfix: make custom curve2 aware of throttle vs pitch curvetypes
|
2012-07-07 08:45:28 -07:00 |
|
Mike LaBranche
|
c3057dc72e
|
VehicleConfig Bugfix/tweek: change getChannelDescs to static in all airframes;
avoids entire widget creation just to get channel descs.
|
2012-07-07 08:02:10 -07:00 |
|
Mike LaBranche
|
b95290a32f
|
Bugfix: reset min/max ui spinboxes on curvetype change.
|
2012-07-06 21:47:08 -07:00 |
|
Mike LaBranche
|
6a12701e63
|
Bugfix: wire up the mixercurvewidget to the dirty manager rather than the parent MixerCurve
|
2012-07-06 16:12:53 -07:00 |
|
Mike LaBranche
|
dc4c6c74e4
|
Tweek: set min/max spinboxes to match the settings table when edited.
|
2012-07-06 15:16:54 -07:00 |
|
Mike LaBranche
|
44140931ae
|
Tweek: resize the settings table row heights.
|
2012-07-06 15:02:34 -07:00 |
|
Mike LaBranche
|
a794bf1dba
|
Merge branch 'next' of ssh://gitolite@git.openpilot.org/OpenPilot.git into MikeL_MixerCurve
|
2012-07-06 14:03:01 -07:00 |
|
Mike LaBranche
|
51891881db
|
Tweeks: verify heli init's curves correctly; mixer pre-allocates a spindelegate
so we can reset min/max later
|
2012-07-06 14:01:53 -07:00 |
|
Mike LaBranche
|
382fecabbe
|
Bugfixes: distingish between curve base min/max and client requested (multi's & 90% max);
keep spindelegate synched with requested min/max's;
clean up a few old field based references;
make all nodes move when curve is flat;
|
2012-07-06 13:38:46 -07:00 |
|
Mike LaBranche
|
06eb23abe6
|
MixerCurve, bugfix: min and max nodes no longer clipped.
|
2012-07-06 11:44:16 -07:00 |
|
Mike LaBranche
|
de590dfdd7
|
MixerCurve: Bwahaha, it resizes.
|
2012-07-06 11:28:46 -07:00 |
|
Mike LaBranche
|
eeb9ce9909
|
Bugfix: resolve curveUpdated() signal signature issue.
|
2012-07-06 10:43:24 -07:00 |
|
Mike LaBranche
|
8692855208
|
Bugfixes: spindelegate is online and fairly smart, knows min/max for curve;
heli config is fully on board with integrated curve;
custom vehicle now displays 10 channels in custom grid;
mixercurve ui getting better;
|
2012-07-05 15:31:36 -07:00 |
|
Mike LaBranche
|
23aea6eac4
|
MixerCurve: integrated into all airframes.
|
2012-07-05 12:58:00 -07:00 |
|
Mike LaBranche
|
0c9e5c5e66
|
MixerCurve: Move code into \config folder; slice out doublespindelegate;
enhanced mixercurve in all airframes except heli; layout is better, not there yet.
VehicleConfig, Bugfix: update custom mixer table to 10 channels.
|
2012-07-04 10:21:48 -07: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 |
|
Mike LaBranche
|
8088f7aee9
|
MixerCurve: wire new curve into all airframes except heli;
ConfigMultiRotor: Bugfix boundary condition on channel descriptions;
prune unused mixercurvewidget resets,values etc from vehicle specific configs
|
2012-07-02 10:46:21 -07: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 |
|
Stacey Sheldon
|
d9dca0b553
|
Merge branch 'wireshark-plugins' into next
|
2012-06-30 22:42:38 -04:00 |
|
Mike LaBranche
|
09a2a007a8
|
MixerCurve, Bugfix: use widget values for min/max for curve generation.
|
2012-06-30 15:27:42 -07:00 |
|
Mike LaBranche
|
7f3a810fa6
|
MixerCurve: alpha version of integrated mixer curve;
only in fixedwing config currently.
|
2012-06-30 14:35:38 -07: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
|
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 |
|
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 |
|
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 |
|