Brian Webb
b821ace3e9
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2-wheel' into Brian-PipXtreme-V2
2012-05-27 09:16:46 -07:00
Corvus Corax
ef8d7275a8
PathFollower and PathPlanner: fixes for fixed wing
2012-05-27 02:38:56 +02:00
Mike LaBranche
1b2ffde116
Keep up: spelling disableWheelEvents; add pushbutton setAttribute for osx.
2012-05-26 16:49:02 -07:00
Corvus Corax
922b3b7f1e
Merge branch 'basenext' into corvuscorax/new_navigation
...
Conflicts:
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-05-27 01:41:51 +02:00
James Cotton
1b53a9c4e6
Merge branch 'revo_battery' into testing
2012-05-26 17:06:27 -05:00
James Cotton
bd8125e41e
Catch from Corvus that the path error was being squared. However need to make
...
sure to take care of sign by removing one of those multiplcations.
2012-05-26 15:24:50 -05: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
Sambas
599e1b633f
graphic bugfixes
2012-05-26 21:56:54 +03:00
PT_Dreamer
8fbef19f5b
GCS - Map cleaning
2012-05-26 17:18:55 +01:00
Sambas
36ea394d84
More graphic fixes
...
setting to change screens
2012-05-26 18:39:42 +03: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
Sambas
dfcba097f2
Cleanup and graphical bugfixes
2012-05-26 18:00:36 +03:00
Brian Webb
a8fcc6579b
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-05-26 07:50:22 -07: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
Brian Webb
db6f63468c
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-05-26 07:12:09 -07:00
Corvus Corax
9dfd34dd19
PathPlanner: added functions to allow circular paths and implement that feature in FixedWingPathFollower
2012-05-26 15:55:52 +02:00
Corvus Corax
45258a6561
Ported GCS to reflect recent pathfollower changes
2012-05-26 13:57:46 +02:00
Corvus Corax
c7857926f4
OpenSceneGraph deactivated by default, too tricky to get it compiled for most devs
2012-05-26 13:49:04 +02:00
Sambas
7eefe83335
Cleanup and fix
2012-05-26 13:38:01 +03:00
Sambas
bb40eca695
Big font fix
...
IRQs back to normal
2012-05-26 12:14:10 +03: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
Brian Webb
f8c0ca487f
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-05-25 19:57:05 -07: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
Sambas
a9cfc4a0af
*float sprintf
...
*h/v deadbands
2012-05-25 21:12:03 +03:00
Brian Webb
468aaa92b4
Merge remote-tracking branch 'raid/Brian-PipXtreme-V2' into Brian-PipXtreme-V2
2012-05-25 06:46:41 -07:00
Brian Webb
7b65ebcbad
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2-scroll' into Brian-PipXtreme-V2
2012-05-25 06:27:07 -07:00
Brian Webb
b824c87056
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-05-25 06:26:29 -07:00
Stacey Sheldon
dbd4d0fe1d
Merge remote-tracking branch 'origin/stac/leds-in-bu-again' into next
2012-05-25 09:02:44 -04: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
Brian Webb
cf2fbc67a4
Merge remote-tracking branch 'raid/Brian-PipXtreme-V2' into Brian-PipXtreme-V2
2012-05-24 18:17:43 -07:00
Brian Webb
701a480f01
Tuning configutation of PipX.
2012-05-24 18:08:29 -07:00
Brian Webb
f48bb90cf6
Updated PipX bootloader USB configuration to match CC.
2012-05-24 18:06:19 -07:00
Brian Webb
a434688b42
Zero out watchdog register on init.
2012-05-24 18:04:42 -07:00
Corvus Corax
63faf92c9a
Merge remote branch 'baseorigin/kenz/math_scope' into basenext
2012-05-24 23:50:47 +02: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
Corvus Corax
79b717b4f7
Fixes to PathFollowers
2012-05-24 23:28:13 +02:00
