mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-12-24 11:40:31 -05:00
Remove qDebug() statements.
Use ptt_() function included in getfile.cpp. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3465 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
3c2e14f838
commit
0f9dc17a8f
31
getfile.cpp
31
getfile.cpp
@ -131,7 +131,6 @@ float gran()
|
||||
|
||||
int ptt(int nport, int ntx, int* iptt, int* nopen)
|
||||
{
|
||||
// qDebug() << "getfile ptt(), line 129:" << nport << ntx << *iptt << *nopen;
|
||||
#ifdef WIN32
|
||||
static HANDLE hFile;
|
||||
char s[10];
|
||||
@ -169,34 +168,12 @@ int ptt(int nport, int ntx, int* iptt, int* nopen)
|
||||
*nopen=0;
|
||||
}
|
||||
if((i3+i4+i5+i6+i9+i00)==-999) return 1; //Silence compiler warning
|
||||
// qDebug() << "getfile ptt(), line 167:" << nport << ntx << *iptt << *nopen;
|
||||
return 0;
|
||||
#else
|
||||
// qDebug() << "getfile ptt(), line 170:" << nport << ntx << *iptt << *nopen;
|
||||
// ptt_(nport,ntx, iptt, nopen);
|
||||
|
||||
// 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;
|
||||
}
|
||||
int iptt1,nopen1;
|
||||
ptt_(nport,ntx, &iptt1, &nopen1);
|
||||
*iptt=iptt1;
|
||||
*nopen=nopen1;
|
||||
return 0;
|
||||
#endif
|
||||
if((nport+ntx+(*iptt)==-99999)) *nopen=0; //Silence compiler warning
|
||||
|
@ -10,4 +10,9 @@ float gran();
|
||||
//int ptt(int* nport, int* ntx, int* iptt);
|
||||
int ptt(int nport, int ntx, int* iptt, int* nopen);
|
||||
|
||||
extern "C" {
|
||||
int ptt_(int nport, int ntx, int* iptt, int* nopen);
|
||||
}
|
||||
|
||||
|
||||
#endif // GETFILE_H
|
||||
|
385
lib/ptt_unix.c
385
lib/ptt_unix.c
@ -1,385 +0,0 @@
|
||||
/*
|
||||
* WSJT is Copyright (c) 2001-2006 by Joseph H. Taylor, Jr., K1JT,
|
||||
* and is licensed under the GNU General Public License (GPL).
|
||||
*
|
||||
* Code used from cwdaemon for parallel port ptt only.
|
||||
*
|
||||
* cwdaemon - morse sounding daemon for the parallel or serial port
|
||||
* Copyright (C) 2002 -2005 Joop Stakenborg <pg4i@amsat.org>
|
||||
* and many authors, see the AUTHORS file.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
# if HAVE_STDIO_H
|
||||
# include <stdio.h>
|
||||
#endif
|
||||
#if STDC_HEADERS
|
||||
# include <stdlib.h>
|
||||
# include <stddef.h>
|
||||
#else
|
||||
# if HAVE_STDLIB_H
|
||||
# include <stdlib.h>
|
||||
# endif
|
||||
#endif
|
||||
#if HAVE_UNISTD_H
|
||||
# include <unistd.h>
|
||||
#endif
|
||||
#if HAVE_SYS_IOCTL_H
|
||||
# include <sys/ioctl.h>
|
||||
#endif
|
||||
//#if HAVE_FCNTL_H
|
||||
# include <fcntl.h>
|
||||
//#endif
|
||||
#include <stdio.h>
|
||||
#include <sys/ioctl.h>
|
||||
|
||||
#ifdef HAVE_LINUX_PPDEV_H
|
||||
# include <linux/ppdev.h>
|
||||
# include <linux/parport.h>
|
||||
#endif
|
||||
#ifdef HAVE_DEV_PPBUS_PPI_H
|
||||
# include <dev/ppbus/ppi.h>
|
||||
# include <dev/ppbus/ppbconf.h>
|
||||
#endif
|
||||
|
||||
int lp_reset (int fd);
|
||||
int lp_ptt (int fd, int onoff);
|
||||
|
||||
#ifdef HAVE_SYS_STAT_H
|
||||
# include <sys/stat.h>
|
||||
#endif
|
||||
#if (defined(__unix__) || defined(unix)) && !defined(USG)
|
||||
# include <sys/param.h>
|
||||
#endif
|
||||
|
||||
#include <string.h>
|
||||
/* parport functions */
|
||||
|
||||
int dev_is_parport(int fd);
|
||||
int ptt_parallel(int fd, int ntx, int *iptt);
|
||||
int ptt_serial(int fd, int *ntx, int *iptt);
|
||||
|
||||
int fd=-1; /* Used for both serial and parallel */
|
||||
|
||||
/*
|
||||
* ptt_
|
||||
*
|
||||
* generic unix PTT routine called from Fortran
|
||||
*
|
||||
* Inputs
|
||||
* unused Unused, to satisfy old windows calling convention
|
||||
* ptt_port device name serial or parallel
|
||||
* ntx pointer to fortran command on or off
|
||||
* iptt pointer to fortran command status on or off
|
||||
* Returns - non 0 if error
|
||||
*/
|
||||
|
||||
/* Tiny state machine */
|
||||
#define STATE_PORT_CLOSED 0
|
||||
#define STATE_PORT_OPEN_PARALLEL 1
|
||||
#define STATE_PORT_OPEN_SERIAL 2
|
||||
|
||||
//int ptt_(int *unused, int *ntx, int *iptt)
|
||||
int ptt_(int nport, int ntx, int *iptt, int *nopen)
|
||||
{
|
||||
static int state=0;
|
||||
char *p;
|
||||
char ptt_port[]="/dev/ttyUSB0";
|
||||
fflush(stdout);
|
||||
|
||||
// In the very unlikely event of a NULL pointer, just return.
|
||||
if (ptt_port == NULL) {
|
||||
*iptt = ntx;
|
||||
return (0);
|
||||
}
|
||||
switch (state) {
|
||||
case STATE_PORT_CLOSED:
|
||||
|
||||
// Remove trailing ' '
|
||||
if ((p = strchr(ptt_port, ' ')) != NULL)
|
||||
*p = '\0';
|
||||
|
||||
// If all that is left is a '\0' then also just return
|
||||
if (*ptt_port == '\0') {
|
||||
*iptt = ntx;
|
||||
return(0);
|
||||
}
|
||||
if ((fd = open(ptt_port, O_RDWR|O_NONBLOCK)) < 0) {
|
||||
fprintf(stderr, "Can't open %s.\n", ptt_port);
|
||||
return (1);
|
||||
}
|
||||
if (dev_is_parport(fd)) {
|
||||
state = STATE_PORT_OPEN_PARALLEL;
|
||||
lp_reset(fd);
|
||||
ptt_parallel(fd, ntx, iptt);
|
||||
} else {
|
||||
state = STATE_PORT_OPEN_SERIAL;
|
||||
ptt_serial(fd, &ntx, iptt);
|
||||
}
|
||||
break;
|
||||
|
||||
case STATE_PORT_OPEN_PARALLEL:
|
||||
ptt_parallel(fd, ntx, iptt);
|
||||
break;
|
||||
|
||||
case STATE_PORT_OPEN_SERIAL:
|
||||
ptt_serial(fd, &ntx, iptt);
|
||||
break;
|
||||
|
||||
default:
|
||||
close(fd);
|
||||
fd = -1;
|
||||
state = STATE_PORT_CLOSED;
|
||||
break;
|
||||
}
|
||||
*iptt=ntx;
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* ptt_serial
|
||||
*
|
||||
* generic serial unix PTT routine called indirectly from Fortran
|
||||
*
|
||||
* fd - already opened file descriptor
|
||||
* ntx - pointer to fortran command on or off
|
||||
* iptt - pointer to fortran command status on or off
|
||||
*/
|
||||
|
||||
int
|
||||
ptt_serial(int fd, int *ntx, int *iptt)
|
||||
{
|
||||
int control = TIOCM_RTS | TIOCM_DTR;
|
||||
|
||||
if(*ntx) {
|
||||
ioctl(fd, TIOCMBIS, &control); /* Set DTR and RTS */
|
||||
*iptt = 1;
|
||||
} else {
|
||||
ioctl(fd, TIOCMBIC, &control);
|
||||
*iptt = 0;
|
||||
}
|
||||
printf("ptt_serial: %d %d",*ntx,*iptt);
|
||||
fflush(stdout);
|
||||
return(0);
|
||||
}
|
||||
|
||||
|
||||
/* parport functions */
|
||||
|
||||
/*
|
||||
* dev_is_parport(fd):
|
||||
*
|
||||
* inputs - Already open fd
|
||||
* output - 1 if parallel port, 0 if not
|
||||
* side effects - Unfortunately, this is platform specific.
|
||||
*/
|
||||
|
||||
#if defined(HAVE_LINUX_PPDEV_H) /* Linux (ppdev) */
|
||||
|
||||
int
|
||||
dev_is_parport(int fd)
|
||||
{
|
||||
struct stat st;
|
||||
int m;
|
||||
|
||||
if ((fstat(fd, &st) == -1) ||
|
||||
((st.st_mode & S_IFMT) != S_IFCHR) ||
|
||||
(ioctl(fd, PPGETMODE, &m) == -1))
|
||||
return(0);
|
||||
|
||||
return(1);
|
||||
}
|
||||
|
||||
#elif defined(HAVE_DEV_PPBUS_PPI_H) /* FreeBSD (ppbus/ppi) */
|
||||
|
||||
int
|
||||
dev_is_parport(int fd)
|
||||
{
|
||||
struct stat st;
|
||||
unsigned char c;
|
||||
|
||||
if ((fstat(fd, &st) == -1) ||
|
||||
((st.st_mode & S_IFMT) != S_IFCHR) ||
|
||||
(ioctl(fd, PPISSTATUS, &c) == -1))
|
||||
return(0);
|
||||
|
||||
return(1);
|
||||
}
|
||||
|
||||
#else /* Fallback (nothing) */
|
||||
|
||||
int
|
||||
dev_is_parport(int fd)
|
||||
{
|
||||
return(0);
|
||||
}
|
||||
|
||||
#endif
|
||||
/* Linux wrapper around PPFCONTROL */
|
||||
#ifdef HAVE_LINUX_PPDEV_H
|
||||
static void
|
||||
parport_control (int fd, unsigned char controlbits, int values)
|
||||
{
|
||||
struct ppdev_frob_struct frob;
|
||||
frob.mask = controlbits;
|
||||
frob.val = values;
|
||||
|
||||
if (ioctl (fd, PPFCONTROL, &frob) == -1)
|
||||
{
|
||||
fprintf(stderr, "Parallel port PPFCONTROL");
|
||||
exit (1);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/* FreeBSD wrapper around PPISCTRL */
|
||||
#ifdef HAVE_DEV_PPBUS_PPI_H
|
||||
static void
|
||||
parport_control (int fd, unsigned char controlbits, int values)
|
||||
{
|
||||
unsigned char val;
|
||||
|
||||
if (ioctl (fd, PPIGCTRL, &val) == -1)
|
||||
{
|
||||
fprintf(stderr, "Parallel port PPIGCTRL");
|
||||
exit (1);
|
||||
}
|
||||
|
||||
val &= ~controlbits;
|
||||
val |= values;
|
||||
|
||||
if (ioctl (fd, PPISCTRL, &val) == -1)
|
||||
{
|
||||
fprintf(stderr, "Parallel port PPISCTRL");
|
||||
exit (1);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Initialise a parallel port, given open fd */
|
||||
int
|
||||
lp_init (int fd)
|
||||
{
|
||||
#ifdef HAVE_LINUX_PPDEV_H
|
||||
int mode;
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LINUX_PPDEV_H
|
||||
mode = PARPORT_MODE_PCSPP;
|
||||
|
||||
if (ioctl (fd, PPSETMODE, &mode) == -1)
|
||||
{
|
||||
fprintf(stderr, "Setting parallel port mode");
|
||||
close (fd);
|
||||
return(-1);
|
||||
}
|
||||
|
||||
if (ioctl (fd, PPEXCL, NULL) == -1)
|
||||
{
|
||||
fprintf(stderr, "Parallel port is already in use.\n");
|
||||
close (fd);
|
||||
return(-1);
|
||||
}
|
||||
if (ioctl (fd, PPCLAIM, NULL) == -1)
|
||||
{
|
||||
fprintf(stderr, "Claiming parallel port.\n");
|
||||
fprintf(stderr, "HINT: did you unload the lp kernel module?");
|
||||
close (fd);
|
||||
return(-1);
|
||||
}
|
||||
|
||||
/* Enable CW & PTT - /STROBE bit (pin 1) */
|
||||
parport_control (fd, PARPORT_CONTROL_STROBE, PARPORT_CONTROL_STROBE);
|
||||
#endif
|
||||
#ifdef HAVE_DEV_PPBUS_PPI_H
|
||||
parport_control (fd, STROBE, STROBE);
|
||||
#endif
|
||||
lp_reset (fd);
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* release ppdev and close port */
|
||||
int
|
||||
lp_free (int fd)
|
||||
{
|
||||
#ifdef HAVE_LINUX_PPDEV_H
|
||||
lp_reset (fd);
|
||||
|
||||
/* Disable CW & PTT - /STROBE bit (pin 1) */
|
||||
parport_control (fd, PARPORT_CONTROL_STROBE, 0);
|
||||
|
||||
ioctl (fd, PPRELEASE);
|
||||
#endif
|
||||
#ifdef HAVE_DEV_PPBUS_PPI_H
|
||||
/* Disable CW & PTT - /STROBE bit (pin 1) */
|
||||
parport_control (fd, STROBE, 0);
|
||||
#endif
|
||||
close (fd);
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* set to a known state */
|
||||
int
|
||||
lp_reset (int fd)
|
||||
{
|
||||
#if defined (HAVE_LINUX_PPDEV_H) || defined (HAVE_DEV_PPBUS_PPI_H)
|
||||
lp_ptt (fd, 0);
|
||||
#endif
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* SSB PTT keying - /INIT bit (pin 16) (inverted) */
|
||||
int
|
||||
lp_ptt (int fd, int onoff)
|
||||
{
|
||||
#ifdef HAVE_LINUX_PPDEV_H
|
||||
if (onoff == 1)
|
||||
parport_control (fd, PARPORT_CONTROL_INIT,
|
||||
PARPORT_CONTROL_INIT);
|
||||
else
|
||||
parport_control (fd, PARPORT_CONTROL_INIT, 0);
|
||||
#endif
|
||||
#ifdef HAVE_DEV_PPBUS_PPI_H
|
||||
if (onoff == 1)
|
||||
parport_control (fd, nINIT,
|
||||
nINIT);
|
||||
else
|
||||
parport_control (fd, nINIT, 0);
|
||||
#endif
|
||||
return(0);
|
||||
}
|
||||
|
||||
/*
|
||||
* ptt_parallel
|
||||
*
|
||||
* generic parallel unix PTT routine called indirectly from Fortran
|
||||
*
|
||||
* fd - already opened file descriptor
|
||||
* ntx - pointer to fortran command on or off
|
||||
* iptt - pointer to fortran command status on or off
|
||||
*/
|
||||
|
||||
int ptt_parallel(int fd, int ntx, int *iptt)
|
||||
{
|
||||
if(ntx) {
|
||||
lp_ptt(fd, 1);
|
||||
*iptt=1;
|
||||
} else {
|
||||
lp_ptt(fd, 0);
|
||||
*iptt=0;
|
||||
}
|
||||
return(0);
|
||||
}
|
@ -1594,9 +1594,7 @@ void MainWindow::guiUpdate()
|
||||
}
|
||||
|
||||
if(m_pttMethodIndex==1 or m_pttMethodIndex==2) { //DTR or RTS
|
||||
// qDebug() << "guiUpdate, line 1585:" << m_pttPort << 1 << g_iptt << g_COMportOpen;
|
||||
ptt(m_pttPort,1,&g_iptt,&g_COMportOpen);
|
||||
// qDebug() << "guiUpdate, line 1588:" << m_pttPort << 1 << g_iptt << g_COMportOpen;
|
||||
}
|
||||
if(m_pttMethodIndex==3) { //VOX
|
||||
g_iptt=1;
|
||||
@ -1797,7 +1795,6 @@ void MainWindow::guiUpdate()
|
||||
}
|
||||
|
||||
if(g_iptt!=giptt00 or g_COMportOpen!=gcomport00) {
|
||||
// qDebug() << "guiUpdate line 1788:" << g_iptt << g_COMportOpen;
|
||||
giptt00=g_iptt;
|
||||
gcomport00=g_COMportOpen;
|
||||
}
|
||||
@ -1854,7 +1851,6 @@ void MainWindow::stopTx()
|
||||
m_transmitting=false;
|
||||
ui->pbTxMode->setEnabled(true);
|
||||
g_iptt=0;
|
||||
// qDebug() << "stopTx, line 1845:" << g_iptt << g_COMportOpen;
|
||||
lab1->setStyleSheet("");
|
||||
lab1->setText("");
|
||||
ptt0Timer->start(200); //Sequencer delay
|
||||
@ -1876,7 +1872,6 @@ void MainWindow::stopTx2()
|
||||
}
|
||||
}
|
||||
if(m_pttMethodIndex==1 or m_pttMethodIndex==2) {
|
||||
// qDebug() << "stopTx2, line 1867):" << g_iptt << g_COMportOpen;
|
||||
ptt(m_pttPort,0,&g_iptt,&g_COMportOpen);
|
||||
}
|
||||
if(m_73TxDisable and m_sent73) on_stopTxButton_clicked();
|
||||
@ -2683,7 +2678,6 @@ void MainWindow::on_bandComboBox_activated(int index)
|
||||
m_dontReadFreq=true;
|
||||
ret=rig->setFreq(MHz(m_dialFreq));
|
||||
// ret=rig->setSplitFreq(MHz(m_dialFreq),RIG_VFO_B);
|
||||
qDebug() << "A" << m_dialFreq << m_txFreq;
|
||||
if(m_bSplit or m_bXIT) setXIT(m_txFreq);
|
||||
// ret=rig->setSplitFreq(MHz(m_dialFreq)+xit,RIG_VFO_B);
|
||||
|
||||
@ -2903,7 +2897,6 @@ void MainWindow::rigOpen()
|
||||
m_CATerror=true;
|
||||
}
|
||||
|
||||
// qDebug() << "A" << m_bRigOpen << m_poll << m_CATerror;
|
||||
if(m_bRigOpen) {
|
||||
if(m_poll>0) {
|
||||
ui->readFreq->setStyleSheet("QPushButton{background-color: #00ff00; \
|
||||
|
@ -379,6 +379,9 @@ void azdist_(char* MyGrid, char* HisGrid, double* utch, int* nAz, int* nEl,
|
||||
int len1, int len2);
|
||||
|
||||
void morse_(char* msg, int* icw, int* ncw, int len);
|
||||
|
||||
int ptt_(int nport, int ntx, int* iptt, int* nopen);
|
||||
|
||||
}
|
||||
|
||||
#endif // MAINWINDOW_H
|
||||
|
Loading…
Reference in New Issue
Block a user