Minor changes to the MMA8451Q library.
Fork of MMA8451Q by
Diff: MMA8451Q.cpp
- Revision:
- 1:d2630136d51e
- Parent:
- 0:6149091f755d
- Child:
- 3:db7126dbd63f
--- a/MMA8451Q.cpp Thu Oct 11 10:54:16 2012 +0000 +++ b/MMA8451Q.cpp Thu Oct 11 14:26:22 2012 +0000 @@ -1,24 +1,42 @@ +/* Copyright (c) 2010-2011 mbed.org, MIT License +* +* 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 "MMA8451Q.h" -#define REG_WHO_AM_I 0x0D -#define REG_CTRL_REG_1 0x2A +#define REG_WHO_AM_I 0x0D +#define REG_CTRL_REG_1 0x2A #define REG_OUT_X_MSB 0x01 #define REG_OUT_Y_MSB 0x03 #define REG_OUT_Z_MSB 0x05 -#define UINT14_MAX 16383 +#define UINT14_MAX 16383 MMA8451Q::MMA8451Q(PinName sda, PinName scl, int addr) : m_i2c(sda, scl), m_addr(addr) { // activate the peripheral uint8_t data[2] = {REG_CTRL_REG_1, 0x01}; - write_regs(data, 2); + writeRegs(data, 2); } MMA8451Q::~MMA8451Q() { } uint8_t MMA8451Q::getWhoAmI() { uint8_t who_am_i = 0; - read_regs(REG_WHO_AM_I, &who_am_i, 1); + readRegs(REG_WHO_AM_I, &who_am_i, 1); return who_am_i; } @@ -43,7 +61,7 @@ int16_t MMA8451Q::getAccAxis(uint8_t addr) { int16_t acc; uint8_t res[2]; - read_regs(addr, res, 2); + readRegs(addr, res, 2); acc = (res[0] << 6) | (res[1] >> 2); if (acc > UINT14_MAX/2) @@ -52,12 +70,12 @@ return acc; } -void MMA8451Q::read_regs(int addr, uint8_t * data, int len) { +void MMA8451Q::readRegs(int addr, uint8_t * data, int len) { char t[1] = {addr}; m_i2c.write(m_addr, t, 1, true); m_i2c.read(m_addr, (char *)data, len); } -void MMA8451Q::write_regs(uint8_t * data, int len) { +void MMA8451Q::writeRegs(uint8_t * data, int len) { m_i2c.write(m_addr, (char *)data, len); }