w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-10-01 17:46:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Attempt to fix a few TX sequencing issues.

Browse Source 
Simplified some of the TX logic and removed some redundant code.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4014 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville 2014-04-11 22:50:44 +00:00
parent 22008672f1
commit 0cd70bb808
2 changed files with 66 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
mainwindow.cpp
View File

@ -37,7 +37,6 @@ int volatile icw[NUM_CW_SYMBOLS]; //Dits for CW ID
int outBufSize; int outBufSize;
int rc; int rc;
qint32 g_iptt; qint32 g_iptt;
static int nc1=1;
wchar_t buffer[256]; wchar_t buffer[256];
QTextEdit* pShortcuts; QTextEdit* pShortcuts;
@ -93,6 +92,7 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
m_detector (RX_SAMPLE_RATE, NTMAX / 2, 6912 / 2, downSampleFactor), m_detector (RX_SAMPLE_RATE, NTMAX / 2, 6912 / 2, downSampleFactor),
m_modulator (TX_SAMPLE_RATE, NTMAX / 2), m_modulator (TX_SAMPLE_RATE, NTMAX / 2),
m_audioThread {new QThread}, m_audioThread {new QThread},
m_diskData {false},
m_appDir {QApplication::applicationDirPath ()}, m_appDir {QApplication::applicationDirPath ()},
mem_jt9 {shdmem}, mem_jt9 {shdmem},
mykey_jt9 {thekey}, mykey_jt9 {thekey},
@ -292,7 +292,6 @@ MainWindow::MainWindow(bool multiple, QSettings * settings, QSharedMemory *shdme
m_auto=false; m_auto=false;
m_waterfallAvg = 1; m_waterfallAvg = 1;
m_txFirst=false; m_txFirst=false;
m_btxMute=false;
m_btxok=false; m_btxok=false;
m_restart=false; m_restart=false;
m_killAll=false; m_killAll=false;
@ -533,8 +532,6 @@ void MainWindow::readSettings()
ui->cbTxLock->setChecked(m_lockTxFreq); ui->cbTxLock->setChecked(m_lockTxFreq);
m_plus2kHz=m_settings->value("Plus2kHz",false).toBool(); m_plus2kHz=m_settings->value("Plus2kHz",false).toBool();
ui->cbPlus2kHz->setChecked(m_plus2kHz); ui->cbPlus2kHz->setChecked(m_plus2kHz);
m_EMEbandIndex=m_settings->value("EMEbandIndex",0).toInt();
m_toneMultIndex=m_settings->value("ToneMultIndex",0).toInt();
m_settings->endGroup(); m_settings->endGroup();
// use these initialisation settings to tune the audio o/p buffer // use these initialisation settings to tune the audio o/p buffer
@ -664,41 +661,47 @@ void MainWindow::on_actionSettings_triggered() //Setup Dialog
void MainWindow::on_monitorButton_clicked (bool checked) void MainWindow::on_monitorButton_clicked (bool checked)
{ {
// make sure we have the current rig state
// Q_EMIT m_config.sync_transceiver (true);
qDebug () << "MainWindow::on_monitorButton_clicked: checked:" << checked;
qDebug () << "MainWindow::on_monitorButton_clicked: m_monitoring:" << m_monitoring << "m_transmitting:" << m_transmitting;
if (!m_transmitting) if (!m_transmitting)
{ {
auto prior = m_monitoring;
m_monitoring = checked; m_monitoring = checked;
if (m_monitoring) if (!prior)
{ {
m_diskData = false; // no longer reading WAV files m_diskData = false; // no longer reading WAV files
// put rig back where it was when last in control // put rig back where it was when last in control
Q_EMIT m_config.transceiver_frequency (m_lastMonitoredFrequency); Q_EMIT m_config.transceiver_frequency (m_lastMonitoredFrequency);
setXIT (m_txFreq); setXIT (m_txFreq);
Q_EMIT resumeAudioInputStream ();
}
else
{
Q_EMIT suspendAudioInputStream ();
} }
Q_EMIT m_config.sync_transceiver (true, checked); // gets
// Configuration
// in/out of
// strict
// split and
// mode
// checking
monitor (checked);
} }
else else
{ {
ui->monitorButton->setChecked (false); // disallow ui->monitorButton->setChecked (false); // disallow
} }
Q_EMIT m_config.sync_transceiver (true, checked); // gets Configuration in/out of strict split and mode checking
} }
void MainWindow::monitor (bool state) void MainWindow::monitor (bool state)
{ {
ui->monitorButton->setChecked (state); ui->monitorButton->setChecked (state);
on_monitorButton_clicked (state); m_monitoring = state;
if (state)
{
Q_EMIT resumeAudioInputStream ();
}
else
{
Q_EMIT suspendAudioInputStream ();
}
} }
void MainWindow::on_actionAbout_triggered() //Display "About" void MainWindow::on_actionAbout_triggered() //Display "About"
@ -1401,7 +1404,6 @@ void MainWindow::guiUpdate()
static char message[29]; static char message[29];
static char msgsent[29]; static char msgsent[29];
static int nsendingsh=0; static int nsendingsh=0;
static int giptt00=-1;
static double onAirFreq0=0.0; static double onAirFreq0=0.0;
QString rt; QString rt;
@ -1431,7 +1433,7 @@ void MainWindow::guiUpdate()
bTxTime=false; bTxTime=false;
if (m_tune) if (m_tune)
{ {
tuning (false); stop_tuning ();
} }
if (m_auto) if (m_auto)
@ -1451,13 +1453,13 @@ void MainWindow::guiUpdate()
} }
float fTR=float((nsec%m_TRperiod))/m_TRperiod; float fTR=float((nsec%m_TRperiod))/m_TRperiod;
if(g_iptt==0 and ((bTxTime and !m_btxMute and fTR<0.4) or m_tune )) { if(g_iptt==0 and ((bTxTime and fTR<0.4) or m_tune )) {
icw[0]=m_ncw; icw[0]=m_ncw;
g_iptt = 1; g_iptt = 1;
Q_EMIT m_config.transceiver_ptt (true); Q_EMIT m_config.transceiver_ptt (true);
ptt1Timer->start(200); //Sequencer delay ptt1Timer->start(200); //Sequencer delay
} }
if(!bTxTime || m_btxMute) { if(!bTxTime) {
m_btxok=false; m_btxok=false;
} }
} }
@ -1550,48 +1552,40 @@ void MainWindow::guiUpdate()
m_restart=false; m_restart=false;
} }
if (g_iptt == 1 && iptt0 == 0)
// If PTT was just raised, start a countdown for raising TxOK: {
// NB: could be better implemented with a timer QString t=QString::fromLatin1(msgsent);
if(g_iptt == 1 && iptt0 == 0) { if(t==m_msgSent0) {
nc1=-9; // TxDelay = 0.8 s m_repeatMsg++;
} } else {
if(nc1 <= 0) { m_repeatMsg=0;
nc1++; m_msgSent0=t;
}
if(nc1 == 0) {
QString t=QString::fromLatin1(msgsent);
if(t==m_msgSent0) {
m_repeatMsg++;
} else {
m_repeatMsg=0;
m_msgSent0=t;
}
signalMeter->setValue(0);
if (m_monitoring)
{
monitor (false);
} }
m_btxok=true; signalMeter->setValue(0);
m_transmitting=true;
ui->pbTxMode->setEnabled(false); if (m_monitoring)
if(!m_tune) { {
QFile f(m_config.data_path ().absoluteFilePath ("ALL.TXT")); monitor (false);
f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append); }
QTextStream out(&f);
out << QDateTime::currentDateTimeUtc().toString("hhmm") m_btxok=true;
<< " Transmitting " << (m_dialFreq / 1.e6) << " MHz " << m_modeTx m_transmitting=true;
<< ": " << t << endl; ui->pbTxMode->setEnabled(false);
f.close(); if(!m_tune) {
} QFile f(m_config.data_path ().absoluteFilePath ("ALL.TXT"));
if (m_config.TX_messages () && !m_tune) f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append);
{ QTextStream out(&f);
ui->decodedTextBrowser2->displayTransmittedText(t,m_modeTx,m_txFreq); out << QDateTime::currentDateTimeUtc().toString("hhmm")
<< " Transmitting " << (m_dialFreq / 1.e6) << " MHz " << m_modeTx
<< ": " << t << endl;
f.close();
} }
} if (m_config.TX_messages () && !m_tune)
{
ui->decodedTextBrowser2->displayTransmittedText(t,m_modeTx,m_txFreq);
}
}
if(!m_btxok && btxok0 && g_iptt==1) stopTx(); if(!m_btxok && btxok0 && g_iptt==1) stopTx();
@ -1648,10 +1642,6 @@ void MainWindow::guiUpdate()
m_sec0=nsec; m_sec0=nsec;
} }
if(g_iptt!=giptt00) {
giptt00=g_iptt;
}
iptt0=g_iptt; iptt0=g_iptt;
btxok0=m_btxok; btxok0=m_btxok;
} //End of GUIupdate } //End of GUIupdate
@ -1671,10 +1661,10 @@ void MainWindow::startTx2()
transmit (snr); transmit (snr);
signalMeter->setValue(0); signalMeter->setValue(0);
monitor (false); //monitor (false);
m_btxok=true; //m_btxok=true;
m_transmitting=true; //m_transmitting=true;
ui->pbTxMode->setEnabled(false); ui->pbTxMode->setEnabled(false);
} }
} }
@ -1683,6 +1673,7 @@ void MainWindow::stopTx()
{ {
Q_EMIT endTransmitMessage (); Q_EMIT endTransmitMessage ();
m_transmitting=false; m_transmitting=false;
m_btxok = false;
if ("JT9+JT65" == m_mode) ui->pbTxMode->setEnabled(true); if ("JT9+JT65" == m_mode) ui->pbTxMode->setEnabled(true);
g_iptt=0; g_iptt=0;
tx_status_label->setStyleSheet(""); tx_status_label->setStyleSheet("");
@ -2643,7 +2634,6 @@ void MainWindow::on_tuneButton_clicked (bool checked)
{ {
if (m_tune) if (m_tune)
{ {
nc1=1; //disable the countdown timer
tuneButtonTimer->start(250); tuneButtonTimer->start(250);
} }
else else
@ -2655,21 +2645,17 @@ void MainWindow::on_tuneButton_clicked (bool checked)
Q_EMIT tune (checked); Q_EMIT tune (checked);
} }
void MainWindow::tuning (bool state) void MainWindow::stop_tuning ()
{ {
ui->tuneButton->setChecked (state); ui->tuneButton->setChecked (false);
on_tuneButton_clicked (state); on_tuneButton_clicked (false);
} }
void MainWindow::on_stopTxButton_clicked() //Stop Tx void MainWindow::on_stopTxButton_clicked() //Stop Tx
{ {
// if(m_tune) {
// m_tune=false;
// Q_EMIT tune (m_tune);
// }
if (m_tune) if (m_tune)
{ {
tuning (false); stop_tuning ();
} }
if (m_auto) if (m_auto)
@ -2677,6 +2663,7 @@ void MainWindow::on_stopTxButton_clicked() //Stop Tx
auto_tx_mode (false); auto_tx_mode (false);
} }
m_transmitting = false;
m_btxok=false; m_btxok=false;
m_repeatMsg=0; m_repeatMsg=0;
} }

6
mainwindow.h
View File

@ -171,7 +171,7 @@ private slots:
void band_changed (Frequency); void band_changed (Frequency);
void monitor (bool); void monitor (bool);
void tuning (bool); void stop_tuning ();
void auto_tx_mode (bool); void auto_tx_mode (bool);
private: private:
@ -248,13 +248,9 @@ private:
QString m_band; QString m_band;
qint32 m_repeatMsg; qint32 m_repeatMsg;
qint32 m_watchdogLimit; qint32 m_watchdogLimit;
qint32 m_fMax;
qint32 m_EMEbandIndex;
qint32 m_toneMultIndex;
qint32 m_astroFont; qint32 m_astroFont;
bool m_btxok; //True if OK to transmit bool m_btxok; //True if OK to transmit
bool m_btxMute; //True if transmit should be muted
bool m_diskData; bool m_diskData;
bool m_loopall; bool m_loopall;
bool m_decoderBusy; bool m_decoderBusy;