mirror of
https://github.com/saitohirga/WSJT-X.git
synced 2024-10-31 23:57:10 -04:00
c669046be1
------------------------------------------------------------------------ r7861 | k9an | 2017-07-12 22:49:39 +0100 (Wed, 12 Jul 2017) | 1 line Use quarter-symbol steps for time sync. Lower sync threshold. Implement subtraction and two pass decoding. Use osd2 only near nfqso. ------------------------------------------------------------------------ r7862 | k9an | 2017-07-13 01:28:57 +0100 (Thu, 13 Jul 2017) | 1 line Fix NHSYM. ------------------------------------------------------------------------ r7863 | k9an | 2017-07-13 01:31:52 +0100 (Thu, 13 Jul 2017) | 1 line Fix a comment. No code changes. ------------------------------------------------------------------------ r7864 | k9an | 2017-07-13 01:43:56 +0100 (Thu, 13 Jul 2017) | 1 line Fix another bounds error. ------------------------------------------------------------------------ r7879 | k1jt | 2017-07-14 17:02:01 +0100 (Fri, 14 Jul 2017) | 1 line Code cleanup and test ofFT8 decodes with erasures. Do not use on the air. ------------------------------------------------------------------------ r7881 | k1jt | 2017-07-14 19:19:48 +0100 (Fri, 14 Jul 2017) | 1 line Fix nutc in jt9; alternative sync value for late-start FT8 signals. ------------------------------------------------------------------------ r7882 | k9an | 2017-07-14 20:22:53 +0100 (Fri, 14 Jul 2017) | 1 line Move ft8apset to a separate file. ------------------------------------------------------------------------ r7884 | k9an | 2017-07-14 20:35:22 +0100 (Fri, 14 Jul 2017) | 1 line Add ft8apset.f90. ------------------------------------------------------------------------ r7885 | k9an | 2017-07-14 20:46:04 +0100 (Fri, 14 Jul 2017) | 1 line Update call to ft8b. ------------------------------------------------------------------------ r7886 | k9an | 2017-07-14 21:12:29 +0100 (Fri, 14 Jul 2017) | 1 line More work on ap. ------------------------------------------------------------------------ r7887 | k9an | 2017-07-14 23:09:50 +0100 (Fri, 14 Jul 2017) | 1 line More work on AP. Deep decode is unstable - not for use on the air. ------------------------------------------------------------------------ r7890 | k9an | 2017-07-15 01:33:25 +0100 (Sat, 15 Jul 2017) | 1 line Turn off ap. ------------------------------------------------------------------------ r7891 | k9an | 2017-07-15 02:49:44 +0100 (Sat, 15 Jul 2017) | 1 line Add some more items to the lun 81 diagnostics. ------------------------------------------------------------------------ r7892 | k9an | 2017-07-15 15:21:18 +0100 (Sat, 15 Jul 2017) | 1 line Properly calculate metrics for non-ap bits that reside in symbols that contain ap bits. ------------------------------------------------------------------------ r7893 | k9an | 2017-07-15 16:43:41 +0100 (Sat, 15 Jul 2017) | 1 line Use overlap and add to apply reference filter/amplitude equalization. ------------------------------------------------------------------------ r7894 | k9an | 2017-07-15 16:46:46 +0100 (Sat, 15 Jul 2017) | 1 line Improve a comment. ------------------------------------------------------------------------ r7895 | k9an | 2017-07-16 01:10:37 +0100 (Sun, 16 Jul 2017) | 1 line Make refspec filter causal for overlap and add. ------------------------------------------------------------------------ r7911 | k9an | 2017-07-16 16:56:06 +0100 (Sun, 16 Jul 2017) | 1 line More work on Deep decoding. ------------------------------------------------------------------------ r7917 | k9an | 2017-07-16 18:08:09 +0100 (Sun, 16 Jul 2017) | 1 line Properly round the printed snr. ------------------------------------------------------------------------ r7925 | k9an | 2017-07-18 02:12:11 +0100 (Tue, 18 Jul 2017) | 1 line Work on ap decoding. Diagnostic write enabled. ------------------------------------------------------------------------ r7926 | k9an | 2017-07-18 16:22:20 +0100 (Tue, 18 Jul 2017) | 1 line Fix a bug in AP decoding when iaptype=2. Decrease time-sync search range to +/- 1.5s. Fix a big with erasure decoding. ------------------------------------------------------------------------ r7927 | k1jt | 2017-07-20 00:23:20 +0100 (Thu, 20 Jul 2017) | 1 line Remove slider next to audio level meter. ------------------------------------------------------------------------ r7928 | k1jt | 2017-07-20 16:15:00 +0100 (Thu, 20 Jul 2017) | 6 lines 1. Alt+F8 arms "Call 1st" as if a CQ had been sent. 2. "Call 1st" label turns red when armed to respond to a caller. 3. Suppress some recognizable false decodes, send them to cumulative file "data_dir/false_decodes.txt". 4. Reduce sleep delay in decoder() to 10 ms. ------------------------------------------------------------------------ r7929 | k1jt | 2017-07-20 20:23:17 +0100 (Thu, 20 Jul 2017) | 1 line Fix wording in list of keyboard shortcuts. ------------------------------------------------------------------------ r7930 | k1jt | 2017-07-20 20:25:08 +0100 (Thu, 20 Jul 2017) | 2 lines Comment out diagnostic write. ------------------------------------------------------------------------ r7931 | k9an | 2017-07-20 22:08:36 +0100 (Thu, 20 Jul 2017) | 1 line Only print dupes if SNR is higher than what has already been printed. ------------------------------------------------------------------------ r7932 | k9an | 2017-07-21 23:02:06 +0100 (Fri, 21 Jul 2017) | 1 line Add to the list of allowed keywords in jtmsg.f90. ------------------------------------------------------------------------ r7933 | k9an | 2017-07-22 04:01:09 +0100 (Sat, 22 Jul 2017) | 1 line Add variables lapon and napwid to control ap decoding. Reconfigure the logic for AP decoding and ordered-statistics decoding. ------------------------------------------------------------------------ r7934 | k9an | 2017-07-22 14:21:03 +0100 (Sat, 22 Jul 2017) | 1 line Prevent a certain type of non-standard message from being flagged as a false decode. ------------------------------------------------------------------------ r7935 | k9an | 2017-07-22 18:12:48 +0100 (Sat, 22 Jul 2017) | 1 line More informative end-of-line annotation for AP decodes. ------------------------------------------------------------------------ r7936 | k9an | 2017-07-24 15:23:22 +0100 (Mon, 24 Jul 2017) | 1 line Bring msk144d2 more up to date. Runs now, but still needs more work. ------------------------------------------------------------------------ r7937 | k1jt | 2017-07-24 15:48:16 +0100 (Mon, 24 Jul 2017) | 2 lines Correct the spacing between marked lowest and highest FT8 tones for RxFreq (green) and TxFreq (red). ------------------------------------------------------------------------ r7938 | bsomervi | 2017-07-24 20:27:14 +0100 (Mon, 24 Jul 2017) | 4 lines Add double clickable push button and radio button widgets These emit doubleClicked signal when double-clicked, otherwise they are identical to their super-classes. ------------------------------------------------------------------------ r7939 | bsomervi | 2017-07-24 20:27:23 +0100 (Mon, 24 Jul 2017) | 42 lines Add the option to ALT+click a decoded CQ or QRZ message which only moves the Rx frequency to theirs, this facilitates calling a station who is busy and may have many callers on their frequency. Updated the corresponding mouse shortcuts help text. Allow for times with seconds when parsing fast mode and FT8 decodes. Exclude the RR73 grid square from and grid validation or matching, it is not a grid square any more as far as WSJT-X is concerned, it is an RRR substitute. Add a simple state machine for QSO progress such that replies and auto-sequencing can be better controlled. Get compound callsign edge cases working again and allow QSOs from and to compound callsign holders working in as many situations as possible including auto-sequencing and FT8 auto-reply mode. This does mean that a "DE W6/K1ABC DM93" type message close to a callers Tx or Rx frequency will be taken as a reply to a CQ call despite it not being explicitly addressed back to the CQ caller. Compound callsigns should work in MSK144 contest mode also as well as in short code modes with some minor restrictions (short codes will not be used where configuration demands that a message be used to send a full compound callsign). Auto sequencing has been made generic such that it can be used for more than one mode if desired. Allow the use of free text messages to sign off in auto sequenced QSOs without the message being overwritten by the sequencer. Double click actions have been added to the Tx5 radio and push buttons to revert back to the default standard 73 message. Make DisplayText class interface more idiomatic C++ and simplify a bit. Fixed some displayed widget arrangements for different modes and sub-modes so that they are consistent when starting up and when switching mode or sub-mode. This is a big change which has been extensively tested but no doubt there will also be some new defects introduced. ------------------------------------------------------------------------ r7940 | bsomervi | 2017-07-25 17:51:19 +0100 (Tue, 25 Jul 2017) | 1 line Fix issue with Tx5 not being generated with a new DX Call ------------------------------------------------------------------------ r7941 | bsomervi | 2017-07-25 17:51:27 +0100 (Tue, 25 Jul 2017) | 1 line Fix country name display that broke in r7939 ------------------------------------------------------------------------ r7942 | bsomervi | 2017-07-25 17:51:34 +0100 (Tue, 25 Jul 2017) | 1 line Ensure JT9 lowest decode frequency spin box is disabled when not available ------------------------------------------------------------------------ r7943 | bsomervi | 2017-07-25 17:51:42 +0100 (Tue, 25 Jul 2017) | 4 lines Pick up tail-enders when completing a call 1st QSO after re-enabling auto Tx Allow any message to start a QSO so long as we are not in an auto-reply QSO. ------------------------------------------------------------------------ r7944 | bsomervi | 2017-07-25 17:51:49 +0100 (Tue, 25 Jul 2017) | 1 line Exclude all decode quality markers from internal decode parsing and matching ------------------------------------------------------------------------ r7945 | k9an | 2017-07-25 20:06:05 +0100 (Tue, 25 Jul 2017) | 1 line Move '?' quality warning to message(22:22). ------------------------------------------------------------------------ r7946 | k9an | 2017-07-25 21:55:13 +0100 (Tue, 25 Jul 2017) | 1 line Reject candiates with fewer than 7 correct hard-decoded sync symbols. ------------------------------------------------------------------------ r7947 | bsomervi | 2017-07-26 02:38:37 +0100 (Wed, 26 Jul 2017) | 1 line Force Settings tab to Radio tab when navigating there from a rig error message ------------------------------------------------------------------------ r7948 | bsomervi | 2017-07-26 02:38:44 +0100 (Wed, 26 Jul 2017) | 1 line Correct the highlighting of the Call 1st check box label ------------------------------------------------------------------------ r7949 | bsomervi | 2017-07-26 02:38:57 +0100 (Wed, 26 Jul 2017) | 5 lines Option to skip using grid reply message Enable and disable by double-clicking the Tx1 button or the adjacent radio button. Tx1 message shows grayed out when the Tx1 message is elided. ------------------------------------------------------------------------ r7950 | bsomervi | 2017-07-26 02:39:04 +0100 (Wed, 26 Jul 2017) | 6 lines Option to use RR73 grid message as RRR message substitutes Enable or disable by double-clicking the Tx4 button or the adjacent radio button. Is auto disabled by a band change as it is expected that the user reassess the conditions to see if message repetitions are unlikely to be needed. ------------------------------------------------------------------------ r7951 | bsomervi | 2017-07-26 02:39:11 +0100 (Wed, 26 Jul 2017) | 1 line Fix highlighting of the call first check box label ------------------------------------------------------------------------ r7952 | bsomervi | 2017-07-26 02:39:23 +0100 (Wed, 26 Jul 2017) | 1 line Better behavior and tool tips for Txn buttons and radio buttons ------------------------------------------------------------------------ r7953 | bsomervi | 2017-07-26 02:39:30 +0100 (Wed, 26 Jul 2017) | 1 line Auto Tx stop when calling a CQer who answers another station on your Tx frequency ------------------------------------------------------------------------ r7954 | bsomervi | 2017-07-26 11:56:12 +0100 (Wed, 26 Jul 2017) | 1 line Add menu option to turn on AP decoding in FT8 mode ------------------------------------------------------------------------ r7955 | k9an | 2017-07-26 14:05:34 +0100 (Wed, 26 Jul 2017) | 1 line Enable AP for any decoding level. ------------------------------------------------------------------------ r7956 | k1jt | 2017-07-26 14:44:31 +0100 (Wed, 26 Jul 2017) | 1 line Remove obsolete test program. ------------------------------------------------------------------------ r7957 | bsomervi | 2017-07-26 22:18:59 +0100 (Wed, 26 Jul 2017) | 11 lines Use the low confidence decode quality marker to elide spots and pass info via UDP The UDP decode and reply message have been augmented with a boolean flag denoting a low confidence decode when set. Existing clients can safely use the reply message without passing the flag as the default value will still action messages that have high confidence. If low confidence decodes are to be passed back via the reply message then the low confidence flag must be included and correctly set to match the original decode. See NetworkMessage.hpp for message fields and meanings. ------------------------------------------------------------------------ r7958 | bsomervi | 2017-07-26 22:19:21 +0100 (Wed, 26 Jul 2017) | 3 lines Add QSO state machine state and tx audio offset to parameters passed to slow decoders Required to pick best AP masks in FT8 decoder ------------------------------------------------------------------------ r7959 | bsomervi | 2017-07-26 23:03:02 +0100 (Wed, 26 Jul 2017) | 1 line Extend grids looked up from CALL3.TXT from 4 to 6-digits if first 4 match ------------------------------------------------------------------------ r7960 | k9an | 2017-07-27 16:35:40 +0100 (Thu, 27 Jul 2017) | 1 line nQSOProgress now controls AP decoding. Needs testing - may not be stable with AP enabled. ------------------------------------------------------------------------ r7961 | k9an | 2017-07-27 19:07:54 +0100 (Thu, 27 Jul 2017) | 1 line Correct some logic so that AP is only on when selected and so that AP decodes of type 4 or greater are limited to the vicinity of nfqso or nftx. ------------------------------------------------------------------------ r7962 | k1jt | 2017-07-27 19:57:53 +0100 (Thu, 27 Jul 2017) | 2 lines Remove unused arguments from the call to fix_contest_msg(). ------------------------------------------------------------------------ r7963 | k1jt | 2017-07-27 21:17:30 +0100 (Thu, 27 Jul 2017) | 1 line Working on some features for NA VHF contests. Not finished! ------------------------------------------------------------------------ r7964 | bsomervi | 2017-07-28 01:00:42 +0100 (Fri, 28 Jul 2017) | 1 line Fix syntax error in statement function definition ------------------------------------------------------------------------ r7965 | bsomervi | 2017-07-28 02:20:22 +0100 (Fri, 28 Jul 2017) | 6 lines Revert "Extend grids looked up from CALL3.TXT from 4 to 6-digits if first 4 match" Bad idea, need to find a better way to extend grids to 6-digits from CALL3.TXT. This reverts commit r7959 ------------------------------------------------------------------------ r7968 | k9an | 2017-07-28 16:35:17 +0100 (Fri, 28 Jul 2017) | 1 line Comment out diagnostic write to lun 81. ------------------------------------------------------------------------ r7969 | k1jt | 2017-07-28 16:50:13 +0100 (Fri, 28 Jul 2017) | 2 lines Make 72-bit "contest mode" available in FT8 as well as MSK144. ------------------------------------------------------------------------ r7970 | bsomervi | 2017-07-29 00:25:32 +0100 (Sat, 29 Jul 2017) | 7 lines Change tolerances for auto stop and auto-sequence of some messages FT8 auto-stop will only react to messages within +/- 50Hz of our Tx frequency. Auto-sequence on "DE ..." and free text 73 messages will respond if they are within 25Hz of our Tx or Rx frequency. ------------------------------------------------------------------------ r7971 | bsomervi | 2017-07-31 02:28:25 +0100 (Mon, 31 Jul 2017) | 1 line Add extra hidden string length argument to genft8 interface ------------------------------------------------------------------------ r7972 | bsomervi | 2017-07-31 02:28:33 +0100 (Mon, 31 Jul 2017) | 5 lines Fix FT8 call first behaviour with "Lock Tx=Rx" Call first combined with "Lock Tx=Rx" (why would anyone consider doing that!) should continue on the Tx frequency of the station being worked and not be switched another calling station's frequency. ------------------------------------------------------------------------ r7973 | k1jt | 2017-08-01 19:01:27 +0100 (Tue, 01 Aug 2017) | 1 line Utility for generating figure for QST/RadCom article. ------------------------------------------------------------------------ r7974 | k1jt | 2017-08-01 19:16:01 +0100 (Tue, 01 Aug 2017) | 2 lines Tidy up some details for 72-bit contest mode in FT8. ------------------------------------------------------------------------ r7975 | k1jt | 2017-08-01 19:46:12 +0100 (Tue, 01 Aug 2017) | 2 lines Don't highlight FT8 contest-mode Tx3 message as a free-text message. ------------------------------------------------------------------------ r7976 | k1jt | 2017-08-01 20:32:54 +0100 (Tue, 01 Aug 2017) | 2 lines Fix the "F4" shortcut description; add usage advuice to "Lock Tx=Rx" tool tip. ------------------------------------------------------------------------ r7980 | k1jt | 2017-08-02 15:05:37 +0100 (Wed, 02 Aug 2017) | 2 lines Enable "nagain" for FT8, as in other modes. ------------------------------------------------------------------------ r7987 | k1jt | 2017-08-02 20:23:42 +0100 (Wed, 02 Aug 2017) | 2 lines Updates to the WSJT-X User Guide for Version 1.8. ------------------------------------------------------------------------ r7988 | k1jt | 2017-08-02 20:27:43 +0100 (Wed, 02 Aug 2017) | 2 lines Add several new screen shots. ------------------------------------------------------------------------ r7989 | k1jt | 2017-08-02 21:43:06 +0100 (Wed, 02 Aug 2017) | 2 lines Allow auto-seq in QRA64 mode; updates to User Guide. ------------------------------------------------------------------------ r7992 | bsomervi | 2017-08-03 12:23:07 +0100 (Thu, 03 Aug 2017) | 7 lines Fix an issue with VFO tuning while running Doppler correction Holding down the SHIFT key while tuning the rig should update the nominal sked frequency, not holding done the SHIFT key should not update the sked frequency. This is not yet perfect and sometimes a change to the nominal sked frequency can get through but it is a rare as yet unfound race condition. ------------------------------------------------------------------------ r7993 | k9an | 2017-08-03 15:46:21 +0100 (Thu, 03 Aug 2017) | 1 line 1. Use norder=3 for nagain, 2. Renumber aptypes. ------------------------------------------------------------------------ r7994 | k1jt | 2017-08-03 15:48:59 +0100 (Thu, 03 Aug 2017) | 2 lines Remove the "Weak" checkbox from GUI, it's not implemented. ------------------------------------------------------------------------ r7995 | k1jt | 2017-08-03 16:12:30 +0100 (Thu, 03 Aug 2017) | 2 lines More updates to the WSJT-X User Guide. ------------------------------------------------------------------------ git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.8@7996 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
84 lines
1.9 KiB
Fortran
84 lines
1.9 KiB
Fortran
subroutine addit(itone,nfsample,nsym,nsps,ifreq,sig,dat)
|
|
|
|
integer itone(nsym)
|
|
real dat(60*12000)
|
|
real*8 f,dt,twopi,phi,dphi,baud,fsample,freq,tsym,t
|
|
|
|
tsym=nsps*1.d0/nfsample !Symbol duration
|
|
baud=1.d0/tsym
|
|
fsample=12000.d0 !Sample rate (Hz)
|
|
dt=1.d0/fsample !Sample interval (s)
|
|
twopi=8.d0*atan(1.d0)
|
|
dphi=0.
|
|
|
|
iters=1
|
|
if(nsym.eq.79) iters=2
|
|
do iter=1,iters
|
|
f=ifreq
|
|
phi=0.
|
|
ntot=nsym*tsym/dt
|
|
k=12000 !Start audio at t = 1.0 s
|
|
t=0.
|
|
if(nsym.eq.79) k=12000 + (iter-1)*12000*30 !Special case for FT8
|
|
isym0=-1
|
|
do i=1,ntot
|
|
t=t+dt
|
|
isym=nint(t/tsym) + 1
|
|
if(isym.ne.isym0) then
|
|
freq=f + itone(isym)*baud
|
|
dphi=twopi*freq*dt
|
|
isym0=isym
|
|
endif
|
|
phi=phi + dphi
|
|
if(phi.gt.twopi) phi=phi-twopi
|
|
xphi=phi
|
|
k=k+1
|
|
dat(k)=dat(k) + sig*sin(xphi)
|
|
enddo
|
|
enddo
|
|
|
|
return
|
|
end subroutine addit
|
|
|
|
subroutine addcw(icw,ncw,ifreq,sig,dat)
|
|
|
|
integer icw(ncw)
|
|
real dat(60*12000)
|
|
real s(60*12000)
|
|
real x(60*12000)
|
|
real y(60*12000)
|
|
real*8 dt,twopi,phi,dphi,fsample,tdit,t
|
|
|
|
wpm=25.0
|
|
nspd=nint(1.2*12000.0/wpm)
|
|
fsample=12000.d0 !Sample rate (Hz)
|
|
dt=1.d0/fsample !Sample interval (s)
|
|
tdit=nspd*dt
|
|
twopi=8.d0*atan(1.d0)
|
|
dphi=twopi*ifreq*dt
|
|
phi=0.
|
|
k=12000 !Start audio at t = 1.0 s
|
|
t=0.
|
|
npts=60*12000
|
|
x=0.
|
|
do i=1,npts
|
|
t=t+dt
|
|
j=nint(t/tdit) + 1
|
|
j=mod(j-1,ncw) + 1
|
|
phi=phi + dphi
|
|
if(phi.gt.twopi) phi=phi-twopi
|
|
xphi=phi
|
|
k=k+1
|
|
x(k)=icw(j)
|
|
s(k)=sin(xphi)
|
|
if(t.ge.59.5) exit
|
|
enddo
|
|
|
|
nadd=0.004/dt
|
|
call smo(x,npts,y,nadd)
|
|
y=y/nadd
|
|
dat=dat + sig*y*s
|
|
|
|
return
|
|
end subroutine addcw
|