alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-07-01 01:11:10 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

bmx055: remove bmg160, use new bmg160 library

Browse Source 
Signed-off-by: Jon Trulson <jtrulson@ics.com>
This commit is contained in:
Jon Trulson
2017-03-23 13:13:14 -06:00
parent 8dcd22794b
commit f61b615704
12 changed files with 70 additions and 1880 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/bmx055/bmx055.hpp
View File

@ -24,6 +24,7 @@
#pragma once
#include <string>
#include <vector>
#include "bma250e.hpp"
#include "bmg160.hpp"
@ -102,7 +103,7 @@ namespace upm {
BMX055(int accelBus=BMA250E_I2C_BUS,
int accelAddr=BMA250E_DEFAULT_ADDR,
int accelCS=-1,
int gyroBus=BMG160_I2C_BUS,
int gyroBus=BMG160_DEFAULT_I2C_BUS,
int gyroAddr=BMG160_DEFAULT_ADDR,
int gyroCS=-1,
int magBus=BMM150_I2C_BUS,
@ -149,9 +150,9 @@ namespace upm {
* @param bw One of the filtering BMG160::BW_T values. The default is
* BMG160::BW_400_47.
*/
void initGyroscope(BMG160::POWER_MODE_T pwr=BMG160::POWER_MODE_NORMAL,
BMG160::RANGE_T range=BMG160::RANGE_250,
BMG160::BW_T bw=BMG160::BW_400_47);
void initGyroscope(BMG160_POWER_MODE_T pwr=BMG160_POWER_MODE_NORMAL,
BMG160_RANGE_T range=BMG160_RANGE_250,
BMG160_BW_T bw=BMG160_BW_400_47);
/**
* Initialize the magnetometer and start operation. This function
@ -211,7 +212,7 @@ namespace upm {
* @return A floating point array containing x, y, and z in
* that order.
*/
float *getGyroscope();
std::vector<float> getGyroscope();
/**
* Return magnetometer data in micro-Teslas (uT). update() must
@ -228,11 +229,10 @@ namespace upm {
/**
* Return magnetometer data in micro-Teslas (uT) in the form of a
* floating point array. The pointer returned by this function is
* statically allocated and will be rewritten on each call.
* update() must have been called prior to calling this method.
* floating point vector. update() must have been called prior to
* calling this method.
*
* @return A floating point array containing x, y, and z in
* @return A floating point vector containing x, y, and z in
* that order.
*/
float *getMagnetometer();