From f04b18687939117a37d0f5583728356c08dc76c4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 28 Nov 2016 09:53:19 +1100 Subject: [PATCH] HAL_PX4: fixed bug in instantiation of I2C bus threads we ended up with a thread per device instead of a thread per bus! --- libraries/AP_HAL_PX4/I2CDevice.cpp | 2 ++ libraries/AP_HAL_PX4/I2CDevice.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/AP_HAL_PX4/I2CDevice.cpp b/libraries/AP_HAL_PX4/I2CDevice.cpp index 34a9ed161a..07487ea2f4 100644 --- a/libraries/AP_HAL_PX4/I2CDevice.cpp +++ b/libraries/AP_HAL_PX4/I2CDevice.cpp @@ -23,6 +23,8 @@ namespace PX4 { uint8_t PX4::PX4_I2C::instance; +DeviceBus I2CDevice::businfo[I2CDevice::num_buses]; + /* constructor for I2C wrapper class */ diff --git a/libraries/AP_HAL_PX4/I2CDevice.h b/libraries/AP_HAL_PX4/I2CDevice.h index fd3da9660f..11f9ecf466 100644 --- a/libraries/AP_HAL_PX4/I2CDevice.h +++ b/libraries/AP_HAL_PX4/I2CDevice.h @@ -67,7 +67,7 @@ public: private: static const uint8_t num_buses = 2; - DeviceBus businfo[num_buses]; + static DeviceBus businfo[num_buses]; uint8_t _busnum; PX4_I2C _px4dev;