chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplifying to help clear up some confusion

Browse Source
This commit is contained in:
Jordan Sherer 2019-10-26 23:01:05 -04:00
parent 56d457a056
commit 952d9d7080
5 changed files with 49 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Detector.cpp
View File

@ -58,7 +58,6 @@ qint64 Detector::writeData (char const * data, qint64 maxSize)
{
int ns=secondInPeriod();
if(ns < m_ns) { // When ns has wrapped around to zero, restart the buffers
dec_data.params.kpos = 0;
dec_data.params.kin = 0;
m_bufferPos = 0;
}

6
commons.h
View File

@ -2,7 +2,7 @@
#define COMMONS_H
#define NSMAX 6827
#define NTMAX 300
#define NTMAX 60
#define RX_SAMPLE_RATE 12000
@ -86,9 +86,7 @@ extern struct dec_data {
int nfSplit; //JT65 | JT9 split frequency
int nfb; //High decode limit (Hz)
int ntol; //+/- decoding range around fQSO (Hz)
int knum; // maximum number of frames per period in d2
int kpos; // number of frames already processed in d2
int kin; // number of frames available in d2
int kin; // number of frames written to d2
int nzhsym;
int nsubmode;
bool nagain;

2
lib/constants.f90
View File

@ -1,4 +1,4 @@
integer, parameter :: NTMAX=300
integer, parameter :: NTMAX=60
integer, parameter :: NMAX=NTMAX*12000 !Total sample intervals (one minute)
integer, parameter :: NDMAX=NTMAX*1500 !Sample intervals at 1500 Hz rate
integer, parameter :: NSMAX=6827 !Max length of saved spectra

2
lib/jt9com.f90
View File

@ -18,8 +18,6 @@
integer(c_int) :: nfsplit
integer(c_int) :: nfb
integer(c_int) :: ntol
integer(c_int) :: knum
integer(c_int) :: kpos
integer(c_int) :: kin
integer(c_int) :: nzhsym
integer(c_int) :: nsubmode

56
mainwindow.cpp
View File

@ -2456,11 +2456,27 @@ void MainWindow::setDecodedTextFont (QFont const& font)
void MainWindow::fixStop()
{
#if 1
m_hsymStop=((int(m_TRperiod/0.288))/8)*8 - 1; // 0.288 because 6912/12000/2 = 0.288
if(m_nSubMode == Varicode::JS8CallUltra){
m_hsymStop++;
}
#elif 0
m_hsymStop = int(m_TRperiod/0.288);
#else
if(m_nSubMode == Varicode::JS8CallNormal){
m_hsymStop = int(((float)JS8A_SYMBOL_SAMPLES*(float)JS8_NUM_SYMBOLS/(float)RX_SAMPLE_RATE)/0.288);
}
else if(m_nSubMode == Varicode::JS8CallFast){
m_hsymStop = int(((float)JS8B_SYMBOL_SAMPLES*(float)JS8_NUM_SYMBOLS/(float)RX_SAMPLE_RATE)/0.288);
}
else if(m_nSubMode == Varicode::JS8CallTurbo){
m_hsymStop = int(((float)JS8C_SYMBOL_SAMPLES*(float)JS8_NUM_SYMBOLS/(float)RX_SAMPLE_RATE)/0.288);
}
else if(m_nSubMode == Varicode::JS8CallUltra){
m_hsymStop = int(((float)JS8D_SYMBOL_SAMPLES*(float)JS8_NUM_SYMBOLS/(float)RX_SAMPLE_RATE)/0.288);
}
#endif
}
//-------------------------------------------------------------- dataSink()
@ -2525,10 +2541,10 @@ void MainWindow::dataSink(qint64 frames)
#if 0
static int lastn = 0;
int n = now.time().second();
newDataReady = false;
if(!m_decoderBusy) // m_nSubMode == Varicode::JS8CallNormal)
{
#if 0
if(lastn != n && n % JS8A_TX_SECONDS == 0){
qDebug() << "could decode normal now" << n;
period = JS8A_TX_SECONDS;
@ -2536,6 +2552,8 @@ void MainWindow::dataSink(qint64 frames)
newDataReady = true;
m_hsymStop = m_ihsym;
}
lastn = n;
#if 0
if(lastn != n && n % JS8B_TX_SECONDS == 0){
qDebug() << "could decode fast now" << n;
period = JS8B_TX_SECONDS;
@ -2550,7 +2568,7 @@ void MainWindow::dataSink(qint64 frames)
newDataReady = true;
m_hsymStop = m_ihsym;
}
lastn = n;
#endif
#if 0
qint32 hsymNormalStop = ((int(JS8A_TX_SECONDS/0.288))/8)*8 - 1; // 0.288 because 6912/12000/2 = 0.288
@ -2591,7 +2609,6 @@ void MainWindow::dataSink(qint64 frames)
dec_data.params.newdat=1;
dec_data.params.nagain=0;
dec_data.params.nzhsym=halfSymbolStop;
dec_data.params.knum=period * RX_SAMPLE_RATE;
m_dateTime = now.toString ("yyyy-MMM-dd hh:mm");
//qDebug() << now << "half symbol" << m_ihsym << "stop symbol" << m_hsymStop;
@ -3927,11 +3944,6 @@ void MainWindow::decode(int submode, int period)
int isec=t.toString("ss").toInt();
isec=isec - isec%m_TRperiod;
dec_data.params.nutc=10000*ihr + 100*imin + isec;
// qint64 now (DriftingDateTime::currentMSecsSinceEpoch ());
//unsigned msInPeriod = (ms % (period * 1000));
//unsigned frameInPeriod = qMin ((msInPeriod * RX_SAMPLE_RATE) / 1000, static_cast<unsigned> (sizeof (dec_data.d2) / sizeof (dec_data.d2[0])));
//dec_data.params.kpos = qMax(0, (period * RX_SAMPLE_RATE));
}
}
@ -4014,7 +4026,31 @@ void MainWindow::decode(int submode, int period)
strncpy(dec_data.params.hiscall,(hisCall + " ").toLatin1 ().constData (), 12);
strncpy(dec_data.params.hisgrid,(hisGrid + " ").toLatin1 ().constData (), 6);
qDebug() << "knum" << dec_data.params.knum << "kpos" << dec_data.params.kpos << "kin" << dec_data.params.kin;
#if 0
qDebug() << "kin" << dec_data.params.kin;
unsigned maxframe = 30 * RX_SAMPLE_RATE;
unsigned periodFrames = m_hsymStop * m_nsps / 2;
memset(dec_data.d1, 0, sizeof(dec_data.d1));
if(dec_data.params.kin < periodFrames){
//kstart = 0;
//ksize = dec_data.params.kin;
// kin is less than the period, so we need to copy the first part missing from the end of the buffer
int delta = periodFrames - dec_data.params.kin;
qDebug() << "try decode from" << (maxframe-delta) << "to" << dec_data.params.kin << "at beginning of buffer with delta" << delta << "and period" << periodFrames;
memcpy(dec_data.d1, &dec_data.d2[maxframe-delta], delta);
memcpy(&dec_data.d1[delta], dec_data.d2, dec_data.params.kin);
} else {
// decode the last N frames based on the current tr period
qDebug() << "try decode from" << (dec_data.params.kin-periodFrames) << "to" << dec_data.params.kin << "with period" << periodFrames;
memcpy(dec_data.d1, &dec_data.d2[dec_data.params.kin-periodFrames], periodFrames);
}
#else
memset(dec_data.d1, 0, sizeof(dec_data.d1));
memcpy(dec_data.d1, dec_data.d2, sizeof(dec_data.d2));
#endif
//newdat=1 ==> this is new data, must do the big FFT
//nagain=1 ==> decode only at fQSO +/- Tol