diff --git a/devsetup.ui b/devsetup.ui
index ea2930804..46aa06637 100644
--- a/devsetup.ui
+++ b/devsetup.ui
@@ -6,8 +6,8 @@
0
0
- 392
- 379
+ 462
+ 341
@@ -23,16 +23,16 @@
Station
-
+
- 12
- 33
- 348
- 267
+ 10
+ 34
+ 421
+ 216
-
+
-
-
@@ -121,6 +121,12 @@
-
+
+
+ 60
+ 16777215
+
+
-20
@@ -245,52 +251,13 @@
- -
-
-
-
- 0
- 20
-
-
-
- Timeout (min):
-
-
-
- -
-
-
-
- 0
- 20
-
-
-
- Fcal (Hz):
-
-
-
- -
-
-
-
- 0
- 20
-
-
-
- Fadd (MHz)
-
-
-
-
Qt::Vertical
- QSizePolicy::Fixed
+ QSizePolicy::Expanding
@@ -308,7 +275,7 @@
- 16777215
+ 60
16777215
@@ -317,37 +284,13 @@
- -
-
-
- 20
-
-
-
- -
-
-
- -2000
-
-
- 2000
-
-
-
- -
-
-
- 0.0
-
-
-
-
Qt::Vertical
- QSizePolicy::Fixed
+ QSizePolicy::Expanding
@@ -362,116 +305,130 @@
-
-
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
-
-
-
+
+
-
+
+
+
+ 50
+ 0
+
+
+
+
+ 50
+ 16777215
+
+
+
+ Audio In:
+
+
+
+ -
+
+
+ true
+
+
+
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 50
+ 0
+
+
+
+
+ 50
+ 16777215
+
+
+
+ Audio Out:
+
+
+
+ -
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
- 75
- 20
+ 20
+ 40
-
- Save Directory:
-
-
+
-
-
-
- C:\Users\joe\wsjt\map65\save
-
-
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 75
+ 20
+
+
+
+ Save Directory:
+
+
+
+ -
+
+
+ C:\Users\joe\wsjt\map65\save
+
+
+
+
-
-
- I/O Devices
-
-
-
-
- 1
- 73
- 351
- 151
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 0
-
-
-
-
- 16777215
- 55
-
-
-
- Input Device (Rx Audio)
-
-
-
- true
-
-
-
- 15
- 16
- 291
- 22
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 16777215
- 55
-
-
-
- Output Device (Tx Audio)
-
-
-
-
- 10
- 20
- 291
- 22
-
-
-
-
-
-
-
-
-
diff --git a/getfile.cpp b/getfile.cpp
index a2af02be9..098a6561b 100644
--- a/getfile.cpp
+++ b/getfile.cpp
@@ -54,7 +54,7 @@ void getfile(QString fname, bool xpol, int dbDgrd)
}
}
-void savetf2(QString fname, bool xpol)
+void savewav(QString fname)
{
/*
int npts=2*52*96000;
diff --git a/mainwindow.cpp b/mainwindow.cpp
index e65b0e4fd..d6cc94dc0 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -14,7 +14,7 @@ short int iwave[30*48000]; //Wave file for Tx audio
int nwave; //Length of Tx waveform
bool btxok; //True if OK to transmit
double outputLatency; //Latency in seconds
-qint16 id[4*60*96000];
+qint16 id[30*48000];
WideGraph* g_pWideGraph = NULL;
QSharedMemory mem_m65("mem_m65");
@@ -23,9 +23,6 @@ QString rev="$Rev$";
QString Program_Title_Version=" JTMS3 v0.1, r" + rev.mid(6,4) +
" by K1JT";
-extern const int RxDataFrequency = 96000;
-extern const int TxDataFrequency = 11025;
-
//-------------------------------------------------- MainWindow constructor
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
@@ -206,12 +203,7 @@ MainWindow::MainWindow(QWidget *parent) :
m_diskData=false;
m_tol=500;
g_pWideGraph->setTol(m_tol);
- g_pWideGraph->setFcal(m_fCal);
- if(m_fs96000) g_pWideGraph->setFsample(96000);
- if(!m_fs96000) g_pWideGraph->setFsample(95238);
- g_pWideGraph->m_mult570=m_mult570;
- g_pWideGraph->m_cal570=m_cal570;
- if(m_initIQplus) g_pWideGraph->initIQplus();
+ g_pWideGraph->setFsample(48000);
// Create "m_worked", a dictionary of all calls in wsjt.log
QFile f("wsjt.log");
@@ -462,23 +454,19 @@ void MainWindow::dataSink(int k)
n60z=n60;
n=0;
}
+*/
+ int ihsym=0;
if(ihsym == 279) {
- datcom_.newdat=1;
- datcom_.nagain=0;
QDateTime t = QDateTime::currentDateTimeUtc();
m_dateTime=t.toString("yyyy-MMM-dd hh:mm");
- decode(); //Start the decoder
if(m_saveAll) {
QString fname=m_saveDir + "/" + t.date().toString("yyMMdd") + "_" +
- t.time().toString("hhmm");
- if(m_xpol) fname += ".tf2";
- if(!m_xpol) fname += ".iq";
- *future2 = QtConcurrent::run(savetf2, fname, m_xpol);
+ t.time().toString("hhmm") + ".wav";
+ *future2 = QtConcurrent::run(savewav, fname);
watcher2->setFuture(*future2);
}
}
- */
soundInThread.m_dataSinkBusy=false;
}
@@ -838,11 +826,12 @@ void MainWindow::on_actionDecode_remaining_files_in_directory_triggered()
void MainWindow::diskDat() //diskDat()
{
- double hsym;
//These may be redundant??
m_diskData=true;
// datcom_.newdat=1;
+ /*
+ double hsym;
if(m_fs96000) hsym=2048.0*96000.0/11025.0; //Samples per JT65 half-symbol
if(!m_fs96000) hsym=2048.0*95238.1/11025.0;
for(int i=0; i<281; i++) { // Do the half-symbol FFTs
@@ -850,6 +839,7 @@ void MainWindow::diskDat() //diskDat()
dataSink(k);
if(i%10 == 0) qApp->processEvents(); //Keep the GUI responsive
}
+ */
}
void MainWindow::diskWriteFinished() //diskWriteFinished
diff --git a/mainwindow.h b/mainwindow.h
index c26c5f1e6..2d24c80cf 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -239,7 +239,7 @@ private:
};
extern void getfile(QString fname, bool xpol, int idInt);
-extern void savetf2(QString fname, bool xpol);
+extern void savewav(QString fname);
extern int killbyname(const char* progName);
extern void getDev(int* numDevices,char hostAPI_DeviceName[][50],
int minChan[], int maxChan[],