w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-25 05:38:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Remove some temporary code.

Browse Source
This commit is contained in:
Steve Franke 2019-03-09 10:03:01 -06:00
parent d69283b9b6
commit 7a0823301a
3 changed files with 10 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/ft4/ft4_decode.f90
View File

@ -1,5 +1,5 @@
subroutine ft4_decode(cdatetime0,tbuf,nfa,nfb,nQSOProgress,ncontest,nfqso, &
iwave,ndecodes,mycall,hiscall,cqstr,nrx,line,data_dir)
iwave,ndecodes,mycall,hiscall,cqstr,line,data_dir)
use packjt77
include 'ft4_params.f90'
@ -33,7 +33,6 @@ subroutine ft4_decode(cdatetime0,tbuf,nfa,nfb,nQSOProgress,ncontest,nfqso, &
integer apbits(2*ND)
integer apmy_ru(28),aphis_fd(28)
integer nrxx(100)
integer icos4a(0:3),icos4b(0:3),icos4c(0:3),icos4d(0:3)
integer*2 iwave(NMAX) !Generated full-length waveform
integer*1 message77(77),rvec(77),apmask(2*ND),cw(2*ND)
@ -63,7 +62,7 @@ subroutine ft4_decode(cdatetime0,tbuf,nfa,nfb,nQSOProgress,ncontest,nfqso, &
data rvec/0,1,0,0,1,0,1,0,0,1,0,1,1,1,1,0,1,0,0,0,1,0,0,1,1,0,1,1,0, &
1,0,0,1,0,1,1,0,0,0,0,1,0,0,0,1,0,1,0,0,1,1,1,1,0,0,1,0,1, &
0,1,0,1,0,1,1,0,1,1,1,1,1,0,0,0,1,0,1/
save fs,dt,tt,txt,twopi,h,one,first,nrxx,linex,apbits,nappasses,naptypes, &
save fs,dt,tt,txt,twopi,h,one,first,linex,apbits,nappasses,naptypes, &
mycall0,hiscall0,msg0,cqstr0
call clockit('ft4_deco',0)
@ -471,23 +470,6 @@ subroutine ft4_decode(cdatetime0,tbuf,nfa,nfb,nQSOProgress,ncontest,nfqso, &
linex(ndecodes)=line
if(ibest.ge.ibmax-15) msg0=message !Possible dupe candidate
!### Temporary: assume most recent decoded message conveys "hiscall". ###
i0=index(message,' ')
if(i0.ge.3 .and. i0.le.7) then
hiscall=message(i0+1:i0+6)
i1=index(hiscall,' ')
if(i1.gt.0) hiscall=hiscall(1:i1)
endif
nrx=-1
if(index(message,'CQ ').eq.1) nrx=1
if((index(message,trim(mycall)//' ').eq.1) .and. &
(index(message,' '//trim(hiscall)//' ').ge.4)) then
if(index(message,' 559 ').gt.8) nrx=2 !### Not right !
if(index(message,' R 559 ').gt.8) nrx=3 !### Not right !
if(index(message,' RR73 ').gt.8) nrx=4
endif
nrxx(ndecodes)=nrx
!###
exit
endif
@ -498,9 +480,8 @@ subroutine ft4_decode(cdatetime0,tbuf,nfa,nfb,nQSOProgress,ncontest,nfqso, &
call clockit('ft4_deco',101)
return
entry get_ft4msg(idecode,nrx,line)
entry get_ft4msg(idecode,line)
line=linex(idecode)
nrx=nrxx(idecode)
return
end subroutine ft4_decode

4
lib/ft4/ft4d.f90
View File

@ -68,9 +68,9 @@ program ft4d
i0=(n-1)*istep + 1
tbuf=(i0-1)/12000.0
call ft4_decode(cdatetime,tbuf,nfa,nfb,nQSOProgress,ncontest, &
nfqso,iwave(i0),ndecodes,mycall,hiscall,cqstr,nrx,line,data_dir)
nfqso,iwave(i0),ndecodes,mycall,hiscall,cqstr,line,data_dir)
do idecode=1,ndecodes
call get_ft4msg(idecode,nrx,line)
call get_ft4msg(idecode,line)
write(*,'(a61)') line
enddo
enddo !steps

11
widgets/mainwindow.cpp
View File

@ -171,10 +171,10 @@ extern "C" {
void ft4_decode_(char* cdatetime, float* tbuf, int* nfa, int* nfb, int* nQSOProgress,
int* nContest, int* nfqso, short int id[], int* ndecodes, char* mycall,
char* hiscall, char* cqstr, int* nrx, char* line, char* ddir, int len1,
char* hiscall, char* cqstr, char* line, char* ddir, int len1,
int len2, int len3, int len4, int len5, int len6);
void get_ft4msg_(int* idecode, int* nrx, char* line, int len);
void get_ft4msg_(int* idecode, char* line, int len);
}
@ -8707,7 +8707,6 @@ void MainWindow::ft4_rx(int k)
char line[61];
int nfqso=1500;
int ndecodes=0;
int nrx=-1;
int nfa=m_wideGraph->nStartFreq();
int nfb=m_wideGraph->Fmax();
int nQSOProgress = static_cast<int> ( m_QSOProgress );
@ -8726,10 +8725,10 @@ void MainWindow::ft4_rx(int k)
if(m_config.RTTY_Exchange()=="SCC") strncpy(cqstr,"SCC",3);
}
ft4_decode_(cdatetime,&tbuf,&nfa,&nfb,&nQSOProgress,&nContest,&nfqso,id,&ndecodes,&mycall[0],&hiscall[0],
&cqstr[0],&nrx,&line[0],&ddir[0],17,12,12,4,61,512);
&cqstr[0],&line[0],&ddir[0],17,12,12,4,61,512);
line[60]=0;
for (int idecode=1; idecode<=ndecodes; idecode++) {
get_ft4msg_(&idecode,&nrx,&line[0],61);
get_ft4msg_(&idecode,&line[0],61);
line[60]=0;
QString sline{QString::fromLatin1(line)};
DecodedText decodedtext {sline.replace(QChar::LineFeed,"")};
@ -8770,7 +8769,7 @@ void MainWindow::ft4_rx(int k)
void MainWindow::ft4_tx(int ntx)
{
if(g_iptt!=0) return; //Alreadt transmitting?
if(g_iptt!=0) return; //Already transmitting?
static char message[38];
static char msgsent[38];
QByteArray ba;