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

Put instructions to compile plrs.exe in Makefile.CVF.

Browse Source 
Changes to plrs.f90 to read one packet at a time.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@994 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2008-07-24 18:36:28 +00:00
parent 79d563af31
commit a92b601a78
3 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile.CVF
View File

@ -7,7 +7,7 @@ FC = df
#FFLAGS = /traceback /check:all #FFLAGS = /traceback /check:all
FFLAGS = /traceback /fast /nologo /check:all FFLAGS = /traceback /fast /nologo /check:all
all: MAP65.EXE all: MAP65.EXE plrs.exe
OBJS2C = init_rs.o encode_rs.o decode_rs.o jtaudio.o plrr_subs.o OBJS2C = init_rs.o encode_rs.o decode_rs.o jtaudio.o plrr_subs.o
@ -40,6 +40,11 @@ SRCS2C = resample.c ptt.c igray.c wrapkarn.c rfile3.c
MAP65.EXE: Audio.pyd map65.spec MAP65.EXE: Audio.pyd map65.spec
python c:\python23\installer\Build.py map65.spec python c:\python23\installer\Build.py map65.spec
plrs.exe: plrs.f90 sec_midn.F90 plrs_subs_win.c
cl /c /Foplrs_subs.obj plrs_subs_win.c
df /fpp /define:CVF plrs.f90 sec_midn.F90 plrs_subs.obj \
/link ws2_32.lib
Audio.pyd: $(OBJS2C) $(SRCS2F90) $(SRCS2F77) $(SRCS2C) $(SRCSCOM) Audio.pyd: $(OBJS2C) $(SRCS2F90) $(SRCS2F77) $(SRCS2C) $(SRCSCOM)
python f2py.py -c \ python f2py.py -c \
--quiet --"fcompiler=compaqv" \ --quiet --"fcompiler=compaqv" \

2
map65.py
View File

@ -1,4 +1,4 @@
#--------------------------------------------------------------------- MAP65 #---------------------------------------------------------------------- MAP65
# $Date$ $Revision$ # $Date$ $Revision$
# #
from Tkinter import * from Tkinter import *

30
plrs.f90
View File

@ -55,29 +55,33 @@ program plrs
call setup_ssocket !Open a socket for multicasting call setup_ssocket !Open a socket for multicasting
do iter=1,iters do iter=1,iters
#ifdef CVF
open(10,file=fname,form='binary',status='old')
#else
fd=open(fname,RMODE) !Open file for reading fd=open(fname,RMODE) !Open file for reading
#endif
dmsec=-dtmspacket dmsec=-dtmspacket
nsec0=sec_midn() nsec0=sec_midn()
do ifile=1,nfiles do ifile=1,nfiles
ns0=0 ns0=0
tmsec=1000*(3600*7 + 60*nm(ifile))-dtmspacket tmsec=1000*(3600*7 + 60*nm(ifile))-dtmspacket
nr=read(fd,d,NBYTES)
if(nr.ne.NBYTES) then
print*,'Error reading file all.tf2'
go to 999
endif
k=0 k=0
do ipacket=1,NPPR do ipacket=1,NPPR
dmsec=dmsec+dtmspacket dmsec=dmsec+dtmspacket
tmsec=tmsec+dtmspacket tmsec=tmsec+dtmspacket
msec2=nint(tmsec) msec2=nint(tmsec)
msec=nint(dmsec) msec=nint(dmsec)
do i=1,NBPP/8
k=k+1 #ifdef CVF
buf8(i)=d(k) read(10) buf8
enddo #else
nr=read(fd,buf8,NBPP)
if(nr.ne.NBPP) then
print*,'Error reading file all.tf2'
go to 999
endif
#endif
nblock=nblock+1 nblock=nblock+1
call send_pkt(center_freq) call send_pkt(center_freq)
npkt=npkt+1 npkt=npkt+1
@ -86,7 +90,7 @@ program plrs
nsec=int(sec_midn())-nsec0 nsec=int(sec_midn())-nsec0
nwait=msec-1000*nsec nwait=msec-1000*nsec
! Pace the data at close to its real-time rate ! Pace the data at close to its real-time rate
if(nwait.gt.0 .and. .not.fast) call usleep(nwait*1000) if(nwait.gt.0 .and. .not.fast) call sleep_msec(nwait)
endif endif
ns=mod(msec2/1000,60) ns=mod(msec2/1000,60)
if(ns.ne.ns0) write(*,1010) ns,center_freq,0.001*msec2,sec_midn() if(ns.ne.ns0) write(*,1010) ns,center_freq,0.001*msec2,sec_midn()
@ -98,7 +102,11 @@ program plrs
read(*,*) cjunk,pause,fast read(*,*) cjunk,pause,fast
endif endif
enddo enddo
#ifdef CVF
close(10)
#else
i=close(fd) i=close(fd)
#endif
enddo enddo