diff --git a/Detector.cpp b/Detector.cpp index ec3751164..7f99a6599 100644 --- a/Detector.cpp +++ b/Detector.cpp @@ -73,14 +73,13 @@ qint64 Detector::writeData (char const * data, qint64 maxSize) if(framesToProcess==13824 and jt9com_.kin>=0 and jt9com_.kin<1440000) { fil4_(&m_buffer[0], &framesToProcess, &jt9com_.d2[jt9com_.kin], &framesAfterDownSample); + jt9com_.kin += framesAfterDownSample; } else { qDebug() << "framesToProcess = " << framesToProcess; qDebug() << "jt9com_.kin = " << jt9com_.kin; qDebug() << "secondInPeriod = " << secondInPeriod(); } - Q_ASSERT(framesAfterDownSample==3456); - jt9com_.kin += framesAfterDownSample; - Q_EMIT framesWritten (jt9com_.kin); + Q_EMIT framesWritten (jt9com_.kin); m_bufferPos = 0; } diff --git a/lib/Makefile.linux b/lib/Makefile.linux index 884387a44..0af66dd75 100644 --- a/lib/Makefile.linux +++ b/lib/Makefile.linux @@ -6,7 +6,8 @@ CC = gcc CXX = g++ FC = gfortran -FFLAGS = -O2 -fbounds-check -Wall -Wno-conversion -fno-second-underscore -fPIE +FFLAGS = -O2 -fbounds-check -Wall -Wno-conversion -fno-second-underscore \ + -fPIE -DUNIX CFLAGS = -I. -fbounds-check -fPIE # Default rules diff --git a/mainwindow.cpp b/mainwindow.cpp index d5b646854..591e6c766 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1368,7 +1368,7 @@ void MainWindow::decode() //decode() jt9com_.nfSplit=m_wideGraph->getFmin(); jt9com_.nfb=m_wideGraph->getFmax(); jt9com_.ntol=20; - if(jt9com_.nutc < m_nutc0) m_RxLog |= 1; //Date and Time to all.txt + if(jt9com_.nutc < m_nutc0) m_RxLog = 1; //Date and Time to all.txt m_nutc0=jt9com_.nutc; jt9com_.ntxmode=9; if(m_modeTx=="JT65") jt9com_.ntxmode=65; @@ -1438,7 +1438,7 @@ void MainWindow::readFromStdout() //readFromStdout QFile f("ALL.TXT"); f.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append); QTextStream out(&f); - if(m_RxLog && 1) { + if(m_RxLog==1) { out << QDateTime::currentDateTimeUtc().toString("yyyy-MMM-dd hh:mm") << " " << m_dialFreq << " MHz " << m_mode << endl; m_RxLog=0;