mirror of
				https://github.com/saitohirga/WSJT-X.git
				synced 2025-11-03 13:30:52 -05:00 
			
		
		
		
	Working on decoding issues...
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@2723 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
		
							parent
							
								
									009dbdeea5
								
							
						
					
					
						commit
						68aec4f22d
					
				@ -1,7 +1,6 @@
 | 
				
			|||||||
subroutine decoder(ntrSeconds,ndepth,nRxLog,c00)
 | 
					subroutine decoder(ntrSeconds,ndepth,nRxLog,c00)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
! Decoder for JT9.  
 | 
					! Decoder for JT9.
 | 
				
			||||||
! NB: For unknown reason, ***MUST*** be compiled by g95 with -O0 !!!
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  parameter (NMAX=1800*12000)        !Total sample intervals per 30 minutes
 | 
					  parameter (NMAX=1800*12000)        !Total sample intervals per 30 minutes
 | 
				
			||||||
  parameter (NDMAX=1800*1500)        !Sample intervals at 1500 Hz rate
 | 
					  parameter (NDMAX=1800*1500)        !Sample intervals at 1500 Hz rate
 | 
				
			||||||
@ -81,20 +80,18 @@ subroutine decoder(ntrSeconds,ndepth,nRxLog,c00)
 | 
				
			|||||||
  do i=ia,ib
 | 
					  do i=ia,ib
 | 
				
			||||||
     f=(i-1)*df3
 | 
					     f=(i-1)*df3
 | 
				
			||||||
     if((i.eq.ipk .or. ccfred(i).ge.3.0) .and. f.gt.fgood+10.0*df8) then
 | 
					     if((i.eq.ipk .or. ccfred(i).ge.3.0) .and. f.gt.fgood+10.0*df8) then
 | 
				
			||||||
        call spec9(c0,npts8,nsps,f,fpk,xdt,snrdb,i1SoftSymbols)
 | 
					        call spec9(c0,npts8,nsps,f,fpk,xdt,snr,i1SoftSymbols)
 | 
				
			||||||
        call decode9(i1SoftSymbols,limit,nlim,msg)
 | 
					        call decode9(i1SoftSymbols,limit,nlim,msg)
 | 
				
			||||||
!        snr=10.0*log10(ccfred(i)) - 10.0*log10(2500.0/df3) + 2.0
 | 
					 | 
				
			||||||
        snr=snrdb
 | 
					 | 
				
			||||||
        sync=ccfred(i) - 2.0
 | 
					        sync=ccfred(i) - 2.0
 | 
				
			||||||
        if(sync.lt.0.0) sync=0.0
 | 
					        if(sync.lt.0.0) sync=0.0
 | 
				
			||||||
        nsync=sync
 | 
					        nsync=sync
 | 
				
			||||||
        if(nsync.gt.10) nsync=10
 | 
					        if(nsync.gt.10) nsync=10
 | 
				
			||||||
        nsnr=nint(snr)
 | 
					        nsnr=nint(snr)
 | 
				
			||||||
        width=0.0
 | 
					        drift=0.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if(ccfred(i).gt.sbest .and. fgood.eq.0.0) then
 | 
					        if(ccfred(i).gt.sbest .and. fgood.eq.0.0) then
 | 
				
			||||||
           sbest=ccfred(i)
 | 
					           sbest=ccfred(i)
 | 
				
			||||||
           write(line,fmt) nutc,nsync,nsnr,xdt,1000.0+fpk,width
 | 
					           write(line,fmt) nutc,nsync,nsnr,xdt,1000.0+fpk,drift
 | 
				
			||||||
           if(nsync.gt.0) nsynced=1
 | 
					           if(nsync.gt.0) nsynced=1
 | 
				
			||||||
        endif
 | 
					        endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -58,7 +58,6 @@ subroutine symspec(k,ntrperiod,nsps,ingain,nb,nbslider,pxdb,s,red,    &
 | 
				
			|||||||
  endif
 | 
					  endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if(k.lt.k0) then
 | 
					  if(k.lt.k0) then
 | 
				
			||||||
!     ja=-3*jstep
 | 
					 | 
				
			||||||
     ja=0
 | 
					     ja=0
 | 
				
			||||||
     ssum=0.
 | 
					     ssum=0.
 | 
				
			||||||
     ihsym=0
 | 
					     ihsym=0
 | 
				
			||||||
@ -110,9 +109,9 @@ subroutine symspec(k,ntrperiod,nsps,ingain,nb,nbslider,pxdb,s,red,    &
 | 
				
			|||||||
  if(pxdb.gt.60.0) pxdb=60.0
 | 
					  if(pxdb.gt.60.0) pxdb=60.0
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  do i=0,nfft3-1                      !Copy data into cx
 | 
					  do i=0,nfft3-1                      !Copy data into cx
 | 
				
			||||||
     cx(i)=0.
 | 
					 | 
				
			||||||
     j=ja+i-(nfft3-1)
 | 
					     j=ja+i-(nfft3-1)
 | 
				
			||||||
     if(j.ge.1) cx(i)=c0(j)
 | 
					     cx(i)=0.
 | 
				
			||||||
 | 
					     if(j.ge.1 .and. j.le.NDMAX) cx(i)=c0(j)
 | 
				
			||||||
  enddo
 | 
					  enddo
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  if(ihsym.lt.184) ihsym=ihsym+1
 | 
					  if(ihsym.lt.184) ihsym=ihsym+1
 | 
				
			||||||
 | 
				
			|||||||
@ -1,4 +1,4 @@
 | 
				
			|||||||
//-------------------------------------------------------------- MainWindow
 | 
					//--------------------------------------------------------------- MainWindow
 | 
				
			||||||
#include "mainwindow.h"
 | 
					#include "mainwindow.h"
 | 
				
			||||||
#include "ui_mainwindow.h"
 | 
					#include "ui_mainwindow.h"
 | 
				
			||||||
#include "devsetup.h"
 | 
					#include "devsetup.h"
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user