Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup

This commit is contained in:
Lorenz Meier
2013-07-18 13:28:26 +02:00
6 changed files with 62 additions and 36 deletions
+3 -2
View File
@@ -791,7 +791,8 @@ start()
prom_u prom_buf;
if (g_dev != nullptr)
errx(1, "already started");
/* if already started, the still command succeeded */
errx(0, "already started");
device::Device *interface = nullptr;
@@ -1050,4 +1051,4 @@ ms5611_main(int argc, char *argv[])
}
errx(1, "unrecognised command, try 'start', 'test', 'reset' or 'info'");
}
}