diff --git a/commons.h b/commons.h index 405a2c6..f7900e6 100644 --- a/commons.h +++ b/commons.h @@ -14,7 +14,7 @@ #define JS8_ALLOW_EXTENDED 1 // allow extended latin-1 capital charset #ifdef QT_DEBUG -#define JS8_DEBUG_DECODE 1 // emit debug statements for the decode pipeline +#define JS8_DEBUG_DECODE 0 // emit debug statements for the decode pipeline #else #define JS8_DEBUG_DECODE 0 #endif @@ -38,7 +38,7 @@ #define JS8C_TX_SECONDS 6 #define JS8C_START_DELAY_MS 100 -#define JS8E_SYMBOL_SAMPLES 4000 +#define JS8E_SYMBOL_SAMPLES 3840 #define JS8E_TX_SECONDS 30 #define JS8E_START_DELAY_MS 500 diff --git a/lib/js8/js8dec.f90 b/lib/js8/js8dec.f90 index f216a67..510216e 100644 --- a/lib/js8/js8dec.f90 +++ b/lib/js8/js8dec.f90 @@ -466,6 +466,12 @@ subroutine js8dec(dd0,newdat,nQSOProgress,nfqso,nftx,ndepth,lapon,lapcqonly, & ios=mod(itone(i)+4,7) xnoi=xnoi+s2(ios,i)**2 enddo + + if(NWRITELOG.eq.1) then + write(*,*) ' snr', xnoi, xsig, xbase, db(xsig/xbase), db(xsig/xbase - 1.0) + flush(6) + endif + xsnr=0.001 if(xnoi.gt.0 .and. xnoi.lt.xsig) xsnr=xsig/xnoi-1.0 xsnr=10.0*log10(xsnr)-27.0 diff --git a/lib/js8/js8e_params.f90 b/lib/js8/js8e_params.f90 index 63e639e..393b557 100644 --- a/lib/js8/js8e_params.f90 +++ b/lib/js8/js8e_params.f90 @@ -17,8 +17,8 @@ ! 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=4000, NTXDUR=28, NDOWNSPS=20, NDD=90, JZ=32) ! 24 Hz 3 baud 8 wpm -28.2dB (1.0Eb/N0) 26.33s + parameter (NSPS=3840, NTXDUR=28, NDOWNSPS=32, NDD=90, JZ=32) ! 25 Hz 3.125 baud 8 wpm -28.0dB (1.0Eb/N0) 25.28s +! parameter (NSPS=4000, NTXDUR=28, NDOWNSPS=40, NDD=90, JZ=32) ! 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 parameter (ASTART=0.5) !Start delay in seconds diff --git a/mainwindow.ui b/mainwindow.ui index 31208ab..98a400e 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -5769,7 +5769,7 @@ list. The list can be maintained in Settings (F2). true - JS8 (&Slow, 30s, 24Hz, ~8 WPM) + JS8 (&Slow, 30s, 25Hz, ~8 WPM)