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

wt5001: 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:41:35 -07:00 committed by Mihai Tudor Panu
parent 809292630f
commit 328b7638ad
3 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
examples/wt5001.cxx
View File

@ -43,24 +43,10 @@ void printUsage(char *progname)
int main (int argc, char **argv) int main (int argc, char **argv)
{ {
//! [Interesting] //! [Interesting]
// Instantiate a WT5001 serial MP3 player on uart 0 (/dev/ttyS0). This // Instantiate a WT5001 serial MP3 player on uart 0.
// works for the galileo G2.
// The Edison uses a different serial port, /dev/ttyMFD1, so if you
// are using this example on an Edison board, set the environment
// variable WT5001_SERIAL_PORT to specify the proper port before
// running this example,
// eg: 'WT5001_SERIAL_PORT=/dev/ttyMFD1 ./wt5001-example'
// This example was tested on the Grove Serial MP3 module. // This example was tested on the Grove Serial MP3 module.
const char *defaultPort = "/dev/ttyS0"; upm::WT5001* mp3 = new upm::WT5001(0);
char *port = getenv("WT5001_SERIAL_PORT");
if (port)
defaultPort = port;
upm::WT5001* mp3 = new upm::WT5001(0, defaultPort);
int cmd = -1; int cmd = -1;
if (argc > 1) if (argc > 1)

20
src/wt5001/wt5001.cxx
View File

@ -31,10 +31,9 @@ using namespace std;
static const int defaultDelay = 100; // max wait time for read static const int defaultDelay = 100; // max wait time for read
WT5001::WT5001(int uart, const char *tty) : WT5001::WT5001(int uart)
m_ttyFd(-1)
{ {
mraa_init(); m_ttyFd = -1;
if ( !(m_uart = mraa_uart_init(uart)) ) if ( !(m_uart = mraa_uart_init(uart)) )
{ {
@ -42,10 +41,19 @@ WT5001::WT5001(int uart, const char *tty) :
return; return;
} }
// now open the tty // This requires a recent MRAA (1/2015)
if ( (m_ttyFd = open(tty, O_RDWR)) == -1) 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; << strerror(errno) << endl;
return; return;
} }

3
src/wt5001/wt5001.h
View File

@ -110,9 +110,8 @@ namespace upm {
* WT5001 Serial MP3 module constructor * WT5001 Serial MP3 module constructor
* *
* @param uart default uart to use (0 or 1) * @param uart default uart to use (0 or 1)
* @param tty tty device to use
*/ */
WT5001(int uart, const char *tty); WT5001(int uart);
/** /**
* WT5001 Serial MP3 module Destructor * WT5001 Serial MP3 module Destructor