Merged master

This commit is contained in:
Lorenz Meier
2013-07-15 15:02:45 +02:00
56 changed files with 1926 additions and 958 deletions
@@ -109,7 +109,7 @@ int ar_multiplexing_init()
{
int fd;
fd = open(GPIO_DEVICE_PATH, 0);
fd = open(PX4FMU_DEVICE_PATH, 0);
if (fd < 0) {
warn("GPIO: open fail");