diff --git a/src/grovecircularled/grovecircularled.cxx b/src/grovecircularled/grovecircularled.cxx index 8f1797ce..e09e27fc 100644 --- a/src/grovecircularled/grovecircularled.cxx +++ b/src/grovecircularled/grovecircularled.cxx @@ -40,25 +40,8 @@ GroveCircularLED::GroveCircularLED (uint8_t di, uint8_t dcki) m_dataPinCtx(di) { 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; - } - 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); + m_clkPinCtx.useMmap(true); + m_dataPinCtx.useMmap(true); // set direction (out) error = m_clkPinCtx.dir(mraa::DIR_OUT); diff --git a/src/htu21d/htu21d.cpp b/src/htu21d/htu21d.cpp index 4d1e0bd6..0ff097c0 100644 --- a/src/htu21d/htu21d.cpp +++ b/src/htu21d/htu21d.cpp @@ -40,13 +40,6 @@ HTU21D::HTU21D(int bus, int devAddr) : m_i2ControlCtx(bus) { m_controlAddr = devAddr; 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); if (ret != mraa::SUCCESS) { @@ -217,15 +210,11 @@ HTU21D::i2cWriteReg (uint8_t reg, uint8_t value) { mraa::Result error = mraa::SUCCESS; uint8_t data[2] = { reg, value }; -<<<<<<< HEAD m_i2ControlCtx.address (m_controlAddr); error = m_i2ControlCtx.write (data, 2); -======= - mraa_i2c_address (m_i2ControlCtx, m_controlAddr); - if ( mraa_i2c_write(m_i2ControlCtx, data, 2) != MRAA_SUCCESS) + if ( error != mraa::SUCCESS) throw std::invalid_argument(std::string(__FUNCTION__) + ": mraa_i2c_write() failed"); ->>>>>>> f09bf63... htu21d: throw exception(s) on fatal errors return error; } diff --git a/src/itg3200/itg3200.cxx b/src/itg3200/itg3200.cxx index 90ea9d91..6b00cf4d 100644 --- a/src/itg3200/itg3200.cxx +++ b/src/itg3200/itg3200.cxx @@ -66,14 +66,6 @@ using namespace upm; 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_buffer[0] = ITG3200_PWR_MGM; m_buffer[1] = ITG3200_RESET; diff --git a/src/max44000/max44000.cxx b/src/max44000/max44000.cxx index 13eb43a9..eb7025d6 100644 --- a/src/max44000/max44000.cxx +++ b/src/max44000/max44000.cxx @@ -38,13 +38,6 @@ MAX44000::MAX44000 (int bus, int devAddr) : m_i2cMaxControlCtx(bus) { m_maxControlAddr = devAddr; 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); if (ret != mraa::SUCCESS) { throw std::invalid_argument(std::string(__FUNCTION__) + diff --git a/src/mhz16/mhz16.cxx b/src/mhz16/mhz16.cxx index 91b416de..8eab63e1 100644 --- a/src/mhz16/mhz16.cxx +++ b/src/mhz16/mhz16.cxx @@ -211,7 +211,7 @@ bool MHZ16::getData(int *gas, int *temp) } // will throw an exception if it fails - verifyPacket(packet); + verifyPacket(packet, sizeof(packet)); // pull out the data and return it. *gas = (packet[2] << 8) | packet[3]; diff --git a/src/mma7455/mma7455.cxx b/src/mma7455/mma7455.cxx index 0c2c5d11..371ac2f8 100644 --- a/src/mma7455/mma7455.cxx +++ b/src/mma7455/mma7455.cxx @@ -44,13 +44,6 @@ MMA7455::MMA7455 (int bus, int devAddr) : m_i2ControlCtx(bus) { m_controlAddr = devAddr; 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); if (error != mraa::SUCCESS) { throw std::runtime_error(std::string(__FUNCTION__) + @@ -152,7 +145,6 @@ short *MMA7455::readData() { #endif int -<<<<<<< HEAD MMA7455::i2cReadReg (unsigned char reg, uint8_t *buffer, int len) { if (mraa::SUCCESS != m_i2ControlCtx.address(m_controlAddr)) { 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); if (error != mraa::SUCCESS) { - hrow std::runtime_error(std::string(__FUNCTION__) + + throw std::runtime_error(std::string(__FUNCTION__) + ": mraa_i2c_address() failed"); return error; } diff --git a/src/mpl3115a2/mpl3115a2.cpp b/src/mpl3115a2/mpl3115a2.cpp index 55674d08..0ed700aa 100644 --- a/src/mpl3115a2/mpl3115a2.cpp +++ b/src/mpl3115a2/mpl3115a2.cpp @@ -45,13 +45,6 @@ MPL3115A2::MPL3115A2 (int bus, int devAddr, uint8_t mode) : m_i2ControlCtx(bus) m_controlAddr = devAddr; 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); if (ret != mraa::SUCCESS) { throw std::runtime_error(std::string(__FUNCTION__) + @@ -309,7 +302,7 @@ MPL3115A2::i2cWriteReg (uint8_t reg, uint8_t value) { m_i2ControlCtx.address (m_controlAddr); error = m_i2ControlCtx.write (data, 2); - if (error != MRAA_SUCCESS) + if (error != mraa::SUCCESS) throw std::runtime_error(std::string(__FUNCTION__) + ":mraa_i2c_write() failed"); return error; diff --git a/src/mpu9150/mpu60x0.cxx b/src/mpu9150/mpu60x0.cxx index e22e78a1..e3c53140 100644 --- a/src/mpu9150/mpu60x0.cxx +++ b/src/mpu9150/mpu60x0.cxx @@ -151,13 +151,8 @@ bool MPU60X0::writeReg(uint8_t reg, uint8_t val) mraa::Result rv; if ((rv = m_i2c.writeReg(reg, val)) != mraa::SUCCESS) { -<<<<<<< HEAD - cerr << __FUNCTION__ << ": failed:" << endl; - printError(rv); -======= throw std::runtime_error(std::string(__FUNCTION__) + ": I2c.writeReg() failed"); ->>>>>>> 9378f17... mpu9150: throw exception(s) on fatal errors return false; } diff --git a/src/my9221/my9221.cxx b/src/my9221/my9221.cxx index 78d21681..81ca508e 100644 --- a/src/my9221/my9221.cxx +++ b/src/my9221/my9221.cxx @@ -32,24 +32,10 @@ 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; - // 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) error = m_clkPinCtx.dir(mraa::DIR_OUT); if (error != mraa::SUCCESS) { diff --git a/src/nrf24l01/nrf24l01.cxx b/src/nrf24l01/nrf24l01.cxx index 8b9c98ed..168bf0b4 100644 --- a/src/nrf24l01/nrf24l01.cxx +++ b/src/nrf24l01/nrf24l01.cxx @@ -48,20 +48,6 @@ NRF24L01::init (uint8_t chip_select, uint8_t chip_enable) { m_ce = chip_enable; 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); if (error != mraa::SUCCESS) { mraa::printError (error); @@ -156,7 +142,8 @@ NRF24L01::setDataReceivedHandler (Callback *call_obj) dataReceivedHandler = &generic_callback; } #else -void setDataReceivedHandler (funcPtrVoidVoid handler) +void +NRF24L01::setDataReceivedHandler (funcPtrVoidVoid handler) { dataReceivedHandler = handler; } diff --git a/src/pn532/pn532.cxx b/src/pn532/pn532.cxx index 214aae04..b9e23b7d 100644 --- a/src/pn532/pn532.cxx +++ b/src/pn532/pn532.cxx @@ -1463,7 +1463,7 @@ void PN532::readData(uint8_t* buff, uint8_t n) memset(buf, 0, n+2); 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__) + ": mraa_i2c_address() failed"); @@ -1537,14 +1537,14 @@ void PN532::writeCommand(uint8_t* cmd, uint8_t cmdlen) buf[offset++] = ~checksum; 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__) + ": mraa_i2c_address() failed"); 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__) + ": mraa_i2c_write() failed"); diff --git a/src/st7735/st7735.cxx b/src/st7735/st7735.cxx index 94b0d788..c0aed8fc 100644 --- a/src/st7735/st7735.cxx +++ b/src/st7735/st7735.cxx @@ -54,42 +54,7 @@ ST7735::initModule () { m_height = 160; m_width = 128; - m_csLCDPinCtx = mraa_gpio_init (m_csLCD); - 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); + m_spi.frequency(15 * 1000000); error = m_csLCDPinCtx.dir(mraa::DIR_OUT); if (error != mraa::SUCCESS) { diff --git a/src/stepmotor/stepmotor.cxx b/src/stepmotor/stepmotor.cxx index 1d9262d1..6cb98d11 100644 --- a/src/stepmotor/stepmotor.cxx +++ b/src/stepmotor/stepmotor.cxx @@ -40,20 +40,6 @@ StepMotor::StepMotor (int dirPin, int stePin) m_stePin = stePin; 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); if (error != mraa::SUCCESS) { mraa::printError (error);