From 0033fa6ba756187967091be50a03d22cc3c705bd Mon Sep 17 00:00:00 2001 From: Joe Taylor Date: Mon, 3 Oct 2011 20:02:58 +0000 Subject: [PATCH] Change file names .F to .f, .F90 to .f90 git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/map65@2455 ab8295b8-cf94-4d9e-aec4-7959e3be5d79 --- astro.F => astro.f | 0 astro0.F90 => astro0.f90 | 0 audio_init.F90 => audio_init.f90 | 0 decode1.F90 => decode1.f90 | 0 deep65.F => deep65.f | 0 display.F90 => display.f90 | 0 fivehz.F90 => fivehz.f90 | 0 flushqqq.F90 => flushqqq.f90 | 0 ftn_init.F90 => ftn_init.f90 | 0 getfile.F90 => getfile.f90 | 0 getfile2.F90 => getfile2.f90 | 0 map65a.F90 => map65a.f90 | 0 plrs.F90 | 53 ++++++++++++++++++++++++++++---- plrs_subs.c | 3 +- recvpkt.F90 => recvpkt.f90 | 0 rfile3a.F90 => rfile3a.f90 | 0 runqqq.F90 => runqqq.f90 | 0 savetf2.F90 => savetf2.f90 | 0 sec_midn.F90 => sec_midn.f90 | 0 wsjtgen.F90 => wsjtgen.f90 | 0 20 files changed, 49 insertions(+), 7 deletions(-) rename astro.F => astro.f (100%) rename astro0.F90 => astro0.f90 (100%) rename audio_init.F90 => audio_init.f90 (100%) rename decode1.F90 => decode1.f90 (100%) rename deep65.F => deep65.f (100%) rename display.F90 => display.f90 (100%) rename fivehz.F90 => fivehz.f90 (100%) rename flushqqq.F90 => flushqqq.f90 (100%) rename ftn_init.F90 => ftn_init.f90 (100%) rename getfile.F90 => getfile.f90 (100%) rename getfile2.F90 => getfile2.f90 (100%) rename map65a.F90 => map65a.f90 (100%) rename recvpkt.F90 => recvpkt.f90 (100%) rename rfile3a.F90 => rfile3a.f90 (100%) rename runqqq.F90 => runqqq.f90 (100%) rename savetf2.F90 => savetf2.f90 (100%) rename sec_midn.F90 => sec_midn.f90 (100%) rename wsjtgen.F90 => wsjtgen.f90 (100%) diff --git a/astro.F b/astro.f similarity index 100% rename from astro.F rename to astro.f diff --git a/astro0.F90 b/astro0.f90 similarity index 100% rename from astro0.F90 rename to astro0.f90 diff --git a/audio_init.F90 b/audio_init.f90 similarity index 100% rename from audio_init.F90 rename to audio_init.f90 diff --git a/decode1.F90 b/decode1.f90 similarity index 100% rename from decode1.F90 rename to decode1.f90 diff --git a/deep65.F b/deep65.f similarity index 100% rename from deep65.F rename to deep65.f diff --git a/display.F90 b/display.f90 similarity index 100% rename from display.F90 rename to display.f90 diff --git a/fivehz.F90 b/fivehz.f90 similarity index 100% rename from fivehz.F90 rename to fivehz.f90 diff --git a/flushqqq.F90 b/flushqqq.f90 similarity index 100% rename from flushqqq.F90 rename to flushqqq.f90 diff --git a/ftn_init.F90 b/ftn_init.f90 similarity index 100% rename from ftn_init.F90 rename to ftn_init.f90 diff --git a/getfile.F90 b/getfile.f90 similarity index 100% rename from getfile.F90 rename to getfile.f90 diff --git a/getfile2.F90 b/getfile2.f90 similarity index 100% rename from getfile2.F90 rename to getfile2.f90 diff --git a/map65a.F90 b/map65a.f90 similarity index 100% rename from map65a.F90 rename to map65a.f90 diff --git a/plrs.F90 b/plrs.F90 index a3b11450a..f4a62b0dc 100644 --- a/plrs.F90 +++ b/plrs.F90 @@ -12,6 +12,11 @@ program plrs integer*1 userx_no,iusb integer*2 nblock real*8 d(NZ),buf8 + + real*8 buf8a(174) + integer*2 id(4,174) + real*4 buf4(4,87) + integer fd integer open,read,close integer nm(11) @@ -19,12 +24,14 @@ program plrs logical fast,pause real*8 center_freq,dmsec,dtmspacket,tmsec common/plrscom/center_freq,msec2,fsample,iptr,nblock,userx_no,iusb,buf8(174) + equivalence (id,buf8a) + equivalence (buf8,buf4) data nm/45,46,48,50,52,54,55,56,57,58,59/ data nblock/0/,fast/.false./,pause/.false./ nargs=iargc() - if(nargs.ne.4) then - print*,'Usage: plrs ' + if(nargs.ne.5) then + print*,'Usage: plrs ' go to 999 endif @@ -37,6 +44,8 @@ program plrs read(arg,*) iters call getarg(4,arg) read(arg,*) iwait + call getarg(5,arg) + read(arg,*) ifloat if(iwait.ne.0) then 1 if(mod(int(sec_midn()),60).eq.0) go to 2 @@ -45,10 +54,12 @@ program plrs endif 2 fname="all.tf2"//char(0) - userx_no=0 + userx_no=2 + if(ifloat.ne.0) userx_no=-2 iusb=1 center_freq=144.125d0 dtmspacket=1000.d0*NBPP/(8.d0*96000.d0) + if(ifloat.ne.0) dtmspacket=0.5*dtmspacket fsample=96000.0 npkt=0 @@ -61,7 +72,7 @@ program plrs fd=open(fname,RMODE) !Open file for reading #endif dmsec=-dtmspacket - nsec0=sec_midn() + sec0=sec_midn() do ifile=1,nfiles ns0=0 @@ -82,13 +93,43 @@ program plrs go to 999 endif #endif + if(ifloat.ne.0) then + buf8a=buf8 + do i=1,87 + buf4(1,i)=id(1,i) + buf4(2,i)=id(2,i) + buf4(3,i)=id(3,i) + buf4(4,i)=id(4,i) + enddo + endif + nblock=nblock+1 call send_pkt(center_freq) npkt=npkt+1 + + if(ifloat.ne.0) then +! Send a second packet if format is floating point + do i=1,87 + buf4(1,i)=id(1,i+87) + buf4(2,i)=id(2,i+87) + buf4(3,i)=id(3,i+87) + buf4(4,i)=id(4,i+87) + enddo + + dmsec=dmsec+dtmspacket + tmsec=tmsec+dtmspacket + msec2=nint(tmsec) + msec=nint(dmsec) + nblock=nblock+1 + call send_pkt(center_freq) + npkt=npkt+1 + endif + + if(mod(npkt,100).eq.0) then - nsec=int(sec_midn())-nsec0 - nwait=msec-1000*nsec + sec=int(sec_midn())-sec0 + nwait=msec-1000*sec ! Pace the data at close to its real-time rate if(nwait.gt.0 .and. .not.fast) call sleep_msec(nwait) endif diff --git a/plrs_subs.c b/plrs_subs.c index a6f65c6c4..7c364e51c 100644 --- a/plrs_subs.c +++ b/plrs_subs.c @@ -27,7 +27,8 @@ void setup_ssocket_(void) /* set up destination address */ memset(&addr,0,sizeof(addr)); addr.sin_family=AF_INET; - addr.sin_addr.s_addr=inet_addr(HELLO_GROUP); + // addr.sin_addr.s_addr=inet_addr(HELLO_GROUP); + addr.sin_addr.s_addr=inet_addr("128.112.87.74"); addr.sin_port=htons(HELLO_PORT); } diff --git a/recvpkt.F90 b/recvpkt.f90 similarity index 100% rename from recvpkt.F90 rename to recvpkt.f90 diff --git a/rfile3a.F90 b/rfile3a.f90 similarity index 100% rename from rfile3a.F90 rename to rfile3a.f90 diff --git a/runqqq.F90 b/runqqq.f90 similarity index 100% rename from runqqq.F90 rename to runqqq.f90 diff --git a/savetf2.F90 b/savetf2.f90 similarity index 100% rename from savetf2.F90 rename to savetf2.f90 diff --git a/sec_midn.F90 b/sec_midn.f90 similarity index 100% rename from sec_midn.F90 rename to sec_midn.f90 diff --git a/wsjtgen.F90 b/wsjtgen.f90 similarity index 100% rename from wsjtgen.F90 rename to wsjtgen.f90