w4kek
/
WSJT-X
mirror of https://github.com/saitohirga/WSJT-X.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Further progress with fox-mode coding. Not finished yet! 

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8289 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-12-04 18:58:38 +00:00
parent 3acb75bb41
commit 5d0236755d
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
commons.h
View File

@ -82,8 +82,9 @@ extern struct {
extern struct { extern struct {
float wave[606720]; float wave[606720];
int nslots; int nslots;
char cmsg[5][32]; int i3bit[5];
char cmsg[5][32];
} foxcom_; } foxcom_;
#ifdef __cplusplus #ifdef __cplusplus

3
lib/ft8/foxgen.f90
View File

@ -11,7 +11,7 @@ subroutine foxgen()
real x(NFFT),y(NFFT) real x(NFFT),y(NFFT)
real*8 dt,twopi,f0,fstep,dfreq,phi,dphi real*8 dt,twopi,f0,fstep,dfreq,phi,dphi
complex cx(0:NH),cy(0:NH) complex cx(0:NH),cy(0:NH)
common/foxcom/wave(NWAVE),nslots,cmsg(5) common/foxcom/wave(NWAVE),nslots,i3bit(5),cmsg(5)
equivalence (x,cx),(y,cy) equivalence (x,cx),(y,cy)
call system_clock(count0,clkfreq) call system_clock(count0,clkfreq)
@ -25,7 +25,6 @@ subroutine foxgen()
do n=1,nslots do n=1,nslots
i3bit=0 i3bit=0
print*,n,i3bit,cmsg(n)
msg=cmsg(n)(1:22) msg=cmsg(n)(1:22)
call genft8(msg," ",bcontest,i3bit,msgsent,msgbits,itone) call genft8(msg," ",bcontest,i3bit,msgsent,msgbits,itone)

9
mainwindow.cpp
View File

@ -2782,8 +2782,8 @@ void MainWindow::decodeDone ()
m_logBook.match(/*in*/houndCall,/*out*/countryName,callWorkedBefore,countryWorkedBefore); m_logBook.match(/*in*/houndCall,/*out*/countryName,callWorkedBefore,countryWorkedBefore);
int i1=countryName.lastIndexOf(";"); int i1=countryName.lastIndexOf(";");
continent=countryName.mid(i1+2,-1); continent=countryName.mid(i1+2,-1);
qDebug() << "D" << t0 << continent; // qDebug() << "D" << t0 << continent;
t += (t0 + "\n"); //Don't list calls already in QSO or in the stack t = t + t0 + " " + continent + "\n"; //Don't list calls already in QSO or in the stack
} }
} }
if(t.length()>30) { if(t.length()>30) {
@ -3342,7 +3342,7 @@ void MainWindow::guiUpdate()
if(t1.indexOf("-")>=0 or t1.indexOf("+")>6) m_houndRptSent[i]=t1; if(t1.indexOf("-")>=0 or t1.indexOf("+")>6) m_houndRptSent[i]=t1;
msg[i]= m_houndCall[i] + m_config.my_callsign() + t1; msg[i]= m_houndCall[i] + m_config.my_callsign() + t1;
} }
if(msg[i]=="") msg[i]=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign() + m_houndRptSent[i]; if(msg[i]=="") msg[i]=ui->comboBoxCQ->currentText() + " " + m_config.my_callsign() +
" " + m_config.my_grid().mid(0,4); " " + m_config.my_grid().mid(0,4);
msg[i] += " "; msg[i] += " ";
msg[i]=msg[i].mid(0,32); msg[i]=msg[i].mid(0,32);
@ -3351,6 +3351,9 @@ void MainWindow::guiUpdate()
} }
ui->decodedTextBrowser2->displayTransmittedText(msg[i], m_modeTx, ui->decodedTextBrowser2->displayTransmittedText(msg[i], m_modeTx,
300+60*i,m_config.color_TxMsg(),m_bFastMode); 300+60*i,m_config.color_TxMsg(),m_bFastMode);
foxcom_.i3bit[i]=0;
if(msg[i].indexOf("<")>0) foxcom_.i3bit[i]=1;
qDebug() << i << foxcom_.i3bit[i] << msg[i].trimmed();
strncpy(&foxcom_.cmsg[i][0], msg[i].toLatin1(),32); strncpy(&foxcom_.cmsg[i][0], msg[i].toLatin1(),32);
} }
foxcom_.nslots=m_Nslots; foxcom_.nslots=m_Nslots;