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

Working on a possible (and experimental!) slow MSK144 mode. *** DO NOT USE ON THE AIR! ***

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7707 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2017-06-07 19:58:25 +00:00
parent 6e3aae5cc1
commit 00719daac4
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
mainwindow.cpp
View File

@ -1,5 +1,4 @@
//-------------------------------------------------------- MainWindow //-------------------------------------------------------- MainWindow
#include "mainwindow.h" #include "mainwindow.h"
#include <cinttypes> #include <cinttypes>
#include <limits> #include <limits>
@ -805,8 +804,8 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
m_wideGraph->setLockTxFreq(m_lockTxFreq); m_wideGraph->setLockTxFreq(m_lockTxFreq);
ui->cbShMsgs->setChecked(m_bShMsgs); ui->cbShMsgs->setChecked(m_bShMsgs);
ui->cbSWL->setChecked(m_bSWL); ui->cbSWL->setChecked(m_bSWL);
ui->cbFast9->setChecked(m_bFast9);
if(m_bFast9) m_bFastMode=true; if(m_bFast9) m_bFastMode=true;
ui->cbFast9->setChecked(m_bFast9 or m_bFastMode);
if(m_mode=="JT4") on_actionJT4_triggered(); if(m_mode=="JT4") on_actionJT4_triggered();
if(m_mode=="JT9") on_actionJT9_triggered(); if(m_mode=="JT9") on_actionJT9_triggered();
@ -1144,7 +1143,7 @@ void MainWindow::dataSink(qint64 frames)
if(m_mode=="ISCAT" or m_mode=="MSK144" or m_bFast9) { if(m_mode=="ISCAT" or m_mode=="MSK144" or m_bFast9) {
fastSink(frames); fastSink(frames);
return; if(m_bFastMode) return;
} }
// Get power, spectrum, and ihsym // Get power, spectrum, and ihsym
@ -1162,6 +1161,7 @@ void MainWindow::dataSink(qint64 frames)
if(m_monitoring || m_diskData) { if(m_monitoring || m_diskData) {
m_wideGraph->dataSink2(s,m_df3,m_ihsym,m_diskData); m_wideGraph->dataSink2(s,m_df3,m_ihsym,m_diskData);
} }
if(m_mode=="MSK144") return;
fixStop(); fixStop();
if (m_mode == "FreqCal" if (m_mode == "FreqCal"
@ -3150,7 +3150,6 @@ void MainWindow::guiUpdate()
//Once per second: //Once per second:
if(nsec != m_sec0) { if(nsec != m_sec0) {
if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) { if(m_freqNominal!=0 and m_freqNominal<50000000 and m_config.enable_VHF_features()) {
if(!m_bVHFwarned) vhfWarning(); if(!m_bVHFwarned) vhfWarning();
} else { } else {
@ -4495,7 +4494,9 @@ void MainWindow::on_actionISCAT_triggered()
void MainWindow::on_actionMSK144_triggered() void MainWindow::on_actionMSK144_triggered()
{ {
displayWidgets(nWidgets("101111110100000000010001")); // displayWidgets(nWidgets("101111110100000000010001"));
displayWidgets(nWidgets("101111111100000000010001"));
// displayWidgets(nWidgets("111111110101111100010001"));
m_mode="MSK144"; m_mode="MSK144";
m_modeTx="MSK144"; m_modeTx="MSK144";
ui->actionMSK144->setChecked(true); ui->actionMSK144->setChecked(true);
@ -4507,12 +4508,12 @@ void MainWindow::on_actionMSK144_triggered()
m_toneSpacing=0.0; m_toneSpacing=0.0;
WSPR_config(false); WSPR_config(false);
VHF_features_enabled(true); VHF_features_enabled(true);
m_bFastMode=true; // m_bFastMode=true;
m_bFast9=false; m_bFast9=false;
fast_config(true); fast_config(m_bFastMode);
m_TRperiod = ui->sbTR->value (); m_TRperiod = ui->sbTR->value ();
m_wideGraph->hide(); // m_wideGraph->hide();
m_fastGraph->show(); // m_fastGraph->show();
ui->TxFreqSpinBox->setValue(1500); ui->TxFreqSpinBox->setValue(1500);
ui->RxFreqSpinBox->setValue(1500); ui->RxFreqSpinBox->setValue(1500);
ui->RxFreqSpinBox->setMinimum(1400); ui->RxFreqSpinBox->setMinimum(1400);
@ -4701,7 +4702,7 @@ void MainWindow::fast_config(bool b)
{ {
m_bFastMode=b; m_bFastMode=b;
ui->TxFreqSpinBox->setEnabled(!b); ui->TxFreqSpinBox->setEnabled(!b);
ui->sbTR->setVisible(b); // ui->sbTR->setVisible(b);
if(b and (m_bFast9 or m_mode=="MSK144" or m_mode=="ISCAT")) { if(b and (m_bFast9 or m_mode=="MSK144" or m_mode=="ISCAT")) {
m_wideGraph->hide(); m_wideGraph->hide();
m_fastGraph->show(); m_fastGraph->show();
@ -5364,10 +5365,14 @@ void MainWindow::transmit (double snr)
if (m_modeTx == "MSK144") { if (m_modeTx == "MSK144") {
m_nsps=6; m_nsps=6;
double f0=1000.0;
if(!m_bFastMode) {
m_nsps=192;
m_toneSpacing=6000.0/m_nsps;
f0=ui->TxFreqSpinBox->value () - m_XIT - 0.5*m_toneSpacing;
}
m_FFTSize = 7 * 512; m_FFTSize = 7 * 512;
Q_EMIT FFTSize (m_FFTSize); Q_EMIT FFTSize (m_FFTSize);
m_toneSpacing=6000.0/m_nsps;
double f0=1000.0;
int nsym; int nsym;
nsym=NUM_MSK144_SYMBOLS; nsym=NUM_MSK144_SYMBOLS;
if(itone[40] < 0) nsym=40; if(itone[40] < 0) nsym=40;