alexey.zholtikov/upm
1
0
Fork 0
mirror of https://github.com/eclipse/upm.git synced 2025-03-15 04:57:30 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge d45f00539a493e16a86964c4c98daa680b7cb142 into 8f63914d76f8d6ff9971e3a97141012a2d78daf3

Browse Source
This commit is contained in:
Gérard Vidal 2018-04-19 15:18:03 +00:00 committed by GitHub
commit b3d79a3beb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/mhz16/mhz16.cxx
View File

@ -65,6 +65,38 @@ MHZ16::MHZ16(int uart)
}
}
MHZ16::MHZ16(char * uart_raw)
{
m_ttyFd = -1;
if ( !(m_uart = mraa_uart_init_raw(uart_raw)) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_uart_init_raw() failed");
return;
}
// This requires a recent MRAA (1/2015)
const char *devPath = mraa_uart_get_dev_path(m_uart);
if (!devPath)
{
throw std::runtime_error(std::string(__FUNCTION__) +
": mraa_uart_get_dev_path() failed");
return;
}
// now open the tty
if ( (m_ttyFd = open(devPath, O_RDWR)) == -1)
{
throw std::runtime_error(std::string(__FUNCTION__) +
": open of " +
string(devPath) + " failed: " +
string(strerror(errno)));
return;
}
}
MHZ16::~MHZ16()
{
if (m_ttyFd != -1)

8
src/mhz16/mhz16.hpp
View File

@ -41,6 +41,7 @@
#include <mraa/uart.h>
const int MHZ16_DEFAULT_UART = 0;
const char * MHZ16_DEFAULT_UART_RAW="/dev/ttyS0";
// protocol start and end codes
const uint8_t MHZ16_START = 0x7e;
@ -84,6 +85,13 @@ namespace upm {
*/
MHZ16(int uart);
/**
* MHZ16 constructor
*
* @param uart File path (/dev/ttyXXX to uart)
*/
MHZ16(char * uart_raw);
/**
* MHZ16 destructor
*/