New JTMS3 definition (again). Now using 7-bit characters, as in

the JTMS of WSJT9.  Modulation changed to BPSK, speed increased 
from 1378.125 to 2000 baud.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/jtms3@2505 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor
2012-07-12 19:10:39 +00:00
parent f7355e8f77
commit 04c4b99a53
7 changed files with 260 additions and 190 deletions
+6 -7
View File
@@ -408,7 +408,7 @@ void MainWindow::dataSink(int k)
mscom_.ndiskdat=0;
}
specjtms_(&k,&px);
// specjtms_(&k,&px);
QString t;
t.sprintf(" Rx noise: %5.1f ",px);
lab2->setText(t);
@@ -1116,7 +1116,7 @@ void MainWindow::guiUpdate()
static bool btxok0=false;
static int nc0=1;
static int nc1=1;
static char msgsent[23];
static char msgsent[29];
static int nsendingsh=0;
int khsym=0;
double trperiod=30.0;
@@ -1147,7 +1147,6 @@ void MainWindow::guiUpdate()
if(!soundOutThread.isRunning()) {
soundOutThread.start(QThread::HighPriority);
}
qDebug() << "PTT raised, soundOut started";
}
if(!bTxTime || m_txMute) {
btxok=false;
@@ -1156,7 +1155,7 @@ void MainWindow::guiUpdate()
// Calculate Tx waveform when needed
if((iptt==1 && iptt0==0) || m_restart) {
char message[23];
char message[29];
QByteArray ba;
if(m_ntx == 1) ba=ui->tx1->text().toLocal8Bit();
if(m_ntx == 2) ba=ui->tx2->text().toLocal8Bit();
@@ -1166,9 +1165,9 @@ void MainWindow::guiUpdate()
if(m_ntx == 6) ba=ui->tx6->text().toLocal8Bit();
ba2msg(ba,message);
int len1=22;
genjtms3_(message,msgsent,iwave,&nwave,len1,len1);
msgsent[22]=0;
ba2msg(ba,msgsent);
int len1=28;
genjtms3_(message,iwave,&nwave,len1);
if(m_restart) {
QFile f("jtms3_tx.log");