mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-11-21 19:55:20 -05:00
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
This commit is contained in:
parent
0f9dc17a8f
commit
a2829efcad
26
getfile.cpp
26
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
|
if((i3+i4+i5+i6+i9+i00)==-999) return 1; //Silence compiler warning
|
||||||
return 0;
|
return 0;
|
||||||
#else
|
#else
|
||||||
int iptt1,nopen1;
|
int control=TIOCM_RTS | TIOCM_DTR;
|
||||||
ptt_(nport,ntx, &iptt1, &nopen1);
|
// int control = TIOCM_RTS;
|
||||||
*iptt=iptt1;
|
static int fd;
|
||||||
*nopen=nopen1;
|
|
||||||
|
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;
|
return 0;
|
||||||
#endif
|
#endif
|
||||||
if((nport+ntx+(*iptt)==-99999)) *nopen=0; //Silence compiler warning
|
if((nport+ntx+(*iptt)==-99999)) *nopen=0; //Silence compiler warning
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
//--------------------------------------------------------------- MainWindow
|
//---------------------------------------------------------------- MainWindow
|
||||||
#include "mainwindow.h"
|
#include "mainwindow.h"
|
||||||
#include "ui_mainwindow.h"
|
#include "ui_mainwindow.h"
|
||||||
#include "devsetup.h"
|
#include "devsetup.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user