w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-14 16:11:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Modify packjt77 to encode and decode 50-bit WSPR messages. For now, results are the first 50 bits of c77, and we're using subtype i3.n3=0.6.

Browse Source
This commit is contained in:
Joe Taylor 2020-04-14 15:40:11 -04:00
parent 7d941ba67f
commit af4de10055
1 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
lib/77bit/packjt77.f90
View File

@ -352,10 +352,16 @@ subroutine unpack77(c77,nrx,msg,unpk77_success)
msg=adjustl(msg) msg=adjustl(msg)
else if(i3.eq.0 .and. n3.eq.6) then else if(i3.eq.0 .and. n3.eq.6) then
read(c77(70:71),'(b2)') j2 read(c77(50:50),'(b1)') j2a
j2b=0
if(j2a.eq.0) read(c77(49:49),'(b1)') j2b
j2=2*j2a+j2b
print*,'bbb',j2a,j2b,j2
if(j2.eq.0) then if(j2.eq.0) then
read(c77,2010) n28,igrid4,idbm,iap ! WSPR Type 1
2010 format(b28.28,b15.15,b6.6,b19.19) read(c77,2010) n28,igrid4,idbm
2010 format(b28.28,b15.15,b5.5)
idbm=nint(idbm*10.0/3.0)
call unpack28(n28,call_1,unpk28_success) call unpack28(n28,call_1,unpk28_success)
if(.not.unpk28_success) unpk77_success=.false. if(.not.unpk28_success) unpk77_success=.false.
call to_grid4(igrid4,grid4) call to_grid4(igrid4,grid4)
@ -363,8 +369,19 @@ subroutine unpack77(c77,nrx,msg,unpk77_success)
msg=trim(call_1)//' '//grid4//' '//trim(adjustl(crpt)) msg=trim(call_1)//' '//grid4//' '//trim(adjustl(crpt))
else if(j2.eq.1) then else if(j2.eq.1) then
read(c77,2020) n28,npfx,idbm,iap ! WSPR Type 2
2020 format(b28.28,b16.16,b6.6,b19.19) read(c77,2030) n28,igrid6
2030 format(b22.22,b25.25)
call unpack28(n28,call_1,unpk28_success)
if(.not.unpk28_success) unpk77_success=.false.
call to_grid6(igrid6,grid6)
msg=trim(call_1)//' '//grid6
else if(j2.eq.2) then
! WSPR Type 3
read(c77,2020) n28,npfx,idbm
2020 format(b28.28,b16.16,b5.5)
idbm=nint(idbm*10.0/3.0)
call unpack28(n28,call_1,unpk28_success) call unpack28(n28,call_1,unpk28_success)
if(.not.unpk28_success) unpk77_success=.false. if(.not.unpk28_success) unpk77_success=.false.
write(crpt,'(i3)') idbm write(crpt,'(i3)') idbm
@ -393,14 +410,6 @@ subroutine unpack77(c77,nrx,msg,unpk77_success)
msg=trim(call_1)//'/'//trim(adjustl(cpfx))//' '//trim(adjustl(crpt)) msg=trim(call_1)//'/'//trim(adjustl(cpfx))//' '//trim(adjustl(crpt))
endif endif
else if(j2.eq.2) then
read(c77,2030) n28,igrid6,iap
2030 format(b22.22,b25.25,b19.19)
call unpack28(n28,call_1,unpk28_success)
if(.not.unpk28_success) unpk77_success=.false.
call to_grid6(igrid6,grid6)
msg=trim(call_1)//' '//grid6
endif endif
else if(i3.eq.1 .or. i3.eq.2) then else if(i3.eq.1 .or. i3.eq.2) then
@ -992,18 +1001,18 @@ subroutine pack77_06(nwords,w,i3,n3,c77)
n3=6 n3=6
call pack28(w(1),n28) call pack28(w(1),n28)
grid4=w(2)(1:4) grid4=w(2)(1:4)
j1=(ichar(grid4(1:1))-ichar('A'))*18*10*10 k1=(ichar(grid4(1:1))-ichar('A'))*18*10*10
j2=(ichar(grid4(2:2))-ichar('A'))*10*10 k2=(ichar(grid4(2:2))-ichar('A'))*10*10
j3=(ichar(grid4(3:3))-ichar('0'))*10 k3=(ichar(grid4(3:3))-ichar('0'))*10
j4=(ichar(grid4(4:4))-ichar('0')) k4=(ichar(grid4(4:4))-ichar('0'))
igrid4=j1+j2+j3+j4 igrid4=k1+k2+k3+k4
read(w(3),*) idbm read(w(3),*) idbm
if(idbm.lt.0) idbm=0 if(idbm.lt.0) idbm=0
if(idbm.gt.63) idbm=63 if(idbm.gt.60) idbm=60
iap=0 idbm=nint(0.3*idbm)
j2=0 print*,'aaa',idbm
write(c77,1010) n28,igrid4,idbm,iap,0,j2,n3,i3 write(c77,1010) n28,igrid4,idbm,0,0,0,n3,i3
1010 format(b28.28,b15.15,b6.6,b19.19,b1.1,b2.2,2b3.3) 1010 format(b28.28,b15.15,b5.5,2i1,b21.21,2b3.3)
go to 900 go to 900
endif endif
if(nwords.eq.2 .and. m1.ge.5 .and. m1.le.10 .and. m2.le.2) then if(nwords.eq.2 .and. m1.ge.5 .and. m1.le.10 .and. m2.le.2) then
@ -1037,13 +1046,13 @@ subroutine pack77_06(nwords,w,i3,n3,c77)
endif endif
i3=0 i3=0
n3=6 n3=6
j2=1
call pack28(bcall//' ',n28) call pack28(bcall//' ',n28)
read(w(2),*) idbm read(w(2),*) idbm
if(idbm.lt.0) idbm=0 if(idbm.lt.0) idbm=0
if(idbm.gt.63) idbm=63 if(idbm.gt.60) idbm=60
write(c77,1020) n28,npfx,idbm,iap,j2,n3,i3 idbm=nint(0.3*idbm)
1020 format(b28.28,b16.16,b6.6,b19.19,b2.2,2b3.3) write(c77,1020) n28,npfx,idbm,1,0,n3,i3
1020 format(b28.28,b16.16,b5.5,i1,b21.21,2b3.3)
go to 900 go to 900
endif endif
@ -1054,7 +1063,6 @@ subroutine pack77_06(nwords,w,i3,n3,c77)
if(.not.is_grid6(grid6)) go to 900 if(.not.is_grid6(grid6)) go to 900
i3=0 i3=0
n3=6 n3=6
j2=2
call pack28(w(1),n28) call pack28(w(1),n28)
k1=(ichar(grid6(1:1))-ichar('A'))*18*10*10*24*24 k1=(ichar(grid6(1:1))-ichar('A'))*18*10*10*24*24
k2=(ichar(grid6(2:2))-ichar('A'))*10*10*24*24 k2=(ichar(grid6(2:2))-ichar('A'))*10*10*24*24
@ -1063,8 +1071,8 @@ subroutine pack77_06(nwords,w,i3,n3,c77)
k5=(ichar(grid6(5:5))-ichar('A'))*24 k5=(ichar(grid6(5:5))-ichar('A'))*24
k6=(ichar(grid6(6:6))-ichar('A')) k6=(ichar(grid6(6:6))-ichar('A'))
igrid6=k1+k2+k3+k4+k5+k6 igrid6=k1+k2+k3+k4+k5+k6
write(c77,1030) n28,igrid6,iap,0,j2,n3,i3 write(c77,1030) n28,igrid6,2,0,n3,i3
1030 format(b22.22,b25.25,b19.19,b3.3,b2.2,2b3.3) 1030 format(b22.22,b25.25,b3.3,b21.21,2b3.3)
endif endif
900 return 900 return