James Cotton
|
dc340596f5
|
Merge branch 'next' into GCS_ChangesToUI-RuntimeCFG
Conflicts:
flight/CopterControl/Makefile
flight/OpenPilot/System/pios_board.c
flight/OpenPilot/UAVObjects.inc
flight/PiOS/STM32F10x/pios_spektrum.c
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configgadget.qrc
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/hwsettings.xml
|
2011-08-27 15:26:05 -05:00 |
|
James Cotton
|
5f7a9b513a
|
Merge branch 'sambas/dsmx_stuff' of ssh://git.openpilot.org/OpenPilot into next
Conflicts:
shared/uavobjectdefinition/hwsettings.xml
|
2011-08-24 11:37:30 -05:00 |
|
sambas
|
1e67b5e3b5
|
DSMx_binder, hw setting 0 disabled, 1-10 bind pulses. Manual disable after successful bind. Only for flexiport.
|
2011-08-06 22:16:47 +03:00 |
|
Stacey Sheldon
|
06cdeb7b61
|
rcvr: support multiple simultaneous receivers
Now also supports multiple instances of the Spektrum driver.
These are configured as Spektrum1 and Spektrum2.
|
2011-08-02 01:22:04 -04:00 |
|
James Cotton
|
387a22398e
|
Make it possible to optionally enable the CameraStab module
|
2011-07-30 12:08:47 +09:00 |
|
Stacey Sheldon
|
d9aac892a9
|
hwsettings: Cosmetic change of SBUS to S.Bus in UAVObject
|
2011-07-06 22:37:17 -04:00 |
|
Stacey Sheldon
|
cba0985f26
|
hwsettings: UAVObject to select hardware runtime hw config
|
2011-07-05 22:02:37 -04:00 |
|