libupm: sync with upstream (SHA1: 1849e22)

am: 4de2569d39

Change-Id: I1324e4eed5908383f5942bb23a43890dc8554dec

1 files changed, 120 insertions, 0 deletions

diff --git a/peripheral/libupm/src/bmx055/bmc150.cxx b/peripheral/libupm/src/bmx055/bmc150.cxx
new file mode 100644
index 0000000..26d3f62
--- /dev/null
+++ b/peripheral/libupm/src/bmx055/bmc150.cxx
@@ -0,0 +1,120 @@
+/*
+ * Author: Jon Trulson <jtrulson@ics.com>
+ * Copyright (c) 2016 Intel Corporation.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#include <unistd.h>
+#include <iostream>
+#include <stdexcept>
+#include <string>
+
+#include "bmc150.hpp"
+
+using namespace upm;
+using namespace std;
+
+BMC150::BMC150(int accelBus, uint8_t accelAddr, int accelCS,
+               int magBus, uint8_t magAddr, int magCS) :
+  m_accel(0), m_mag(0)
+{
+  // if -1 is supplied as a bus for any of these, we will not
+  // instantiate them
+
+  if (accelBus >= 0)
+    m_accel = new BMA250E(accelBus, accelAddr, accelCS);
+
+  if (magBus >= 0)
+    m_mag = new BMM150(magBus, magAddr, magCS);
+
+  // now initialize them...
+  if (m_accel)
+    m_accel->init();
+
+  if (m_mag)
+    m_mag->init();
+}
+
+BMC150::~BMC150()
+{
+  if (m_accel)
+    delete m_accel;
+
+  if (m_mag)
+    delete m_mag;
+}
+
+void BMC150::initAccelerometer(BMA250E::POWER_MODE_T pwr,
+                               BMA250E::RANGE_T range,
+                               BMA250E::BW_T bw)
+{
+  if (m_accel)
+    m_accel->init(pwr, range, bw);
+}
+
+void BMC150::initMagnetometer(BMM150::USAGE_PRESETS_T usage)
+{
+  if (m_mag)
+    m_mag->init(usage);
+}
+
+void BMC150::update()
+{
+  if (m_accel)
+    m_accel->update();
+
+  if (m_mag)
+    m_mag->update();
+}
+
+void BMC150::getAccelerometer(float *x, float *y, float *z)
+{
+  if (m_accel)
+    m_accel->getAccelerometer(x, y, z);
+}
+
+float *BMC150::getAccelerometer()
+{
+  if (m_accel)
+    return m_accel->getAccelerometer();
+  else
+    {
+      static float v[3] = {0.0f, 0.0f, 0.0f};
+      return v;
+    }
+}
+
+void BMC150::getMagnetometer(float *x, float *y, float *z)
+{
+  if (m_mag)
+    m_mag->getMagnetometer(x, y, z);
+}
+
+float *BMC150::getMagnetometer()
+{
+  if (m_mag)
+    return m_mag->getMagnetometer();
+  else
+    {
+      static float v[3] = {0.0f, 0.0f, 0.0f};
+      return v;
+    }
+}