Raspberries/upm
Public Access
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed commented code

Browse Source 
Ran clang-format on modified files

Signed-off-by: Serban Waltter <serban.waltter@rinftech.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Serban Waltter
2018-07-12 16:16:45 +03:00
committed by Mihai Tudor Panu
parent 664c6dd8c6
commit 57c0c8c235
9 changed files with 177 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/lidarlitev3/lidarlitev3.cxx
View File

@@ -24,16 +24,17 @@
*/
#include <iostream>
#include <string>
#include <stdexcept>
#include <unistd.h>
#include <stdlib.h>
#include <string>
#include <unistd.h>
#include "lidarlitev3.hpp"
using namespace upm;
LIDARLITEV3::LIDARLITEV3 (int bus, int devAddr) : m_i2ControlCtx(bus) {
LIDARLITEV3::LIDARLITEV3(int bus, int devAddr) : m_i2ControlCtx(bus)
{
m_name = "LIDARLITEV3";
m_controlAddr = devAddr;
@@ -41,40 +42,40 @@ LIDARLITEV3::LIDARLITEV3 (int bus, int devAddr) : m_i2ControlCtx(bus) {
mraa::Result ret = m_i2ControlCtx.address(m_controlAddr);
if (ret != mraa::SUCCESS) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_address() failed");
throw std::invalid_argument(std::string(__FUNCTION__) + ": mraa_i2c_address() failed");
}
}
float
LIDARLITEV3::getDistance () {
if(i2cWriteReg(ACQ_COMMAND, 0x04) < 0)
LIDARLITEV3::getDistance()
{
if (i2cWriteReg(ACQ_COMMAND, 0x04) < 0)
return -1;
return read(0x8f,true);
return read(0x8f, true);
}
uint16_t
LIDARLITEV3::read(int reg, bool monitorBusyFlag) {
int busyFlag = 0; // busyFlag monitors when the device is done with a measurement
LIDARLITEV3::read(int reg, bool monitorBusyFlag)
{
int busyFlag = 0; // busyFlag monitors when the device is done with a measurement
int busyCounter = 0; // busyCounter counts number of times busy flag is checked, for timeout
uint8_t data;
uint16_t distance;
if(monitorBusyFlag) {
if (monitorBusyFlag) {
busyFlag = 1; // Begin read immediately if not monitoring busy flag
}
while(busyFlag != 0) { // Loop until device is not busy
while (busyFlag != 0) { // Loop until device is not busy
// Read status register to check busy flag
data = i2cReadReg_8 (0x01); // Read register 0x01
busyFlag = data & 1; // Assign the LSB of the status register to busyFlag
data = i2cReadReg_8(0x01); // Read register 0x01
busyFlag = data & 1; // Assign the LSB of the status register to busyFlag
busyCounter++; // Increment busyCounter for timeout
// Handle timeout condition, exit while loop and goto bailout
if(busyCounter > 9999) {
if (busyCounter > 9999) {
goto timeout;
}
}
@@ -85,22 +86,22 @@ LIDARLITEV3::read(int reg, bool monitorBusyFlag) {
}
// timeout reports error
if(busyCounter > 9999) {
timeout:
if (busyCounter > 9999) {
timeout:
busyCounter = 0;
throw std::invalid_argument(std::string(__FUNCTION__) +
": Read timeout");
throw std::invalid_argument(std::string(__FUNCTION__) + ": Read timeout");
}
return distance;
}
uint16_t
LIDARLITEV3::i2cReadReg_16 (int reg) {
LIDARLITEV3::i2cReadReg_16(int reg)
{
uint16_t data;
m_i2ControlCtx.writeByte(reg);
m_i2ControlCtx.read((uint8_t *)&data, 0x2);
m_i2ControlCtx.read((uint8_t*) &data, 0x2);
uint8_t high = (data & 0xFF00) >> 8;
data = (data << 8) & 0xFF00;
@@ -110,7 +111,8 @@ LIDARLITEV3::i2cReadReg_16 (int reg) {
}
uint8_t
LIDARLITEV3::i2cReadReg_8 (int reg) {
LIDARLITEV3::i2cReadReg_8(int reg)
{
uint8_t data;
m_i2ControlCtx.writeByte(reg);
@@ -121,14 +123,14 @@ LIDARLITEV3::i2cReadReg_8 (int reg) {
}
mraa::Result
LIDARLITEV3::i2cWriteReg (uint8_t reg, uint8_t value) {
LIDARLITEV3::i2cWriteReg(uint8_t reg, uint8_t value)
{
mraa::Result error = mraa::SUCCESS;
uint8_t data[2] = { reg, value };
error = m_i2ControlCtx.write (data, 2);
if ( error != mraa::SUCCESS)
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_write() failed");
error = m_i2ControlCtx.write(data, 2);
if (error != mraa::SUCCESS)
throw std::invalid_argument(std::string(__FUNCTION__) + ": mraa_i2c_write() failed");
return error;
}