w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-09-02 13:17:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

More changes for QRA01 --> QRA02.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6825 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2016-06-29 19:12:46 +00:00
parent 4bc4c11b66
commit 100c3d3121
4 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/qra65code.f90
View File

@ -14,7 +14,9 @@ program QRA65code
! irc=5 [CALL CALL ?] AP57 ! irc=5 [CALL CALL ?] AP57
use packjt 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) integer dgen(12),sent(63),dec(12)
real s3(0:63,1:63) real s3(0:63,1:63)
include 'testmsg.f90' include 'testmsg.f90'
@ -80,7 +82,12 @@ program QRA65code
s3(k,j)=x*x + y*y s3(k,j)=x*x + y*y
enddo 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=" " decoded=" "
if(irc.ge.0) then if(irc.ge.0) then
call unpackmsg(dec,decoded) !Unpack the user message call unpackmsg(dec,decoded) !Unpack the user message

8
mainwindow.cpp
View File

@ -4681,11 +4681,11 @@ void MainWindow::transmit (double snr)
} }
if (m_modeTx == "QRA65") { if (m_modeTx == "QRA65") {
if(m_nSubMode==0) toneSpacing=11025.0/4096.0; if(m_nSubMode==0) toneSpacing=12000.0/6912.0;
if(m_nSubMode==1) toneSpacing=2*11025.0/4096.0; if(m_nSubMode==1) toneSpacing=2*12000.0/6912.0;
if(m_nSubMode==2) toneSpacing=4*11025.0/4096.0; if(m_nSubMode==2) toneSpacing=4*12000.0/6912.0;
Q_EMIT sendMessage (NUM_QRA65_SYMBOLS, 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 (), toneSpacing, m_soundOutput, m_config.audio_output_channel (),
true, false, snr, m_TRperiod); true, false, snr, m_TRperiod);
} }

2
mainwindow.h
View File

@ -42,7 +42,7 @@
#define NUM_ISCAT_SYMBOLS 1291 //30*11025/256 #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_JTMSK_SYMBOLS 234 //(72+15+12)*2 + 3*11 sync + 3 f0-parity
#define NUM_MSK144_SYMBOLS 144 //s8 + d48 + s8 + d80 #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 NUM_CW_SYMBOLS 250
#define TX_SAMPLE_RATE 48000 #define TX_SAMPLE_RATE 48000

18
mainwindow.ui
View File

@ -2,6 +2,14 @@
<ui version="4.0"> <ui version="4.0">
<class>MainWindow</class> <class>MainWindow</class>
<widget class="QMainWindow" name="MainWindow"> <widget class="QMainWindow" name="MainWindow">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>896</width>
<height>565</height>
</rect>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>WSJT-X by K1JT</string> <string>WSJT-X by K1JT</string>
</property> </property>
@ -2276,6 +2284,14 @@ QPushButton[state=&quot;ok&quot;] {
</layout> </layout>
</widget> </widget>
<widget class="QMenuBar" name="menuBar"> <widget class="QMenuBar" name="menuBar">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>896</width>
<height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuFile"> <widget class="QMenu" name="menuFile">
<property name="title"> <property name="title">
<string>File</string> <string>File</string>
@ -2828,7 +2844,7 @@ QPushButton[state=&quot;ok&quot;] {
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string>QRA01</string> <string>QRA02</string>
</property> </property>
</action> </action>
</widget> </widget>