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 99bc6611a9adc4eb0a95fd29c9311536bfc408e4 into ad15b27cb160967a33d6600fea970439b8293953

Browse Source
This commit is contained in:
Gérard Vidal 2018-04-14 17:12:11 +00:00 committed by GitHub
commit 8b1291fb82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/mhz16/mhz16.cxx
View File

@ -37,12 +37,24 @@ MHZ16::MHZ16(int uart)
{
m_ttyFd = -1;
if (uart == 99)
{
if ( !(m_uart = mraa_uart_init_raw(path)) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_uart_init_raw() failed");
return;
}
}
else
{
if ( !(m_uart = mraa_uart_init(uart)) )
{
throw std::invalid_argument(std::string(__FUNCTION__) +
": mraa_uart_init() failed");
return;
}
}
// This requires a recent MRAA (1/2015)
const char *devPath = mraa_uart_get_dev_path(m_uart);

6
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_PATH = "/dev/ttyS0";
// protocol start and end codes
const uint8_t MHZ16_START = 0x7e;
@ -80,9 +81,10 @@ namespace upm {
/**
* MHZ16 constructor
*
* @param uart Default UART to use (0 or 1)
* @param uart Default UART to use (0 or 1 or 99) 0 and 1 are default standard devices
* @param path Default PATH to device choose uart=99 to select path instead of standard device
*/
MHZ16(int uart);
MHZ16(int uart, char * path);
/**
* MHZ16 destructor