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

Removed conditional E

Browse Source
This commit is contained in:
Jordan Sherer 2020-05-18 10:28:29 -04:00
parent 7d67c96e78
commit b6fc45b645
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mainwindow.cpp
View File

@ -4364,12 +4364,10 @@ bool MainWindow::decodeEnqueueReady(qint32 k, qint32 k0){
qint32 szC = -1; qint32 szC = -1;
qint32 cycleC = -1; qint32 cycleC = -1;
#if JS8_ENABLE_JS8E
bool couldDecodeE = false; bool couldDecodeE = false;
qint32 startE = -1; qint32 startE = -1;
qint32 szE = -1; qint32 szE = -1;
qint32 cycleE = -1; qint32 cycleE = -1;
#endif
#if JS8_ENABLE_JS8I #if JS8_ENABLE_JS8I
bool couldDecodeI = false; bool couldDecodeI = false;
@ -4408,7 +4406,6 @@ bool MainWindow::decodeEnqueueReady(qint32 k, qint32 k0){
couldDecodeC = true; couldDecodeC = true;
} }
#if JS8_ENABLE_JS8E
static qint32 currentDecodeStartE = -1; static qint32 currentDecodeStartE = -1;
static qint32 nextDecodeStartE = -1; static qint32 nextDecodeStartE = -1;
if(JS8_DEBUG_DECODE) qDebug() << "? SLOW " << currentDecodeStartE << nextDecodeStartE; if(JS8_DEBUG_DECODE) qDebug() << "? SLOW " << currentDecodeStartE << nextDecodeStartE;
@ -4418,7 +4415,6 @@ bool MainWindow::decodeEnqueueReady(qint32 k, qint32 k0){
szE = NTMAX*RX_SAMPLE_RATE-1; szE = NTMAX*RX_SAMPLE_RATE-1;
couldDecodeE = true; couldDecodeE = true;
} }
#endif
#if JS8_ENABLE_JS8I #if JS8_ENABLE_JS8I
static qint32 currentDecodeStartI = -1; static qint32 currentDecodeStartI = -1;
@ -4459,7 +4455,6 @@ bool MainWindow::decodeEnqueueReady(qint32 k, qint32 k0){
decodes++; decodes++;
} }
#if JS8_ENABLE_JS8E
if(couldDecodeE){ if(couldDecodeE){
DecodeParams d; DecodeParams d;
d.submode = Varicode::JS8CallSlow; d.submode = Varicode::JS8CallSlow;
@ -4468,7 +4463,6 @@ bool MainWindow::decodeEnqueueReady(qint32 k, qint32 k0){
m_decoderQueue.append(d); m_decoderQueue.append(d);
decodes++; decodes++;
} }
#endif
#if JS8_ENABLE_JS8I #if JS8_ENABLE_JS8I
if(couldDecodeI){ if(couldDecodeI){
@ -4633,7 +4627,7 @@ bool MainWindow::decodeProcessQueue(qint32 *pSubmode){
bool multi = ui->actionModeMultiDecoder->isChecked(); bool multi = ui->actionModeMultiDecoder->isChecked();
if(multi){ if(multi){
maxDecodes = JS8_ENABLE_JS8E ? 4 : 3; maxDecodes = JS8_ENABLE_JS8I ? 5 : 4;
} }
int count = m_decoderQueue.count(); int count = m_decoderQueue.count();
@ -4673,13 +4667,11 @@ bool MainWindow::decodeProcessQueue(qint32 *pSubmode){
dec_data.params.kszC = params.sz; dec_data.params.kszC = params.sz;
dec_data.params.nsubmodes |= (params.submode << 1); dec_data.params.nsubmodes |= (params.submode << 1);
break; break;
#if JS8_ENABLE_JS8E
case Varicode::JS8CallSlow: case Varicode::JS8CallSlow:
dec_data.params.kposE = params.start; dec_data.params.kposE = params.start;
dec_data.params.kszE = params.sz; dec_data.params.kszE = params.sz;
dec_data.params.nsubmodes |= (params.submode << 1); dec_data.params.nsubmodes |= (params.submode << 1);
break; break;
#endif
#if JS8_ENABLE_JS8I #if JS8_ENABLE_JS8I
case Varicode::JS8CallUltra: case Varicode::JS8CallUltra:
dec_data.params.kposI = params.start; dec_data.params.kposI = params.start;