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 |
|
Oleg Semyonov
|
7032d2a9d6
|
Merge remote-tracking branch 'origin/next' into os/uncrustify-config
|
2013-05-01 13:31:38 +02:00 |
|
Oleg Semyonov
|
654dd051c7
|
Merge remote-tracking branch 'origin/next' into os/debug-pins
|
2013-05-01 11:13:30 +02:00 |
|
Brian Webb
|
e642183dee
|
OP-924: Any disconnect between radios causes a reset, which causes a re-configuration of I/O devices (com ports, PPM, etc). This causes problems due to certain devices (PPM in particular) not supporting re-configuration. This patch forces configuration to only happen once (on initial connection), which should fix this issue.
|
2013-05-01 02:48:47 +01:00 |
|
Oleg Semyonov
|
0394a3511c
|
Rename template files to *.template to screen from uncrustify processing
|
2013-04-30 16:54:27 +02:00 |
|
sambas
|
38d9d5dde3
|
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
Conflicts:
flight/modules/VtolPathFollower/vtolpathfollower.c
|
2013-04-28 09:46:14 +03:00 |
|
Richard Flay (Hyper)
|
80c917591e
|
Cherry-pick and hand-merge of Sami's math cleanup commit from branch sambas/diffnext: 5f3e0c3e1d
|
2013-04-28 10:45:28 +09:30 |
|
sambas
|
e3b3713139
|
HiTL simulation solution for GPS update
|
2013-04-27 16:31:37 +03:00 |
|
sambas
|
5f3e0c3e1d
|
Math cleanup
|
2013-04-27 16:30:02 +03: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 |
|
sambas
|
9fec3f5567
|
Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext
|
2013-04-27 13:39:58 +03:00 |
|
Brian Webb
|
9bb3b5870c
|
OP-914: Reformatted the RadioComBridge module.
|
2013-04-27 01:45:04 +01: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 |
|
Oleg Semyonov
|
18f7d7488b
|
Fix directory name case for merged sambas/diffnext
|
2013-04-26 17:07:44 +03:00 |
|
Oleg Semyonov
|
e2fd821e97
|
Merge remote-tracking branch 'origin/next' into sambas/diffnext
Conflicts:
make/common-defs.mk
|
2013-04-26 16:31:19 +03:00 |
|
Oleg Semyonov
|
66db978244
|
Rename Libraries->libraries, Modules->modules
|
2013-04-25 13:13:36 +03:00 |
|