From 0d785888d8472f6868b85f91743f05bc6d2a7c0c Mon Sep 17 00:00:00 2001
From: Jordan Sherer <jordan@widefido.com>
Date: Thu, 7 Nov 2019 11:07:01 -0500
Subject: [PATCH] Broken E decoder, so we'll disable it for now. Also...don't
 try to decode if the decoder is curently busy

---
 commons.h               | 4 ++--
 lib/js8/js8e_params.f90 | 4 ++--
 mainwindow.cpp          | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/commons.h b/commons.h
index f7b3497..800e0da 100644
--- a/commons.h
+++ b/commons.h
@@ -15,7 +15,7 @@
 #define JS8_ENABLE_JS8A    1
 #define JS8_ENABLE_JS8B    1
 #define JS8_ENABLE_JS8C    1
-#define JS8_ENABLE_JS8E    1
+#define JS8_ENABLE_JS8E    0
 
 #define JS8A_SYMBOL_SAMPLES 1920
 #define JS8A_TX_SECONDS     15
@@ -29,7 +29,7 @@
 #define JS8C_TX_SECONDS     6
 #define JS8C_START_DELAY_MS 100
 
-#define JS8E_IS_ULTRA 0
+#define JS8E_IS_ULTRA 1
 #if JS8E_IS_ULTRA
 #define JS8E_SYMBOL_SAMPLES 384
 #define JS8E_TX_SECONDS     4
diff --git a/lib/js8/js8e_params.f90 b/lib/js8/js8e_params.f90
index e0e0632..277495d 100644
--- a/lib/js8/js8e_params.f90
+++ b/lib/js8/js8e_params.f90
@@ -6,7 +6,7 @@
 !parameter (JZ=62)                     !Sync Search Space over +/- 2.5s relative to 0.5s TX start time. 2.48 = 62/4/(12000/1920) ?
 
 
-! parameter (NSPS=384,  NTXDUR=4,  NDOWNSPS=12, NDD=125, JZ=250) ! 250 Hz  31.25 baud 60 wpm -18.0dB (1.0Eb/N0)  2.52s
+  parameter (NSPS=384,  NTXDUR=4,  NDOWNSPS=12, NDD=125, JZ=250) ! 250 Hz  31.25 baud 60 wpm -18.0dB (1.0Eb/N0)  2.52s
 ! parameter (NSPS=384,  NTXDUR=5,  NDOWNSPS=12, NDD=125, JZ=116) ! 250 Hz  31.25 baud 48 wpm -18.0dB (1.0Eb/N0)  2.52s
 ! parameter (NSPS=480,  NTXDUR=5,  NDOWNSPS=12, NDD=125, JZ=116) ! 200 Hz     25 baud 48 wpm -19.0dB (1.0Eb/N0)  3.16s
 ! parameter (NSPS=480,  NTXDUR=6,  NDOWNSPS=20, NDD=150, JZ=116) ! 200 Hz     25 baud 40 wpm -19.0dB (1.0Eb/N0)  3.16s
@@ -17,7 +17,7 @@
 ! parameter (NSPS=960,  NTXDUR=8,  NDOWNSPS=24, NDD=100, JZ=116) ! 100 Hz  12.50 baud 32 wpm -22.0dB (1.0Eb/N0)  5.92s
 ! parameter (NSPS=1200, NTXDUR=10, NDOWNSPS=20, NDD=100, JZ=116) !  80 Hz     10 baud 24 wpm -23.0dB (1.0Eb/N0)  7.90s
 ! parameter (NSPS=1920, NTXDUR=15, NDOWNSPS=32, NDD=100, JZ=116) !  50 Hz  6.250 baud 16 wpm -25.0dB (1.0Eb/N0) 12.64s
-  parameter (NSPS=3840, NTXDUR=30, NDOWNSPS=32, NDD=94,  JZ=116) !  24 Hz  3.125 baud  8 wpm -28.0dB (1.0Eb/N0) 25.28s
+! parameter (NSPS=3840, NTXDUR=30, NDOWNSPS=32, NDD=94,  JZ=116) !  24 Hz  3.125 baud  8 wpm -28.0dB (1.0Eb/N0) 25.28s
 ! parameter (NSPS=4000, NTXDUR=30, NDOWNSPS=40, NDD=90,  JZ=116) !  24 Hz      3 baud  8 wpm -28.2dB (1.0Eb/N0) 26.33s
 
 parameter (AZ=12000.0/(1.0*NSPS)*0.8d0) !Dedupe overlap in Hz
diff --git a/mainwindow.cpp b/mainwindow.cpp
index f247609..c03e7b8 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3979,6 +3979,10 @@ void MainWindow::decode(){
 }
 
 bool MainWindow::decodeReady(int submode, int period, int *pSubmode, int *pPeriod){
+    if(m_decoderBusy){
+        return false;
+    }
+
     if(period == 0){
         return false;
     }