diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-25 21:56:56 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-29 16:33:53 +0100 |
| commit | 1cc4c808a88787b4e1156896453fa9369841bcde (patch) | |
| tree | a10030bb97976d6107483b1ed293c95d1de3aa18 /src/modules/uavcan/sensors/mag.cpp | |
| parent | 95462c5b7c357b343d39da3c5e6a49ae2055264c (diff) | |
| download | px4-firmware-1cc4c808a88787b4e1156896453fa9369841bcde.tar.gz px4-firmware-1cc4c808a88787b4e1156896453fa9369841bcde.tar.bz2 px4-firmware-1cc4c808a88787b4e1156896453fa9369841bcde.zip | |
Upgrade UAVCAN to multi pub/sub A API
Diffstat (limited to 'src/modules/uavcan/sensors/mag.cpp')
| -rw-r--r-- | src/modules/uavcan/sensors/mag.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/modules/uavcan/sensors/mag.cpp b/src/modules/uavcan/sensors/mag.cpp index 35ebee542..ee278aaf5 100644 --- a/src/modules/uavcan/sensors/mag.cpp +++ b/src/modules/uavcan/sensors/mag.cpp @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (C) 2014 PX4 Development Team. All rights reserved. + * Copyright (c) 2014, 2015 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -39,16 +39,10 @@ #include <systemlib/err.h> -static const orb_id_t MAG_TOPICS[3] = { - ORB_ID(sensor_mag0), - ORB_ID(sensor_mag1), - ORB_ID(sensor_mag2) -}; - const char *const UavcanMagnetometerBridge::NAME = "mag"; UavcanMagnetometerBridge::UavcanMagnetometerBridge(uavcan::INode& node) : -UavcanCDevSensorBridgeBase("uavcan_mag", "/dev/uavcan/mag", MAG_DEVICE_PATH, MAG_TOPICS), +UavcanCDevSensorBridgeBase("uavcan_mag", "/dev/uavcan/mag", MAG_DEVICE_PATH, ORB_ID(sensor_mag)), _sub_mag(node) { _device_id.devid_s.devtype = DRV_MAG_DEVTYPE_HMC5883; |