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

ublox6: switch to using new mraa_uart_get_dev_path()

Browse Source 
Signed-off-by: Jon Trulson <jtrulson@ics.com>
Signed-off-by: Zion Orent <zorent@ics.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
This commit is contained in:
Jon Trulson
2015-01-21 17:30:06 -07:00
committed by Mihai Tudor Panu
parent fec3f22765
commit 809292630f
4 changed files with 19 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ublox6/ublox6.cxx
View File

@ -29,10 +29,9 @@
using namespace upm;
using namespace std;
Ublox6::Ublox6(int uart, const char *tty) :
m_ttyFd(-1)
Ublox6::Ublox6(int uart)
{
mraa_init();
m_ttyFd = -1;
if ( !(m_uart = mraa_uart_init(uart)) )
{
@ -40,10 +39,19 @@ Ublox6::Ublox6(int uart, const char *tty) :
return;
}
// now open the tty
if ( (m_ttyFd = open(tty, O_RDWR)) == -1)
// This requires a recent MRAA (1/2015)
char *devPath = mraa_uart_get_dev_path(m_uart);
if (!devPath)
{
cerr << __FUNCTION__ << ": open of " << tty << " failed: "
cerr << __FUNCTION__ << ": mraa_uart_get_dev_path() failed" << endl;
return;
}
// now open the tty
if ( (m_ttyFd = open(devPath, O_RDWR)) == -1)
{
cerr << __FUNCTION__ << ": open of " << devPath << " failed: "
<< strerror(errno) << endl;
return;
}

3
src/ublox6/ublox6.h
View File

@ -58,9 +58,8 @@ namespace upm {
* U-BLOX 6 GPS module constructor
*
* @param uart defualt uart to use (0 or 1)
* @param tty tty device to use
*/
Ublox6(int uart, const char *tty);
Ublox6(int uart);
/**
* U-BLOX 6 GPS module Destructor