diff options
| author | px4dev <px4@purgatory.org> | 2013-07-07 17:53:55 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-07-07 17:53:55 -0700 |
| commit | b4029dd824cec7a0b53c62e960f80d90ddc6e13c (patch) | |
| tree | 2bae71f23af17bb0d9de26a914c859ec9af1e010 /src/drivers/px4io/px4io.cpp | |
| parent | 43f1843cc750fcef07122feaeca07863ed28c036 (diff) | |
| download | px4-firmware-b4029dd824cec7a0b53c62e960f80d90ddc6e13c.tar.gz px4-firmware-b4029dd824cec7a0b53c62e960f80d90ddc6e13c.tar.bz2 px4-firmware-b4029dd824cec7a0b53c62e960f80d90ddc6e13c.zip | |
Pull v2 pieces up to build with the merge
Diffstat (limited to 'src/drivers/px4io/px4io.cpp')
| -rw-r--r-- | src/drivers/px4io/px4io.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/drivers/px4io/px4io.cpp b/src/drivers/px4io/px4io.cpp index 15e213afb..29624018f 100644 --- a/src/drivers/px4io/px4io.cpp +++ b/src/drivers/px4io/px4io.cpp @@ -1604,9 +1604,9 @@ start(int argc, char *argv[]) PX4IO_interface *interface; -#if defined(CONFIG_ARCH_BOARD_PX4FMUV2) +#if defined(CONFIG_ARCH_BOARD_PX4FMU_V2) interface = io_serial_interface(); -#elif defined(CONFIG_ARCH_BOARD_PX4FMU) +#elif defined(CONFIG_ARCH_BOARD_PX4FMU_V1) interface = io_i2c_interface(PX4_I2C_BUS_ONBOARD, PX4_I2C_OBDEV_PX4IO); #else # error Unknown board - cannot select interface. @@ -1741,9 +1741,9 @@ if_test(unsigned mode) { PX4IO_interface *interface; -#if defined(CONFIG_ARCH_BOARD_PX4FMUV2) +#if defined(CONFIG_ARCH_BOARD_PX4FMU_V2) interface = io_serial_interface(); -#elif defined(CONFIG_ARCH_BOARD_PX4FMU) +#elif defined(CONFIG_ARCH_BOARD_PX4FMU_V1) interface = io_i2c_interface(PX4_I2C_BUS_ONBOARD, PX4_I2C_OBDEV_PX4IO); #else # error Unknown board - cannot select interface. |