Sambas
|
f7b9223827
|
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
flight/modules/System/systemmod.c
shared/uavobjectdefinition/taskinfo.xml
|
2013-05-02 09:00:12 +03:00 |
|
Corvus Corax
|
a0ca66b0cd
|
Merge branch 'corvuscorax/delayed_callbacks_with_delay' into next
|
2013-05-01 15:34:16 +02:00 |
|
Corvus Corax
|
e1233c7780
|
Merge branch 'next' into corvuscorax/delayed_callbacks_with_delay
Conflicts:
flight/targets/Revolution/System/inc/openpilot.h
flight/targets/SimPosix/System/inc/openpilot.h
flight/targets/boards/coptercontrol/firmware/inc/openpilot.h
flight/targets/boards/oplinkmini/firmware/inc/openpilot.h
flight/targets/boards/revolution/firmware/inc/openpilot.h
flight/targets/boards/revoproto/firmware/inc/openpilot.h
|
2013-04-27 13:26:03 +02:00 |
|
Oleg Semyonov
|
45f456580f
|
Fix pios debug pin functions and defines (thanks to Mathieu for the patch)
|
2013-04-26 18:18:31 +03:00 |
|
sambas
|
abe3742217
|
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
flight/Libraries/CoordinateConversions.c
flight/Libraries/paths.c
flight/Modules/System/systemmod.c
flight/PiOS/STM32F4xx/pios_sys.c
flight/targets/boards/coptercontrol/pios_board.h
flight/targets/boards/revolution/pios_board.h
flight/targets/boards/revoproto/pios_board.h
|
2013-04-25 17:26:49 +03:00 |
|
Oleg Semyonov
|
fb207bdaf7
|
OP-896: rename SensorTest to RevoProto
|
2013-04-24 00:57:33 +03:00 |
|