1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
LibrePilot/flight/Modules
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
..
Actuator Merged latest origin/next. 2012-05-05 09:40:44 -07:00
AHRSComms Merged latest origin/next. 2012-05-05 09:40:44 -07:00
Altitude Merged latest origin/next. 2012-05-05 09:40:44 -07:00
AltitudeHold Disable overosync by default. It was triggering event system warnings due to 2012-03-21 00:29:09 -05:00
Attitude Merged latest origin/next. 2012-05-05 09:40:44 -07:00
Battery Merge branch 'next' into camera_stabilization 2011-07-30 10:06:10 +09:00
CameraStab Merge remote-tracking branch 'origin/stac/i2c_decoupling' into next 2012-01-17 22:35:36 -05:00
ComUsbBridge modules: Allow optional modules to be used as built-in 2012-01-14 16:55:55 -05:00
Example OP-423: simplify the MODULE_INITCALL macro and remove the ordering loops 2011-07-12 20:44:32 -07:00
Fault modules: Allow optional modules to be used as built-in 2012-01-14 16:55:55 -05:00
FirmwareIAP Merged latest origin/next. 2012-05-05 09:40:44 -07:00
FlightPlan Initialize objects for guidance in the correct place. Init some objects in 2011-08-19 09:52:05 -05:00
GPS Merged latest origin/next. 2012-05-05 09:40:44 -07:00
Guidance Merged latest origin/next. 2012-05-05 09:40:44 -07:00
ManualControl Merged latest origin/next. 2012-05-05 09:40:44 -07:00
MK/MKSerial OP-265 Flight reorganization of UAVObjects and Modules up a directory 2011-01-14 01:38:19 +00:00
Osd/OsdEtStd Merged latest origin/next. 2012-05-05 09:40:44 -07:00
OveroSync Merge branch 'next' into MikeL 2012-06-04 15:38:57 -07:00
PipXtreme Cleanup on the PipX branch. 2012-05-18 17:42:25 -07:00
RadioComBridge Added PPM input to the PipXtreme. Also added configurable GCSReceiver timeout. 2012-05-20 18:30:37 -07:00
Sensors Merge branch 'next' into MikeL 2012-06-04 15:38:57 -07:00
Stabilization Stabilization: Bugfix: moved queue initialisation to TaskStart where it belongs 2012-05-22 22:19:31 +02:00
System Merged latest origin/next. 2012-05-05 09:40:44 -07:00
Telemetry Merged latest origin/next. 2012-05-05 09:40:44 -07:00
TxPID TxPID module: add ILimit values to the list of settings 2012-02-21 19:57:10 +02:00