James Cotton
1689424620
Merge branch 'ui_unbreak' into next
2012-05-28 11:23:35 -05:00
James Cotton
3fa7b30f22
Merge branch 'ui_unbreak' into revo
2012-05-28 09:42:10 -05:00
James Cotton
33e39713d1
Make GCS aware of revo board number again
2012-05-28 09:34:23 -05:00
James Cotton
8a6073fbaf
Merge remote-tracking branch 'revo/revo-next' into testing
...
Conflicts:
Makefile
flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c
flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/task.c
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/portable/GCC/Posix/port_posix.c
flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c
flight/Revolution/Makefile
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
shared/uavobjectdefinition/taskinfo.xml
2012-05-28 09:13:26 -05:00
Corvus Corax
90e4047e2c
bugfix to etasv3 - made uavobject def compatible with new update modes
2012-05-28 13:09:38 +02:00
Corvus Corax
978ab5b96c
Merge remote branch 'origin/stac/etasv3' into revo-next
2012-05-28 12:56:27 +02:00
Oleg Semyonov
f95d29a3b8
TxPID: add GyroTau to the list of parameters (OP-637)
2012-05-28 12:48:55 +03:00
Brian Webb
e1e556b140
Merge branch 'Brian-PipXtreme-V2' of r:/git into Brian-PipXtreme-V2
2012-05-27 19:52:58 -07:00
Brian Webb
d153ba6f2f
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2-wheel' into Brian-PipXtreme-V2
2012-05-27 19:42:44 -07:00
Brian Webb
687670a1a2
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-05-27 19:42:29 -07:00
Stacey Sheldon
bc09c440d6
makefile: fix broken all_ef target due to typo
2012-05-27 21:51:55 -04:00
Stacey Sheldon
dca2d0ee66
makefile: filter out unbuildable targets for SimPosix
2012-05-27 21:51:29 -04:00
Stacey Sheldon
35ed945aff
revo bu: BU image doesn't currentyl work on F4 so disable it for revo
2012-05-27 21:39:55 -04:00
Stacey Sheldon
1e33ba62d8
makefile: fix dependency for EF images so they work with all_* targets
2012-05-27 21:39:15 -04:00
Stacey Sheldon
5c114aedd5
pipx: apply fixes that allow pipx to build with new gcc
2012-05-27 21:38:33 -04:00
Stacey Sheldon
decd92f21d
pipx bu: apply recent LED changes so BU image builds again
2012-05-27 21:37:59 -04:00
Stacey Sheldon
c719d5b6cf
f4 adc: allow PIOS ADC to be properly excluded from the build
...
This was preventing the BL image from building
2012-05-27 21:36:56 -04:00
Stacey Sheldon
261e65a6f2
revo bu: apply recent LED changes to revo so BU builds again
2012-05-27 21:35:52 -04:00
Stacey Sheldon
8d47dc1fe4
revo usb: apply recent hid+vcp decscriptor changes to revo
2012-05-27 21:35:13 -04:00
Stacey Sheldon
33e7e775c7
Merge remote-tracking branch 'op-public/next' into revo-next
2012-05-27 20:39:58 -04:00
Brian Webb
eaa0290d74
Merge remote-tracking branch 'origin/next' into Brian-PipXtreme-V2
2012-05-27 09:18:23 -07:00
Brian Webb
b821ace3e9
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2-wheel' into Brian-PipXtreme-V2
2012-05-27 09:16:46 -07: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
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
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
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
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
James Cotton
5a6e02a688
Merge remote-tracking branch 'origin/Brian-PipXtreme-V2' into next
2012-05-25 20:37:23 -05: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
