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

pn532: throw exception(s) on fatal errors

Browse Source 
Signed-off-by: Jon Trulson <jtrulson@ics.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Jon Trulson 2015-09-11 10:33:11 -06:00 committed by Mihai Tudor Panu
parent a56485f288
commit 5e9d9f4e66
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/pn532/pn532.cxx
View File

@ -30,6 +30,7 @@
#include <math.h> #include <math.h>
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <stdexcept>
#include "pn532.h" #include "pn532.h"
@ -64,8 +65,8 @@ PN532::PN532(int irq, int reset, int bus, uint8_t address):
mraa::Result rv; mraa::Result rv;
if ( (rv = m_i2c.address(m_addr)) != mraa::SUCCESS) if ( (rv = m_i2c.address(m_addr)) != mraa::SUCCESS)
{ {
cerr << "PN532: Could not initialize i2c address. " << endl; throw std::runtime_error(std::string(__FUNCTION__) +
printError(rv); ": I2c.address() failed");
return; return;
} }
@ -1462,7 +1463,13 @@ void PN532::readData(uint8_t* buff, uint8_t n)
memset(buf, 0, n+2); memset(buf, 0, n+2);
usleep(2000); usleep(2000);
m_i2c.address(m_addr); if (m_i2c.address(m_addr) != MRAA_SUCCESS)
{
throw std::runtime_error(std::string(__FUNCTION__) +
": mraa_i2c_address() failed");
return;
}
rv = m_i2c.read(buf, n + 2); rv = m_i2c.read(buf, n + 2);
if (m_pn532Debug) if (m_pn532Debug)
@ -1530,8 +1537,19 @@ void PN532::writeCommand(uint8_t* cmd, uint8_t cmdlen)
buf[offset++] = ~checksum; buf[offset++] = ~checksum;
buf[offset] = PN532_POSTAMBLE; buf[offset] = PN532_POSTAMBLE;
m_i2c.address(m_addr); if (m_i2c.address(m_addr) != MRAA_SUCCESS)
m_i2c.write(buf, cmdlen + 8 - 1); {
throw std::runtime_error(std::string(__FUNCTION__) +
": mraa_i2c_address() failed");
return;
}
if (m_i2c.write(buf, cmdlen + 8 - 1) != MRAA_SUCCESS)
{
throw std::runtime_error(std::string(__FUNCTION__) +
": mraa_i2c_write() failed");
return;
}
if (m_pn532Debug) if (m_pn532Debug)
{ {