From 3babfffbd7004d276ce0d6d436a8285e635f9d62 Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Thu, 16 Nov 2017 21:32:07 +0000 Subject: [PATCH] Starting on code for Fox multi-sig transmissions. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8243 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- CMakeLists.txt | 1 + lib/ft8/foxgen.f90 | 103 +++++++++++++++++++++++++++++++++++++++++++++ mainwindow.cpp | 18 +++++--- 3 files changed, 115 insertions(+), 7 deletions(-) create mode 100644 lib/ft8/foxgen.f90 diff --git a/CMakeLists.txt b/CMakeLists.txt index 0540c07e7..4486200b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -439,6 +439,7 @@ set (wsjt_FSRCS lib/fmtmsg.f90 lib/foldspec9f.f90 lib/four2a.f90 + lib/ft8/foxgen.f90 lib/fqso_first.f90 lib/freqcal.f90 lib/fsk4hf/fsk4hf.f90 diff --git a/lib/ft8/foxgen.f90 b/lib/ft8/foxgen.f90 new file mode 100644 index 000000000..01c3a696f --- /dev/null +++ b/lib/ft8/foxgen.f90 @@ -0,0 +1,103 @@ +subroutine foxgen(t) + + parameter (NN=79,KK=87,NSPS=4*1920) + parameter (NWAVE=NN*NSPS,NFFT=614400,NH=NFFT/2) + character*(*) t + character*22 msg,msgsent + character*12 t1 + character*6 MyCall,MyGrid + logical bcontest + integer itone(NN) + integer*1 msgbits(KK) + integer*8 count0,count1,clkfreq + real wave(NWAVE) + real x(NFFT),y(NFFT) + real*8 dt,twopi,f0,fstep,dfreq,phi,dphi + complex cx(0:NH),cy(0:NH) + equivalence (x,cx),(y,cy) + + call system_clock(count0,clkfreq) + MyCall='KH1DX' + MyGrid='AJ10 ' + bcontest=.false. + i3bit=0 + fstep=60.d0 + dfreq=6.25d0 + dt=1.d0/48000.d0 + twopi=8.d0*atan(1.d0) + wave=0. + + m=len(t) + i=0 + i0=1 + do n=1,5 + do j=1,12 + i=i+1 + if(i.eq.m .or. ichar(t(i:i)).eq.10) then + if(i.ne.m) t1=t(i0:i-1) + if(i.eq.m) t1=t(i0:i) + i1=index(t1,' ') + msg=t1(1:i1)//MyCall//t1(i1:) + iz=len(trim(msg)) + do iter=1,5 !Collapse multiple blanks into one + ib2=index(msg(1:iz),' ') + if(ib2.lt.1) exit + msg=msg(1:ib2)//msg(ib2+2:) + iz=iz-1 + enddo + exit + endif + enddo + i0=i+1 + call genft8(msg,mygrid,bcontest,i3bit,msgsent,msgbits,itone) + + f0=1500.d0 + fstep*(n-1) + phi=0.d0 + k=0 + do j=1,NN + f=f0 + dfreq*itone(j) + dphi=twopi*f*dt + do ii=1,NSPS + k=k+1 + phi=phi+dphi + xphi=phi + wave(k)=wave(k)+sin(xphi) + enddo + enddo + + call system_clock(count1,clkfreq) + time=float(count1-count0)/float(clkfreq) !Cumulative execution time +! write(*,3001) n,k,time,msgsent +!3001 format(i1,i8,f10.6,2x,a22) + enddo + + x(1:k)=wave + x(k+1:)=0. + call four2a(x,nfft,1,-1,0) + + nadd=64 + k=0 + df=48000.0/NFFT + rewind(29) + do i=1,NH/nadd - 1 + sx=0. +! sy=0. + do j=1,nadd + k=k+1 + sx=sx + real(cx(k))**2 + aimag(cx(k))**2 +! sy=sy + real(cy(k))**2 + aimag(cy(k))**2 + enddo + freq=df*(k-nadd/2+0.5) +! write(29,1022) freq,sx,sy,db(sx)-90.0,db(sy)-90.0 +!1022 format(f10.3,2e12.3,2f10.3) + if(freq.gt.3000.0) exit + enddo + flush(29) + + call system_clock(count1,clkfreq) + time=float(count1-count0)/float(clkfreq) !Cumulative execution time +! write(*,3010) time +!3010 format('Time:',f10.6) + + return +end subroutine foxgen diff --git a/mainwindow.cpp b/mainwindow.cpp index dd279f2d7..6f318daa4 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -134,6 +134,8 @@ extern "C" { void calibrate_(char data_dir[], int* iz, double* a, double* b, double* rms, double* sigmaa, double* sigmab, int* irc, int len1); + + void foxgen_(char* tb3, int len); } int volatile itone[NUM_ISCAT_SYMBOLS]; //Audio tones for all Tx symbols @@ -3323,8 +3325,15 @@ void MainWindow::guiUpdate() } } if(m_modeTx=="FT8") { - genft8_(message, MyGrid, &bcontest, &m_i3bit, msgsent, const_cast (ft8msgbits), - const_cast (itone), 22, 6, 22); + if(m_config.bFox()) { + QString t=ui->textBrowser3->toPlainText(); + qDebug() << "aa" << m_Nslots << t; + int len=t.length(); + foxgen_(const_cast (t.toLatin1().constData()),len); + } else { + genft8_(message, MyGrid, &bcontest, &m_i3bit, msgsent, const_cast (ft8msgbits), + const_cast (itone), 22, 6, 22); + } } } msgsent[22]=0; @@ -3881,11 +3890,6 @@ void MainWindow::doubleClickOnCall(Qt::KeyboardModifiers modifiers) if(rpt.mid(0,1) != "-") t2="+" + rpt; if(t2.length()==2) t2=t2.mid(0,1) + "0" + t2.mid(1,1); t1=t1.mid(0,7) + t2; - t2.sprintf("%1d. ",m_nToBeCalled); - t1=t2 + t1; - // Possible sequence of colors: - // Queued: #99ffff - // QSO in progress: #66ff66 if(m_nToBeCalled<= m_Nslots) { ui->textBrowser3->displayFoxToBeCalled(t1,"#ffffff"); } else {