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

This commit is contained in:
Lorenz Meier
2013-07-19 12:53:37 +02:00
26 changed files with 721 additions and 162 deletions
+1 -1
View File
@@ -194,7 +194,7 @@ __EXPORT int nsh_archinitialize(void)
/* initial LED state */
drv_led_start();
led_off(LED_AMBER);
led_on(LED_BLUE);
led_off(LED_BLUE);
/* Configure SPI-based devices */
+2 -1
View File
@@ -1221,7 +1221,8 @@ start()
int fd;
if (g_dev != nullptr)
errx(1, "already started");
/* if already started, the still command succeeded */
errx(0, "already started");
/* create the driver, attempt expansion bus first */
g_dev = new HMC5883(PX4_I2C_BUS_EXPANSION);
+2 -1
View File
@@ -1063,7 +1063,8 @@ start()
int fd;
if (g_dev != nullptr)
errx(1, "already started");
/* if already started, the still command succeeded */
errx(0, "already started");
/* create the driver */
g_dev = new MPU6000(1 /* XXX magic number */, (spi_dev_e)PX4_SPIDEV_MPU);
+2 -1
View File
@@ -969,7 +969,8 @@ start()
int fd;
if (g_dev != nullptr)
errx(1, "already started");
/* if already started, the still command succeeded */
errx(0, "already started");
/* create the driver */
g_dev = new MS5611(MS5611_BUS);