diff --git a/devsetup.cpp b/devsetup.cpp
index bad3670d8..9f25a1719 100644
--- a/devsetup.cpp
+++ b/devsetup.cpp
@@ -151,7 +151,7 @@ void DevSetup::initDlg()
ui.comboBoxSndOut->setCurrentIndex(m_nDevOut);
ui.cbID73->setChecked(m_After73);
ui.cbPSKReporter->setChecked(m_pskReporter);
- ui.cbSplit->setChecked(m_bSplit);
+ ui.cbSplit->setChecked(m_bSplit and m_catEnabled);
ui.cbXIT->setChecked(m_bXIT);
ui.cbXIT->setVisible(false);
@@ -381,9 +381,7 @@ void DevSetup::on_cbEnableCAT_toggled(bool b)
{
m_catEnabled=b;
enableWidgets();
-// bool b2=m_pttMethodIndex==0 and m_catEnabled;
-// b2=b2 or ((m_pttMethodIndex==1 or m_pttMethodIndex==2) and m_pttPort!=0);
-// ui.testPTTButton->setEnabled(b2);
+ ui.cbSplit->setChecked(m_bSplit and m_catEnabled);
}
void DevSetup::on_serialRateComboBox_activated(int index)
diff --git a/devsetup.ui b/devsetup.ui
index 930ae83fd..c6e7d3a16 100644
--- a/devsetup.ui
+++ b/devsetup.ui
@@ -1366,7 +1366,7 @@
- 5W DPL 73 GL
+
@@ -1416,7 +1416,7 @@
- 20W DPL 73 GL
+ 10W DPL 73 GL
@@ -1638,7 +1638,7 @@
- TNX 73 GL
+
@@ -1663,7 +1663,7 @@
- 10W DPL 73 GL
+ 5W DPL 73 GL
diff --git a/mainwindow.cpp b/mainwindow.cpp
index 406c7c613..71d6e79fe 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -26,8 +26,8 @@ wchar_t buffer[256];
bool btxok; //True if OK to transmit
bool btxMute;
double outputLatency; //Latency in seconds
-double dFreq[]={0.136,0.4742,1.838,3.578,5.357,7.078,10.130,14.078,
- 18.104,21.078,24.918,28.078,50.293,70.091,144.489,432.178};
+double dFreq[]={0.13613,0.4742,1.838,3.576,5.357,7.036,10.136,14.076,
+ 18.102,21.076,24.917,28.076,50.293,70.091,144.489,432.178};
WideGraph* g_pWideGraph = NULL;
LogQSO* logDlg = NULL;
@@ -534,7 +534,7 @@ void MainWindow::readSettings()
ui->actionMonitor_OFF_at_startup->setChecked(m_monitorStartOFF);
m_pskReporter=settings.value("PSKReporter",false).toBool();
m_After73=settings.value("After73",false).toBool();
- m_macro=settings.value("Macros","").toStringList();
+ m_macro=settings.value("Macros","TNX 73 GL").toStringList();
m_dFreq=settings.value("DefaultFreqs","").toStringList();
m_toRTTY=settings.value("toRTTY",false).toBool();
ui->actionConvert_JT9_x_to_RTTY->setChecked(m_toRTTY);
@@ -1292,7 +1292,8 @@ void MainWindow::decode() //decode()
{
if(!m_dataAvailable) return;
ui->DecodeButton->setStyleSheet(m_pbdecoding_style1);
- if(jt9com_.nagain==0 && (!m_diskData)) {
+// if(jt9com_.nagain==0 && (!m_diskData)) {
+ if(jt9com_.newdat==0 && (!m_diskData)) {
qint64 ms = QDateTime::currentMSecsSinceEpoch() % 86400000;
int imin=ms/60000;
int ihr=imin/60;