diff options
| author | Pavel Kirienko <pavel.kirienko@gmail.com> | 2015-01-26 02:34:03 +0300 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-29 16:33:53 +0100 |
| commit | 2f7a9eaf6553d7da6c5d6e9b3edf6e710b4dc292 (patch) | |
| tree | a2d4a735f4e3b526f939899832642b0d94f6f8ab /src | |
| parent | 1cc4c808a88787b4e1156896453fa9369841bcde (diff) | |
| download | px4-firmware-2f7a9eaf6553d7da6c5d6e9b3edf6e710b4dc292.tar.gz px4-firmware-2f7a9eaf6553d7da6c5d6e9b3edf6e710b4dc292.tar.bz2 px4-firmware-2f7a9eaf6553d7da6c5d6e9b3edf6e710b4dc292.zip | |
Fix for a compilation failure
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/uavcan/sensors/sensor_bridge.hpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/modules/uavcan/sensors/sensor_bridge.hpp b/src/modules/uavcan/sensors/sensor_bridge.hpp index 94e52dbe5..de130b078 100644 --- a/src/modules/uavcan/sensors/sensor_bridge.hpp +++ b/src/modules/uavcan/sensors/sensor_bridge.hpp @@ -75,8 +75,7 @@ public: /** * Sensor bridge factory. - * Creates a bridge object by its ASCII name, e.g. "gnss", "mag". - * @return nullptr if such bridge can't be created. + * Creates all known sensor bridges and puts them in the linked list. */ static void make_all(uavcan::INode &node, List<IUavcanSensorBridge*> &list); }; @@ -102,14 +101,16 @@ class UavcanCDevSensorBridgeBase : public IUavcanSensorBridge, public device::CD bool _out_of_channels = false; protected: - template <unsigned MaxChannels> + static constexpr unsigned DEFAULT_MAX_CHANNELS = 5; // 640 KB ought to be enough for anybody + UavcanCDevSensorBridgeBase(const char *name, const char *devname, const char *class_devname, - const orb_id_t orb_topic_sensor) : + const orb_id_t orb_topic_sensor, + const unsigned max_channels = DEFAULT_MAX_CHANNELS) : device::CDev(name, devname), - _max_channels(MaxChannels), + _max_channels(max_channels), _class_devname(class_devname), _orb_topic(orb_topic_sensor), - _channels(new Channel[MaxChannels]) + _channels(new Channel[max_channels]) { _device_id.devid_s.bus_type = DeviceBusType_UAVCAN; _device_id.devid_s.bus = 0; |