Mike LaBranche 0ba8345c51 Merge branch 'next' into MikeL ...

Conflicts:
	flight/Bootloaders/Revolution/inc/pios_config.h
	flight/Modules/OveroSync/inc/overosync.h
	flight/Modules/Sensors/inc/sensors.h
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/STM32F4xx/pios_iap.c
	flight/Revolution/System/inc/pios_config.h
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
	ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp

2012-06-04 16:59:31 -07:00

..

cfg_vehicletypes

Merge branch 'next' into MikeL

2012-06-04 15:38:57 -07:00

images

Merge remote branch 'origin/master' into os/features/pid-tuning-from-transmitter

2012-02-13 11:51:00 +02:00

airframe.ui

Merge branch 'next' into MikeL

2012-06-04 15:38:57 -07:00

alignment-calibration.cpp

OP-191: Merge from full-calibration branch. Add an implementation of TWOSTEP, including bias-only, bias + scale factor, and bias + scale factor + orthogonality calibration methods.

2011-03-21 00:45:40 +00:00

assertions.h

OP-191: Merge from full-calibration branch. Add an implementation of TWOSTEP, including bias-only, bias + scale factor, and bias + scale factor + orthogonality calibration methods.

2011-03-21 00:45:40 +00:00

calibration.h

OP-191: Merge from full-calibration branch. Add an implementation of TWOSTEP, including bias-only, bias + scale factor, and bias + scale factor + orthogonality calibration methods.

2011-03-21 00:45:40 +00:00

camerastabilization.ui

Turned off wheel scrolling! Also changed all wheel focus to strong focus.

2012-04-19 13:00:20 -04:00

cc_hw_settings.ui

Fix stupid commit on my part. Thanks for heads up brian.

2012-01-31 19:26:48 -06:00

ccattitude.ui

Group calibration items in UI as well

2011-07-16 11:16:47 -05:00

ccpm.ui

Bugfix: ccpm_ui - change sliders signal sliderMoved to valueChanged;

2012-05-25 11:29:38 -07:00

config_cc_hw_widget.cpp

Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into pt/gcs_uavobj_widget_framework

2012-02-11 22:29:03 +00:00

config_cc_hw_widget.h

Merge branch 'next' of ssh://git.openpilot.org:22/OpenPilot into pt/gcs_uavobj_widget_framework

2012-02-11 22:29:03 +00:00

config_dependencies.pri

Moved framework to its own plugin

2012-02-05 18:16:38 +00:00

config_global.h

Moved framework to its own plugin

2012-02-05 18:16:38 +00:00

config_pro_hw_widget.cpp

WIP configtaskwidget enhancements.

2012-02-02 16:22:40 +00:00

config_pro_hw_widget.h

Moved framework to its own plugin

2012-02-05 18:16:38 +00:00

Config.pluginspec

Moved framework to its own plugin

2012-02-05 18:16:38 +00:00

config.pri

Moved framework to its own plugin

2012-02-05 18:16:38 +00:00

config.pro

Merge branch 'next' into MikeL

2012-06-04 16:59:31 -07:00

configcamerastabilizationwidget.cpp

Keep up: spelling disableWheelEvents; add pushbutton setAttribute for osx.

2012-05-26 16:49:02 -07:00

configcamerastabilizationwidget.h

Made the scroll event filter a member of the parent class.

2012-04-26 12:29:00 +01:00

configccattitudewidget.cpp

Merge branch 'next' into MikeL

2012-06-04 15:38:57 -07:00

configccattitudewidget.h

Merge branch 'next' into MikeL

2012-06-04 15:38:57 -07:00

configfactory.h

CC-33 Now the config panel only shows the relevant panel once the board is connected.

2011-03-29 20:32:09 +00:00

configgadget.cpp

OP-306 Update all Gadgets so that they destroy their widgets properly when they die.

2011-02-01 23:01:52 +00:00

configgadget.h

Moved framework to its own plugin

2012-02-05 18:16:38 +00:00

configgadget.qrc

Merge remote branch 'origin/master' into os/features/pid-tuning-from-transmitter

2012-02-13 11:51:00 +02:00

configgadgetconfiguration.cpp

CC-33 Now the config panel only shows the relevant panel once the board is connected.

2011-03-29 20:32:09 +00:00

configgadgetconfiguration.h

CC-33 Now the config panel only shows the relevant panel once the board is connected.

2011-03-29 20:32:09 +00:00

configgadgetfactory.cpp

Change the help button setup from in-line help to one per page. Will no longer open an HTML window, but will open the relevant section on the wiki using the OS default browser.

2011-05-31 00:16:01 -07:00

configgadgetfactory.h

Change the help button setup from in-line help to one per page. Will no longer open an HTML window, but will open the relevant section on the wiki using the OS default browser.

2011-05-31 00:16:01 -07:00

configgadgetoptionspage.cpp

CC-33 Now the config panel only shows the relevant panel once the board is connected.

2011-03-29 20:32:09 +00:00

configgadgetoptionspage.h

CC-33 Now the config panel only shows the relevant panel once the board is connected.

2011-03-29 20:32:09 +00:00

configgadgetwidget.cpp

Fixed failed merge with next.

2012-05-06 12:38:13 -07:00

configgadgetwidget.h

Fixed failed merge with next.

2012-05-06 12:38:13 -07:00

configinputwidget.cpp

