From a2829efcad11700a227b87383e45498827f130b8 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 8 Jul 2013 23:58:19 +0000 Subject: [PATCH] Oops! I committed the wrong version of getfile.cpp. Now OK. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3466 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- getfile.cpp | 26 ++++++++++++++++++++++---- mainwindow.cpp | 2 +- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/getfile.cpp b/getfile.cpp index 7db8f1a66..ecc7bbb65 100644 --- a/getfile.cpp +++ b/getfile.cpp @@ -170,10 +170,28 @@ int ptt(int nport, int ntx, int* iptt, int* nopen) if((i3+i4+i5+i6+i9+i00)==-999) return 1; //Silence compiler warning return 0; #else - int iptt1,nopen1; - ptt_(nport,ntx, &iptt1, &nopen1); - *iptt=iptt1; - *nopen=nopen1; + int control=TIOCM_RTS | TIOCM_DTR; +// int control = TIOCM_RTS; + static int fd; + + if(*nopen==0) { + fd=open("/dev/ttyUSB0",O_RDWR | O_NONBLOCK); + if(fd<0) { + return -1; + } + *nopen=1; + } + + if(ntx) { + ioctl(fd, TIOCMBIS, &control); + *iptt=1; + *nopen=1; + } else { + ioctl(fd, TIOCMBIC, &control); + close(fd); + *iptt=0; + *nopen=0; + } return 0; #endif if((nport+ntx+(*iptt)==-99999)) *nopen=0; //Silence compiler warning diff --git a/mainwindow.cpp b/mainwindow.cpp index ba6f1cab2..330352509 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -//--------------------------------------------------------------- MainWindow +//---------------------------------------------------------------- MainWindow #include "mainwindow.h" #include "ui_mainwindow.h" #include "devsetup.h"