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

misc: Minor fixes due to previous rebase

Browse Source 
Signed-off-by: Andrei Vasiliu <andrei.vasiliu@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Andrei Vasiliu 2015-09-18 16:33:53 +03:00 committed by Mihai Tudor Panu
parent 428bac360b
commit 5e72c4febd
13 changed files with 14 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/grovecircularled/grovecircularled.cxx
View File

@ -40,25 +40,8 @@ GroveCircularLED::GroveCircularLED (uint8_t di, uint8_t dcki)
m_dataPinCtx(di) { m_dataPinCtx(di) {
mraa::Result error = mraa::SUCCESS; mraa::Result error = mraa::SUCCESS;
// init clock context m_clkPinCtx.useMmap(true);
m_clkPinCtx = mraa_gpio_init(dcki); m_dataPinCtx.useMmap(true);
if (m_clkPinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(dcki) failed, invalid pin?");
return;
}
mraa_gpio_use_mmaped(m_clkPinCtx, 1);
// init data context
m_dataPinCtx = mraa_gpio_init(di);
if (m_dataPinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(di) failed, invalid pin?");
return;
}
m_clkPinCtx.useMmap(true);
m_dataPinCtx.useMmap(true);
// set direction (out) // set direction (out)
error = m_clkPinCtx.dir(mraa::DIR_OUT); error = m_clkPinCtx.dir(mraa::DIR_OUT);

13
src/htu21d/htu21d.cpp
View File

@ -40,13 +40,6 @@ HTU21D::HTU21D(int bus, int devAddr) : m_i2ControlCtx(bus) {
m_controlAddr = devAddr; m_controlAddr = devAddr;
m_bus = bus; m_bus = bus;
if ( (m_i2ControlCtx == NULL) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_init() failed");
return;
}
mraa::Result ret = m_i2ControlCtx.address(m_controlAddr); mraa::Result ret = m_i2ControlCtx.address(m_controlAddr);
if (ret != mraa::SUCCESS) { if (ret != mraa::SUCCESS) {
@ -217,15 +210,11 @@ HTU21D::i2cWriteReg (uint8_t reg, uint8_t value) {
mraa::Result error = mraa::SUCCESS; mraa::Result error = mraa::SUCCESS;
uint8_t data[2] = { reg, value }; uint8_t data[2] = { reg, value };
<<<<<<< HEAD
m_i2ControlCtx.address (m_controlAddr); m_i2ControlCtx.address (m_controlAddr);
error = m_i2ControlCtx.write (data, 2); error = m_i2ControlCtx.write (data, 2);
======= if ( error != mraa::SUCCESS)
mraa_i2c_address (m_i2ControlCtx, m_controlAddr);
if ( mraa_i2c_write(m_i2ControlCtx, data, 2) != MRAA_SUCCESS)
throw std::invalid_argument(std::string(__FUNCTION__) + throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_write() failed"); ": mraa_i2c_write() failed");
>>>>>>> f09bf63... htu21d: throw exception(s) on fatal errors
return error; return error;
} }

8
src/itg3200/itg3200.cxx
View File

@ -66,14 +66,6 @@ using namespace upm;
Itg3200::Itg3200(int bus) : m_i2c(bus) Itg3200::Itg3200(int bus) : m_i2c(bus)
{ {
//init bus and reset chip
if ( !(m_i2c = mraa_i2c_init(bus)) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_init() failed");
return;
}
m_i2c.address(ITG3200_I2C_ADDR); m_i2c.address(ITG3200_I2C_ADDR);
m_buffer[0] = ITG3200_PWR_MGM; m_buffer[0] = ITG3200_PWR_MGM;
m_buffer[1] = ITG3200_RESET; m_buffer[1] = ITG3200_RESET;

7
src/max44000/max44000.cxx
View File

@ -38,13 +38,6 @@ MAX44000::MAX44000 (int bus, int devAddr) : m_i2cMaxControlCtx(bus) {
m_maxControlAddr = devAddr; m_maxControlAddr = devAddr;
m_bus = bus; m_bus = bus;
if ( !(m_i2cMaxControlCtx = mraa_i2c_init(m_bus)) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_init() failed");
return;
}
mraa::Result ret = m_i2cMaxControlCtx.address(m_maxControlAddr); mraa::Result ret = m_i2cMaxControlCtx.address(m_maxControlAddr);
if (ret != mraa::SUCCESS) { if (ret != mraa::SUCCESS) {
throw std::invalid_argument(std::string(__FUNCTION__) + throw std::invalid_argument(std::string(__FUNCTION__) +

2
src/mhz16/mhz16.cxx
View File

@ -211,7 +211,7 @@ bool MHZ16::getData(int *gas, int *temp)
} }
// will throw an exception if it fails // will throw an exception if it fails
verifyPacket(packet); verifyPacket(packet, sizeof(packet));
// pull out the data and return it. // pull out the data and return it.
*gas = (packet[2] << 8) | packet[3]; *gas = (packet[2] << 8) | packet[3];

10
src/mma7455/mma7455.cxx
View File

@ -44,13 +44,6 @@ MMA7455::MMA7455 (int bus, int devAddr) : m_i2ControlCtx(bus) {
m_controlAddr = devAddr; m_controlAddr = devAddr;
m_bus = bus; m_bus = bus;
if ( !(m_i2ControlCtx = mraa_i2c_init(m_bus)) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_init() failed");
return;
}
mraa::Result error = m_i2ControlCtx.address(m_controlAddr); mraa::Result error = m_i2ControlCtx.address(m_controlAddr);
if (error != mraa::SUCCESS) { if (error != mraa::SUCCESS) {
throw std::runtime_error(std::string(__FUNCTION__) + throw std::runtime_error(std::string(__FUNCTION__) +
@ -152,7 +145,6 @@ short *MMA7455::readData() {
#endif #endif
int int
<<<<<<< HEAD
MMA7455::i2cReadReg (unsigned char reg, uint8_t *buffer, int len) { MMA7455::i2cReadReg (unsigned char reg, uint8_t *buffer, int len) {
if (mraa::SUCCESS != m_i2ControlCtx.address(m_controlAddr)) { if (mraa::SUCCESS != m_i2ControlCtx.address(m_controlAddr)) {
throw std::runtime_error(std::string(__FUNCTION__) + throw std::runtime_error(std::string(__FUNCTION__) +
@ -179,7 +171,7 @@ MMA7455::i2cWriteReg (unsigned char reg, uint8_t *buffer, int len) {
error = m_i2ControlCtx.address (m_controlAddr); error = m_i2ControlCtx.address (m_controlAddr);
if (error != mraa::SUCCESS) { if (error != mraa::SUCCESS) {
hrow std::runtime_error(std::string(__FUNCTION__) + throw std::runtime_error(std::string(__FUNCTION__) +
": mraa_i2c_address() failed"); ": mraa_i2c_address() failed");
return error; return error;
} }

9
src/mpl3115a2/mpl3115a2.cpp
View File

@ -45,13 +45,6 @@ MPL3115A2::MPL3115A2 (int bus, int devAddr, uint8_t mode) : m_i2ControlCtx(bus)
m_controlAddr = devAddr; m_controlAddr = devAddr;
m_bus = bus; m_bus = bus;
if ( !(m_i2ControlCtx = mraa_i2c_init(m_bus)) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_i2c_init() failed");
return;
}
mraa::Result ret = m_i2ControlCtx.address(m_controlAddr); mraa::Result ret = m_i2ControlCtx.address(m_controlAddr);
if (ret != mraa::SUCCESS) { if (ret != mraa::SUCCESS) {
throw std::runtime_error(std::string(__FUNCTION__) + throw std::runtime_error(std::string(__FUNCTION__) +
@ -309,7 +302,7 @@ MPL3115A2::i2cWriteReg (uint8_t reg, uint8_t value) {
m_i2ControlCtx.address (m_controlAddr); m_i2ControlCtx.address (m_controlAddr);
error = m_i2ControlCtx.write (data, 2); error = m_i2ControlCtx.write (data, 2);
if (error != MRAA_SUCCESS) if (error != mraa::SUCCESS)
throw std::runtime_error(std::string(__FUNCTION__) + throw std::runtime_error(std::string(__FUNCTION__) +
":mraa_i2c_write() failed"); ":mraa_i2c_write() failed");
return error; return error;

5
src/mpu9150/mpu60x0.cxx
View File

@ -151,13 +151,8 @@ bool MPU60X0::writeReg(uint8_t reg, uint8_t val)
mraa::Result rv; mraa::Result rv;
if ((rv = m_i2c.writeReg(reg, val)) != mraa::SUCCESS) if ((rv = m_i2c.writeReg(reg, val)) != mraa::SUCCESS)
{ {
<<<<<<< HEAD
cerr << __FUNCTION__ << ": failed:" << endl;
printError(rv);
=======
throw std::runtime_error(std::string(__FUNCTION__) + throw std::runtime_error(std::string(__FUNCTION__) +
": I2c.writeReg() failed"); ": I2c.writeReg() failed");
>>>>>>> 9378f17... mpu9150: throw exception(s) on fatal errors
return false; return false;
} }

18
src/my9221/my9221.cxx
View File

@ -32,24 +32,10 @@
using namespace upm; using namespace upm;
MY9221::MY9221 (uint8_t di, uint8_t dcki) { MY9221::MY9221 (uint8_t di, uint8_t dcki)
: m_clkPinCtx(dcki), m_dataPinCtx(di) {
mraa::Result error = mraa::SUCCESS; mraa::Result error = mraa::SUCCESS;
// init clock context
m_clkPinCtx = mraa_gpio_init(dcki);
if (m_clkPinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(dcki) failed, invalid pin?");
return;
}
// init data context
m_dataPinCtx = mraa_gpio_init(di);
if (m_dataPinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(di) failed, invalid pin?");
return;
}
// set direction (out) // set direction (out)
error = m_clkPinCtx.dir(mraa::DIR_OUT); error = m_clkPinCtx.dir(mraa::DIR_OUT);
if (error != mraa::SUCCESS) { if (error != mraa::SUCCESS) {

17
src/nrf24l01/nrf24l01.cxx
View File

@ -48,20 +48,6 @@ NRF24L01::init (uint8_t chip_select, uint8_t chip_enable) {
m_ce = chip_enable; m_ce = chip_enable;
m_channel = 99; m_channel = 99;
m_csnPinCtx = mraa_gpio_init (m_csn);
if (m_csnPinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(csn) failed, invalid pin?");
return;
}
m_cePinCtx = mraa_gpio_init (m_ce);
if (m_cePinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(ce) failed, invalid pin?");
return;
}
error = m_csnPinCtx.dir(mraa::DIR_OUT); error = m_csnPinCtx.dir(mraa::DIR_OUT);
if (error != mraa::SUCCESS) { if (error != mraa::SUCCESS) {
mraa::printError (error); mraa::printError (error);
@ -156,7 +142,8 @@ NRF24L01::setDataReceivedHandler (Callback *call_obj)
dataReceivedHandler = &generic_callback; dataReceivedHandler = &generic_callback;
} }
#else #else
void setDataReceivedHandler (funcPtrVoidVoid handler) void
NRF24L01::setDataReceivedHandler (funcPtrVoidVoid handler)
{ {
dataReceivedHandler = handler; dataReceivedHandler = handler;
} }

6
src/pn532/pn532.cxx
View File

@ -1463,7 +1463,7 @@ void PN532::readData(uint8_t* buff, uint8_t n)
memset(buf, 0, n+2); memset(buf, 0, n+2);
usleep(2000); usleep(2000);
if (m_i2c.address(m_addr) != MRAA_SUCCESS) if (m_i2c.address(m_addr) != mraa::SUCCESS)
{ {
throw std::runtime_error(std::string(__FUNCTION__) + throw std::runtime_error(std::string(__FUNCTION__) +
": mraa_i2c_address() failed"); ": mraa_i2c_address() failed");
@ -1537,14 +1537,14 @@ void PN532::writeCommand(uint8_t* cmd, uint8_t cmdlen)
buf[offset++] = ~checksum; buf[offset++] = ~checksum;
buf[offset] = PN532_POSTAMBLE; buf[offset] = PN532_POSTAMBLE;
if (m_i2c.address(m_addr) != MRAA_SUCCESS) if (m_i2c.address(m_addr) != mraa::SUCCESS)
{ {
throw std::runtime_error(std::string(__FUNCTION__) + throw std::runtime_error(std::string(__FUNCTION__) +
": mraa_i2c_address() failed"); ": mraa_i2c_address() failed");
return; return;
} }
if (m_i2c.write(buf, cmdlen + 8 - 1) != MRAA_SUCCESS) if (m_i2c.write(buf, cmdlen + 8 - 1) != mraa::SUCCESS)
{ {
throw std::runtime_error(std::string(__FUNCTION__) + throw std::runtime_error(std::string(__FUNCTION__) +
": mraa_i2c_write() failed"); ": mraa_i2c_write() failed");

37
src/st7735/st7735.cxx
View File

@ -54,42 +54,7 @@ ST7735::initModule () {
m_height = 160; m_height = 160;
m_width = 128; m_width = 128;
m_csLCDPinCtx = mraa_gpio_init (m_csLCD); m_spi.frequency(15 * 1000000);
if (m_csLCDPinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(csLCD) failed, invalid pin?");
return;
}
m_cSDPinCtx = mraa_gpio_init (m_cSD);
if (m_cSDPinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(cSD) failed, invalid pin?");
return;
}
m_rSTPinCtx = mraa_gpio_init (m_rST);
if (m_rSTPinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(rST) failed, invalid pin?");
return;
}
m_rSPinCtx = mraa_gpio_init (m_rS);
if (m_rSPinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init(rS) failed, invalid pin?");
return;
}
if ( !(m_spi = mraa_spi_init (0)) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_spi_init() failed");
return;
}
mraa_spi_frequency(m_spi, 15 * 1000000);
error = m_csLCDPinCtx.dir(mraa::DIR_OUT); error = m_csLCDPinCtx.dir(mraa::DIR_OUT);
if (error != mraa::SUCCESS) { if (error != mraa::SUCCESS) {

14
src/stepmotor/stepmotor.cxx
View File

@ -40,20 +40,6 @@ StepMotor::StepMotor (int dirPin, int stePin)
m_stePin = stePin; m_stePin = stePin;
m_dirPin = dirPin; m_dirPin = dirPin;
m_pwmStepContext = mraa_pwm_init (m_stePin);
if (m_pwmStepContext == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_pwm_init() failed, invalid pin?");
return;
}
m_dirPinCtx = mraa_gpio_init (m_dirPin);
if (m_dirPinCtx == NULL) {
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_gpio_init() failed, invalid pin?");
return;
}
error = m_dirPinCtx.dir (mraa::DIR_OUT); error = m_dirPinCtx.dir (mraa::DIR_OUT);
if (error != mraa::SUCCESS) { if (error != mraa::SUCCESS) {
mraa::printError (error); mraa::printError (error);