From a7f667779abf8cf536bf9fbeed619e0e6b19b369 Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Wed, 9 Dec 2020 12:47:08 +0100 Subject: [PATCH] allow roaming / portable / mobile calls in wsjt-x message --- owrx/wsjt.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/owrx/wsjt.py b/owrx/wsjt.py index 823a118..90c4d9c 100644 --- a/owrx/wsjt.py +++ b/owrx/wsjt.py @@ -195,7 +195,7 @@ class WsjtParser(Parser): class Decoder(ABC): - locator_pattern = re.compile(".*\\s([A-Z0-9]{2,})(\\sR)?\\s([A-R]{2}[0-9]{2})$") + locator_pattern = re.compile(".*\\s([A-Z0-9/]{2,})(\\sR)?\\s([A-R]{2}[0-9]{2})$") def __init__(self, profile): self.profile = profile @@ -250,7 +250,7 @@ class Jt9Decoder(Decoder): class WsprDecoder(Decoder): - wspr_splitter_pattern = re.compile("([A-Z0-9]*)\\s([A-R]{2}[0-9]{2})\\s([0-9]+)") + wspr_splitter_pattern = re.compile("([A-Z0-9/]*)\\s([A-R]{2}[0-9]{2})\\s([0-9]+)") def parse(self, msg, dial_freq): # wspr sample