w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2025-07-30 20:52:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

An attempt to fix the msk144 crash on macos.

Browse Source
This commit is contained in:
Steven Franke 2024-07-22 13:28:21 -05:00
parent 875602975b
commit 9a7ae401e7
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/hspec.f90
View File

@ -19,9 +19,10 @@ subroutine hspec(id2,k,nutc0,ntrpdepth,nrxfreq,ntol,bmsk144, &
! jh index of most recent data in green(), s() ! jh index of most recent data in green(), s()
parameter (JZ=703) parameter (JZ=703)
character*80 line1 character*(*) line1
character*80 line0
character*(*) datadir character*(*) datadir
character*12 mycall,hiscall character*(*) mycall,hiscall
integer*2 id2(0:120*12000-1) integer*2 id2(0:120*12000-1)
logical*1 bmsk144,bshmsg,btrain,bswl logical*1 bmsk144,bshmsg,btrain,bswl
real green(0:JZ-1) real green(0:JZ-1)
@ -96,7 +97,12 @@ subroutine hspec(id2,k,nutc0,ntrpdepth,nrxfreq,ntol,bmsk144, &
tt2=sum(float(abs(id2(k0:k0+3583)))) tt2=sum(float(abs(id2(k0:k0+3583))))
if(tt1.ne.0.0 .and. tt2.ne.0) then if(tt1.ne.0.0 .and. tt2.ne.0) then
call mskrtd(id2(k-7168+1:k),nutc0,tsec,ntol,nrxfreq,ndepth, & call mskrtd(id2(k-7168+1:k),nutc0,tsec,ntol,nrxfreq,ndepth, &
mycall,hiscall,bshmsg,btrain,pcoeffs,bswl,datadir,line1) mycall,hiscall,bshmsg,btrain,pcoeffs,bswl,datadir,line0)
if(line0(1:1).eq.char(0)) then
line1(1:1)=char(0)
else
line1(1:62)=line0(1:62)
endif
endif endif
endif endif
endif endif

14
lib/mskrtd.f90
View File

@ -16,8 +16,8 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,hiscall, &
character*4 decsym !"&" for mskspd or "^" for long averages character*4 decsym !"&" for mskspd or "^" for long averages
character*37 msgreceived !Decoded message character*37 msgreceived !Decoded message
character*37 msglast,msglastswl !Used for dupechecking character*37 msglast,msglastswl !Used for dupechecking
character*80 line !Formatted line with UTC dB T Freq Msg character*(*) line !Formatted line with UTC dB T Freq Msg
character*12 mycall,hiscall character*(*) mycall,hiscall
character*37 recent_shmsgs(NSHMEM) character*37 recent_shmsgs(NSHMEM)
character*(*) datadir character*(*) datadir
@ -70,8 +70,12 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,hiscall, &
msglastswl=' ' msglastswl=' '
nsnrlast=-99 nsnrlast=-99
nsnrlastswl=-99 nsnrlastswl=-99
mycall13=mycall//' ' ! mycall13=mycall//' '
dxcall13=hiscall//' ' ! dxcall13=hiscall//' '
mycall13=' '
dxcall13=' '
mycall13(1:12)=mycall
dxcall13(1:12)=hiscall
first=.false. first=.false.
endif endif
@ -90,7 +94,7 @@ subroutine mskrtd(id2,nutc0,tsec,ntol,nrxfreq,ndepth,mycall,hiscall, &
endif endif
tframe=float(NSPM)/12000.0 tframe=float(NSPM)/12000.0
line=char(0) line(1:1)=char(0)
msgreceived=' ' msgreceived=' '
max_iterations=10 max_iterations=10
niterations=0 niterations=0