diff --git a/lib/qra65code.f90 b/lib/qra65code.f90 index 59b83dfbe..021b8d564 100644 --- a/lib/qra65code.f90 +++ b/lib/qra65code.f90 @@ -14,7 +14,9 @@ program QRA65code ! irc=5 [CALL CALL ?] AP57 use packjt - character*22 msg,msg0,msg1,decoded,cok*3,bad*1,msgtype*10,arg*12 + character*22 msg,msg0,msg1,decoded,cok*3,msgtype*10,arg*12 + character*6 mycall + logical ltext integer dgen(12),sent(63),dec(12) real s3(0:63,1:63) include 'testmsg.f90' @@ -80,7 +82,12 @@ program QRA65code s3(k,j)=x*x + y*y enddo - call qra65_dec(s3,dec,irc) !Decode + i1=index(msg1,' ') + mycall=' ' + if(i1.ge.4) mycall=msg(1:i1-1) + call packcall(mycall,nmycall,ltext) + call qra65_dec(s3,nmycall,dec,irc) !Decode + decoded=" " if(irc.ge.0) then call unpackmsg(dec,decoded) !Unpack the user message diff --git a/mainwindow.cpp b/mainwindow.cpp index 0df13c1c8..8b2b32010 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -4681,11 +4681,11 @@ void MainWindow::transmit (double snr) } if (m_modeTx == "QRA65") { - if(m_nSubMode==0) toneSpacing=11025.0/4096.0; - if(m_nSubMode==1) toneSpacing=2*11025.0/4096.0; - if(m_nSubMode==2) toneSpacing=4*11025.0/4096.0; + if(m_nSubMode==0) toneSpacing=12000.0/6912.0; + if(m_nSubMode==1) toneSpacing=2*12000.0/6912.0; + if(m_nSubMode==2) toneSpacing=4*12000.0/6912.0; Q_EMIT sendMessage (NUM_QRA65_SYMBOLS, - 4096.0*12000.0/11025.0, ui->TxFreqSpinBox->value () - m_XIT, + 6912.0, ui->TxFreqSpinBox->value () - m_XIT, toneSpacing, m_soundOutput, m_config.audio_output_channel (), true, false, snr, m_TRperiod); } diff --git a/mainwindow.h b/mainwindow.h index 94de0c412..3cc7c3b4e 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -42,7 +42,7 @@ #define NUM_ISCAT_SYMBOLS 1291 //30*11025/256 #define NUM_JTMSK_SYMBOLS 234 //(72+15+12)*2 + 3*11 sync + 3 f0-parity #define NUM_MSK144_SYMBOLS 144 //s8 + d48 + s8 + d80 -#define NUM_QRA65_SYMBOLS 126 //63 data + 63 sync +#define NUM_QRA65_SYMBOLS 84 //63 data + 21 sync #define NUM_CW_SYMBOLS 250 #define TX_SAMPLE_RATE 48000 diff --git a/mainwindow.ui b/mainwindow.ui index 32a7a58c1..63ab27659 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -2,6 +2,14 @@ MainWindow + + + 0 + 0 + 896 + 565 + + WSJT-X by K1JT @@ -2276,6 +2284,14 @@ QPushButton[state="ok"] { + + + 0 + 0 + 896 + 21 + + File @@ -2828,7 +2844,7 @@ QPushButton[state="ok"] { true - QRA01 + QRA02