Upgraded Brian-Metadata-Mods to current next.

2012-04-01 12:25:13 -07:00

configinputwidget.h

Moved framework to its own plugin

2012-02-05 18:16:38 +00:00

configoutputwidget.cpp

Merge branch 'next' into MikeL

2012-06-04 15:38:57 -07:00

configoutputwidget.h

Refactor configwidgets for multirotor,fixedwing,heli,ground;

2012-05-21 11:28:29 -07:00

configpipxtremewidget.cpp

Fixed firmware description in PipX status.

2012-05-17 20:35:17 -07:00

configpipxtremewidget.h

Reverted some file permission changes.

2012-05-13 14:24:57 -07:00

configplugin.cpp

OP-557: Make the tools erase menu item attempt to perform a full format on the

2011-08-15 11:37:00 -05:00

configplugin.h

OP-557: Make the tools erase menu item attempt to perform a full format on the

2011-08-15 11:37:00 -05:00

configrevowidget.cpp

Update the revo configuration to be consistent with the new meta data format.

2012-05-03 21:09:25 -05:00

configrevowidget.h

gcs: remove reference to obsolete ui_ahrs.h file

2012-03-10 14:52:32 -05:00

configstabilizationwidget.cpp

Keep up: spelling disableWheelEvents; add pushbutton setAttribute for osx.

2012-05-26 16:49:02 -07:00

configstabilizationwidget.h

Made the scroll event filter a member of the parent class.

2012-04-26 12:29:00 +01:00

configtxpidwidget.cpp

Keep up: spelling disableWheelEvents; add pushbutton setAttribute for osx.

2012-05-26 16:49:02 -07:00

configtxpidwidget.h

Made the scroll event filter a member of the parent class.

2012-04-26 12:29:00 +01:00

configvehicletypewidget.cpp

Merge branch 'next' into MikeL

2012-06-04 15:38:57 -07:00

configvehicletypewidget.h

Resolves mixer/advanced tab switching issue;

2012-05-22 09:55:50 -07:00

defaultattitude.ui

CC-33 Now the config panel only shows the relevant panel once the board is connected.

2011-03-29 20:32:09 +00:00

defaultattitudewidget.cpp

OP-502 If a board is not connected, the "Save" button is grayed out. The "Apply" button is still enable, which enables creating configurations purely offline.

2011-06-07 16:56:16 +02:00

defaultattitudewidget.h

Moved framework to its own plugin

2012-02-05 18:16:38 +00:00

defaulthwsettings.ui

Added new hw config tab to the config gadget.

2011-07-19 14:50:42 +01:00

defaulthwsettingswidget.cpp

Fixed included file case.

2011-07-25 14:18:09 +01:00

defaulthwsettingswidget.h

Moved framework to its own plugin

2012-02-05 18:16:38 +00:00

fancytabwidget.cpp

Added "changes not saved" message warning to config gadget

2011-08-02 17:06:17 +01:00

fancytabwidget.h

Added "changes not saved" message warning to config gadget

2011-08-02 17:06:17 +01:00

gyro-calibration.cpp

OP-191: Merge from full-calibration branch. Add an implementation of TWOSTEP, including bias-only, bias + scale factor, and bias + scale factor + orthogonality calibration methods.

2011-03-21 00:45:40 +00:00

input.ui

Turned off wheel scrolling! Also changed all wheel focus to strong focus.

2012-04-19 13:00:20 -04:00

inputchannelform.cpp

Keep up: spelling disableWheelEvents; add pushbutton setAttribute for osx.

2012-05-26 16:49:02 -07:00

inputchannelform.h

Made the scroll event filter a member of the parent class.

2012-04-26 12:29:00 +01:00

inputchannelform.ui

Turned off wheel scrolling! Also changed all wheel focus to strong focus.

2012-04-19 13:00:20 -04:00

legacy-calibration.cpp

OP-191: Merge from full-calibration branch. Add an implementation of TWOSTEP, including bias-only, bias + scale factor, and bias + scale factor + orthogonality calibration methods.

2011-03-21 00:45:40 +00:00

output.ui

config outputs now uses dropdown boxes for the update freq.

2011-11-29 17:01:02 +00:00

outputchannelform.cpp

Keep up: spelling disableWheelEvents; add pushbutton setAttribute for osx.

2012-05-26 16:49:02 -07:00

outputchannelform.h

Made the scroll event filter a member of the parent class.

2012-04-26 12:29:00 +01:00

outputchannelform.ui

Fixed outputchannelform.ui tab order and tab focus.

2012-04-17 16:32:07 -04:00

pipxtreme.ui

Reverted changed mode.

2012-05-11 17:53:53 -07:00

pro_hw_settings.ui

Added new hw config tab to the config gadget.

2011-07-19 14:50:42 +01:00

revosensors.ui

Get the 6pt calibration working again for revo

2011-12-24 15:58:12 -06:00

stabilization.ui

Added tooltips to beginners stab. tab.

2012-05-06 17:53:43 -04:00

twostep.cpp

Fixed problems that blocked compiling on Windows

2011-04-11 10:07:06 +00:00

txpid.ui

Turned off wheel scrolling! Also changed all wheel focus to strong focus.

2012-04-19 13:00:20 -04:00

vernier.ui

OP-146 Stabilization config interface: this is a work in progress, and a pure mock-up of the UI, I would like feedback.

2011-02-22 22:03:32 +00:00