diff options
author | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-24 07:41:26 +0100 |
---|---|---|
committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-11-24 07:41:26 +0100 |
commit | c37ff71e625310cdc777719a04c3702d9afa1f7f (patch) | |
tree | 714ecb7b510e7ff53080ce3f0caebe8b128a26f5 /src/drivers/device/device.h | |
parent | f36f54c621cb5b36d345c5a26f72e89fc948fa65 (diff) | |
parent | 512779907e06f059a15d54c88d71b73aad9aced0 (diff) | |
download | px4-firmware-c37ff71e625310cdc777719a04c3702d9afa1f7f.tar.gz px4-firmware-c37ff71e625310cdc777719a04c3702d9afa1f7f.tar.bz2 px4-firmware-c37ff71e625310cdc777719a04c3702d9afa1f7f.zip |
Merge remote-tracking branch 'upstream/master' into ros
Conflicts:
makefiles/config_px4fmu-v2_test.mk
Diffstat (limited to 'src/drivers/device/device.h')
-rw-r--r-- | src/drivers/device/device.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/drivers/device/device.h b/src/drivers/device/device.h index 9d684e394..67aaa0aff 100644 --- a/src/drivers/device/device.h +++ b/src/drivers/device/device.h @@ -130,7 +130,8 @@ public: enum DeviceBusType { DeviceBusType_UNKNOWN = 0, DeviceBusType_I2C = 1, - DeviceBusType_SPI = 2 + DeviceBusType_SPI = 2, + DeviceBusType_UAVCAN = 3, }; /* |