From 985c5f4d732b1fbcb189aac13d35753851ce4a31 Mon Sep 17 00:00:00 2001
From: Jake Dahl <jacob.dahl@tealdrones.com>
Date: Wed, 10 Oct 2018 11:35:53 -0600
Subject: [PATCH] changed I2C init() to a public function. Removed init() from
constructor of SMBus base class
---
src/lib/drivers/device/nuttx/I2C.hpp | 4 ++--
src/lib/drivers/smbus/SMBus.cpp | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/lib/drivers/device/nuttx/I2C.hpp b/src/lib/drivers/device/nuttx/I2C.hpp
index 2c3bafb6b5..70383b5c35 100644
--- a/src/lib/drivers/device/nuttx/I2C.hpp
+++ b/src/lib/drivers/device/nuttx/I2C.hpp
@@ -55,6 +55,8 @@ class __EXPORT I2C : public CDev
public:
+ virtual int init();
+
static int set_bus_clock(unsigned bus, unsigned clock_hz);
static unsigned int _bus_clocks[BOARD_NUMBER_I2C_BUSES];
@@ -78,8 +80,6 @@ protected:
I2C(const char *name, const char *devname, int bus, uint16_t address, uint32_t frequency);
virtual ~I2C();
- virtual int init();
-
/**
* Check for the presence of the device on the bus.
*/
diff --git a/src/lib/drivers/smbus/SMBus.cpp b/src/lib/drivers/smbus/SMBus.cpp
index 3d407ad95b..c04fedcacf 100644
--- a/src/lib/drivers/smbus/SMBus.cpp
+++ b/src/lib/drivers/smbus/SMBus.cpp
@@ -36,7 +36,6 @@
SMBus::SMBus(int bus_num, uint16_t address) :
I2C("BATT_SMBUS_I2C", nullptr, bus_num, address, 100000)
{
- init();
}
SMBus::~SMBus()
--
GitLab