Commit Graph

27 Commits

Author SHA1 Message Date
Bill Somerville
f4903ae1bd Fix issues with type 2 compound calls in contest mode
Message generation in  contest mode now generates the  correct Tx3 for
type 2 calls.

"<type-2> 73"  is a free  text so  needed special handling  in message
processing.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8064 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-09-01 21:29:02 +00:00
Bill Somerville
51d50ecf78 Fix issue compiling with Qt older than v5.7
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8063 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-09-01 20:43:45 +00:00
Bill Somerville
dd1362b69a Rationalize NA contest mode
Generic message packing and unpacking routines now understand antipode
grid contest messages.  These messages  are now recognized as standard
messages in  message response processing and  dealt with appropriately
when contest mode is selected and applicable (currently FT8 and MSK144
only).

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8062 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-09-01 20:10:35 +00:00
Bill Somerville
bda874be89 Many improvements to decode double click and auoto-sequencing behaviour
Double-clicks on 73 messages fixed.  Fixed issue with incorrect decode
being  selected  by  double-click. Refined  auto-sequencing  sign  off
handling, any 73 or rr73 free text  near Rx or Tx frequency taken as a
73 from QSO  partner but if a  standard message then must  be from QSO
partner.

Moved functionality from MainWindow to DecodedText class.

More  efficient  picking of  messages  from  decoded text  windows  by
extracting the text block directly.

Tighten up  use of RR73 and  skipping Tx1, these are  now disabled for
relevant compound calls where they would break the QSO exchange.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8056 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-09-01 05:11:57 +00:00
Bill Somerville
363c469b55 Fix some signoff issues with auto-sequencing
73 messages from other QSOs on  frequency should now be ignored rather
than being processed.

Also some  long overdue refactoring  and tidying of  non-idiomatic C++
code in the logbook directory.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8047 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-08-30 02:27:57 +00:00
Bill Somerville
388f5d13ab Better detection of allsign from general calls (CQ, QRZ ...)
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@8027 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-08-16 12:10:50 +00:00
Bill Somerville
ee2badb86f 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.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7957 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-07-26 21:18:59 +00:00
Bill Somerville
87ae336443 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.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7939 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-07-24 19:27:23 +00:00
Bill Somerville
66b347d83f Fix report extraction from short code messages
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7826 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-07-09 20:45:45 +00:00
Joe Taylor
f6ecfec363 Add some timer calls; fix reporting of FT8 spots to PSKreporter.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7755 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2017-06-30 20:11:07 +00:00
Bill Somerville
b6006dacca Correctly extract grid from reply to tailender in MSK144 contest exchange
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7399 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-12-18 22:20:07 +00:00
Bill Somerville
fed0e9e171 Make handling of special CQ messages consistent
CQ NNN ... and CQ aa ... are  coalesced to CQ_NNN ... and CQ_aa ... so
as to keep the word count and indexes consistent with plain CQ ..., DE
... and QRZ ... standard message forms when parsing messages.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7356 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-12-04 00:54:58 +00:00
Joe Taylor
7600269207 Allow "CQ nnn ..." messages to be posted to PSKreporter.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7346 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-29 15:24:50 +00:00
Bill Somerville
5152778813 Allow for new directional CQ messages in message processing
Also relax entry validation so it  is easier to enter standard message
forms longer than 13 characters into message entry line edits.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7294 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-11-05 19:41:03 +00:00
Joe Taylor
6dcdee836e Further speed improvements for MSK144 RT decoding. Fiz what I broke in the "click-on-CQ-message" logic.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7144 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-03 17:08:02 +00:00
Joe Taylor
672a4e88b5 MSK144 mode: minimum Ftol=20; report received copied to Log screen; spots sent to PSKreporter.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7140 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-02 23:16:47 +00:00
Joe Taylor
8dc2fef844 Back out some changes that were broken. PSK reporter not yet functional for MSK144.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7136 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-01 20:10:46 +00:00
Joe Taylor
02ef8823ef 1. Allow Ftol down to 20 Hz in MSK144 mode.
2. Do not adjust Rx Freq automatically after an MSK144 decode.
3. Insert the Rcvd report in log window.
4. Send MSK144 decodes to PSK Reporter.

NB: not all these are fully tested, yet.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@7134 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-10-01 19:32:16 +00:00
Bill Somerville
76917ed1ac Allow for empty decode messages when extracting received reports
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6841 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-07-01 11:37:10 +00:00
Bill Somerville
66c390de79 More consistent highlighting and processing of general call messages
Highlight,  in the  CQ  colour, CQDX  ... and  QRZ  ...  messages  and
process correctly for worked before and DXCC entity.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6753 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-06-09 23:39:48 +00:00
Joe Taylor
764e2f95d5 Fix up message generation when short messages are used and decoded.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6466 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2016-02-04 17:30:04 +00:00
Bill Somerville
1a23757b26 Reintegrate merge from wsjtx_exp branch.
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@6122 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-11-18 01:28:12 +00:00
Bill Somerville
a51c5c4251 Reintegrate Joe's experimental VHF & up features
As at ^/branches/wsjtx_exp@5271



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5272 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-04-22 17:48:03 +00:00
Bill Somerville
54463bdb11 Fix latent error with uninitialize variable
git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5056 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-03-14 22:19:22 +00:00
Bill Somerville
2b781d1685 Improved automatic message handling
More consistent and accurate processing of compund callsigns including
recognizing the  user's call  in both base  and fully  qualified form,
extracting reports  from special type  one and type two  compound call
messages.  Ensure that  "CQ DX"  message prefixes  are recognized  and
processd correctly.

The  cycle of  double  clicking through  a QSO  has  been enhanced  to
recognoize the  standard messages correctly  and use the  correct next
message. The automatic  transmission button "Enable Tx"  now does what
it says and does not double as a stop transmit button. This allows the
current transmission  to complete  even if the  automatic transmission
feature is  disabled. In line with  this the "stop sending  after a 73
message is sent"  feature turns off the  automatic transmission enable
at the start of the sending of  a 73 message and also the next message
is now set up as the CQ  message automatically in this scenario.  A 73
message is now  either a standard message containing the  word "73" or
any free text  message containing "73" (not necessarily  as a distinct
word").

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5055 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-03-14 19:13:18 +00:00
Bill Somerville
21bf2b6b31 Better handling of compound callsigns
Option  to control  standard message  generation for  type 2  compound
callsign holders.

Process decoded  messages based  on either base  or full  callsign for
both DE and DX callsigns.

Change CW id when callsign changed in settings.

Merged from wsjtx-1.4 branch.



git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@5000 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2015-03-04 12:22:33 +00:00
Murray Curtis
13dba2b1ba 1. Decoded text should now remain left justified even if the font is too large for the window
2. The main window can be expanded wider to allow those with large screens to use larger fonts
3. New class DecodedText handles the formatted text from decoder.f90.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3564 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
2013-08-25 01:48:45 +00:00