mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-10-03 02:26:45 -04:00
Fix the tune-button logic.
Don't cycle through several band changes on program startup. git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3195 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
parent
51265e1adf
commit
a8e72a0102
@ -13,6 +13,7 @@
|
|||||||
int itone[85]; //Tx audio tones for 85 symbols
|
int itone[85]; //Tx audio tones for 85 symbols
|
||||||
int icw[250]; //Dits for CW ID
|
int icw[250]; //Dits for CW ID
|
||||||
int rc;
|
int rc;
|
||||||
|
static int nc1=1;
|
||||||
wchar_t buffer[256];
|
wchar_t buffer[256];
|
||||||
bool btxok; //True if OK to transmit
|
bool btxok; //True if OK to transmit
|
||||||
bool btxMute;
|
bool btxMute;
|
||||||
@ -483,8 +484,6 @@ void MainWindow::readSettings()
|
|||||||
m_stopBitsIndex=settings.value("StopBitsIndex",1).toInt();
|
m_stopBitsIndex=settings.value("StopBitsIndex",1).toInt();
|
||||||
m_handshake=settings.value("Handshake","None").toString();
|
m_handshake=settings.value("Handshake","None").toString();
|
||||||
m_handshakeIndex=settings.value("HandshakeIndex",0).toInt();
|
m_handshakeIndex=settings.value("HandshakeIndex",0).toInt();
|
||||||
ui->bandComboBox->setCurrentIndex(0);
|
|
||||||
ui->bandComboBox->setCurrentIndex(1);
|
|
||||||
m_band=settings.value("BandIndex",7).toInt();
|
m_band=settings.value("BandIndex",7).toInt();
|
||||||
ui->bandComboBox->setCurrentIndex(m_band);
|
ui->bandComboBox->setCurrentIndex(m_band);
|
||||||
m_promptToLog=settings.value("PromptToLog",false).toBool();
|
m_promptToLog=settings.value("PromptToLog",false).toBool();
|
||||||
@ -1390,7 +1389,6 @@ void MainWindow::guiUpdate()
|
|||||||
// static int iptt=0;
|
// static int iptt=0;
|
||||||
static bool btxok0=false;
|
static bool btxok0=false;
|
||||||
static int nc0=1;
|
static int nc0=1;
|
||||||
static int nc1=1;
|
|
||||||
static char message[29];
|
static char message[29];
|
||||||
static char msgsent[29];
|
static char msgsent[29];
|
||||||
static int nsendingsh=0;
|
static int nsendingsh=0;
|
||||||
@ -1417,7 +1415,6 @@ void MainWindow::guiUpdate()
|
|||||||
}
|
}
|
||||||
|
|
||||||
float fTR=float((nsec%m_TRperiod))/m_TRperiod;
|
float fTR=float((nsec%m_TRperiod))/m_TRperiod;
|
||||||
// if(bTxTime and m_iptt==0 and !btxMute and fTR<0.4) {
|
|
||||||
if(m_iptt==0 and ((bTxTime and !btxMute and fTR<0.4) or m_tune )) {
|
if(m_iptt==0 and ((bTxTime and !btxMute and fTR<0.4) or m_tune )) {
|
||||||
icw[0]=m_ncw;
|
icw[0]=m_ncw;
|
||||||
|
|
||||||
@ -2561,6 +2558,8 @@ void MainWindow::on_tuneButton_clicked()
|
|||||||
{
|
{
|
||||||
if(m_tune) {
|
if(m_tune) {
|
||||||
m_tune=false;
|
m_tune=false;
|
||||||
|
soundOutThread.setTune(m_tune);
|
||||||
|
nc1=1; //disable the countdown timer
|
||||||
tuneButtonTimer->start(1000);
|
tuneButtonTimer->start(1000);
|
||||||
} else {
|
} else {
|
||||||
m_tune=true;
|
m_tune=true;
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[Setup]
|
[Setup]
|
||||||
AppName=wsjtx
|
AppName=wsjtx
|
||||||
AppVerName=wsjtx Version 0.9 r3187
|
AppVerName=wsjtx Version 0.9 r3188
|
||||||
AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT
|
AppCopyright=Copyright (C) 2001-2013 by Joe Taylor, K1JT
|
||||||
DefaultDirName=c:\wsjtx
|
DefaultDirName=c:\wsjtx
|
||||||
DefaultGroupName=wsjtx
|
DefaultGroupName=wsjtx
|
||||||
|
Loading…
Reference in New Issue
Block a user