PyFT8 3.0.0__tar.gz → 3.0.2__tar.gz

{pyft8-3.0.0 → pyft8-3.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 3.0.0
+Version: 3.0.2
 Summary: FT8 Decoding and Encoding in Python with test/loopback code
 Author-email: G1OJS <g1ojs@yahoo.com>
 License-Expression: GPL-3.0-or-later
@@ -27,7 +27,8 @@ PyFT8 is somewhat experimental, with a focus on demonstrating FT8 written in Pyt
 If you're interested in how this works, maybe have a look at [MiniPyFT8](https://github.com/G1OJS/MiniPyFT8) which puts all of the receive code in a single 300 line Python file.
 
 ## Features
- - Rx and Tx of standard messages with optional /P and /R, and nonstandard calls plus hashed calls
+ - Rx and Tx of standard messages with optional /P and /R
+ - RX of nonstandard calls plus hashed calls
  - Launches quickly (~2 seconds on my old Dell Optiplex 790)
  - Use with or without gui (receive and send messages via command line commands)
  - Automatically chooses clearest Tx frequency
@@ -127,7 +128,7 @@ PyFT8 doesn't decode / encode *all* message types. The table below shows which a
 |1|Std Msg  |Y| Y  |Standard <=6 char callsigns, can include /R  |
 |2|EU VHF  |Y|Y| Standard <=6 char callsigns,  can include /P |
 |3|RTTY RU   |   |   | |
-|4|NonStd Call   |Y|Y| <=11 char callsigns + hashed call|
+|4|NonStd Call   |Y|N| <=11 char callsigns + hashed call|
 |5|EU VHF  |   |   | |
 
 ## Acknowledgements

{pyft8-3.0.0 → pyft8-3.0.2}/PyFT8/databases.py

@@ -1,7 +1,7 @@
 from PyFT8.pskreporter import PSKR_MQTT_listener
 import threading, time, os, pickle, json
 
-call_hashes = {}
+call_hashes, hashes_for_calls = {}, {}
 
 def add_call_hashes(call):
     global call_hashes
@@ -17,9 +17,9 @@ def add_call_hashes(call):
         x = x * 47055833459
         x = x & ((1 << 64) - 1)
         x = x >> (64 - m)
-        hashes.append(x)
+        hashes.append((x, m))
         call_hashes[(x, m)] = call
-    return hashes
+    hashes_for_calls[call] = hashes
 
 def grid_to_latlong(grid, centre = True):
     lat, lon = -90, -180

{pyft8-3.0.0 → pyft8-3.0.2}/PyFT8/pskreporter.py

@@ -9,7 +9,8 @@ class PSKR_MQTT_listener:
     def __init__(self, home_square, on_spot):
         self.home_square = home_square
         self.on_spot = on_spot
-        mqttc = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2)
+        client_id = "PyFT8_" + ''.join(random.choice('0123456789ABCDEF') for i in range(16))
+        mqttc = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2, client_id)
         mqttc.on_connect = self.on_connect
         mqttc.on_message = self.on_message
         try:

{pyft8-3.0.0 → pyft8-3.0.2}/PyFT8/pyft8.py

@@ -12,7 +12,7 @@ from PyFT8.time_utils import global_time_utils
 from PyFT8.rigctrl import Rig_hamlib
 from PyFT8.databases import History, ADIF
 
-VER = '3.0.0'
+VER = '3.0.2'
 
 MAX_TX_START_SECONDS = 2.5
 HEARING_PANEL_LIFE_MINS = 20

{pyft8-3.0.0 → pyft8-3.0.2}/PyFT8/transmitter.py

@@ -2,7 +2,7 @@ import numpy as np
 import wave
 import pyaudio
 import time
-from PyFT8.databases import add_call_hashes
+from PyFT8.databases import hashes_for_calls, add_call_hashes
 
 #==================== AUDIO OUT ================================================================
 
@@ -56,35 +56,42 @@ class AudioOut:
         stream.stop_stream()
         stream.close()
 
-#==================== PACK AND ENCODE ================================================================
-generator_matrix_rows = ["8329ce11bf31eaf509f27fc",  "761c264e25c259335493132",  "dc265902fb277c6410a1bdc",  "1b3f417858cd2dd33ec7f62",  "09fda4fee04195fd034783a",  "077cccc11b8873ed5c3d48a",  "29b62afe3ca036f4fe1a9da",  "6054faf5f35d96d3b0c8c3e",  "e20798e4310eed27884ae90",  "775c9c08e80e26ddae56318",  "b0b811028c2bf997213487c",  "18a0c9231fc60adf5c5ea32",  "76471e8302a0721e01b12b8",  "ffbccb80ca8341fafb47b2e",  "66a72a158f9325a2bf67170",  "c4243689fe85b1c51363a18",  "0dff739414d1a1b34b1c270",  "15b48830636c8b99894972e",  "29a89c0d3de81d665489b0e",  "4f126f37fa51cbe61bd6b94",  "99c47239d0d97d3c84e0940",  "1919b75119765621bb4f1e8",  "09db12d731faee0b86df6b8",  "488fc33df43fbdeea4eafb4",  "827423ee40b675f756eb5fe",  "abe197c484cb74757144a9a",  "2b500e4bc0ec5a6d2bdbdd0",  "c474aa53d70218761669360",  "8eba1a13db3390bd6718cec",  "753844673a27782cc42012e",  "06ff83a145c37035a5c1268",  "3b37417858cc2dd33ec3f62",  "9a4a5a28ee17ca9c324842c",  "bc29f465309c977e89610a4",  "2663ae6ddf8b5ce2bb29488",  "46f231efe457034c1814418",  "3fb2ce85abe9b0c72e06fbe",  "de87481f282c153971a0a2e",  "fcd7ccf23c69fa99bba1412",  "f0261447e9490ca8e474cec",  "4410115818196f95cdd7012",  "088fc31df4bfbde2a4eafb4",  "b8fef1b6307729fb0a078c0",  "5afea7acccb77bbc9d99a90",  "49a7016ac653f65ecdc9076",  "1944d085be4e7da8d6cc7d0",  "251f62adc4032f0ee714002",  "56471f8702a0721e00b12b8",  "2b8e4923f2dd51e2d537fa0",  "6b550a40a66f4755de95c26",  "a18ad28d4e27fe92a4f6c84",  "10c2e586388cb82a3d80758",  "ef34a41817ee02133db2eb0",  "7e9c0c54325a9c15836e000",  "3693e572d1fde4cdf079e86",  "bfb2cec5abe1b0c72e07fbe",  "7ee18230c583cccc57d4b08",  "a066cb2fedafc9f52664126",  "bb23725abc47cc5f4cc4cd2",  "ded9dba3bee40c59b5609b4",  "d9a7016ac653e6decdc9036",  "9ad46aed5f707f280ab5fc4",  "e5921c77822587316d7d3c2",  "4f14da8242a8b86dca73352",  "8b8b507ad467d4441df770e",  "22831c9cf1169467ad04b68",  "213b838fe2ae54c38ee7180",  "5d926b6dd71f085181a4e12",  "66ab79d4b29ee6e69509e56",  "958148682d748a38dd68baa",  "b8ce020cf069c32a723ab14",  "f4331d6d461607e95752746",  "6da23ba424b9596133cf9c8",  "a636bcbc7b30c5fbeae67fe",  "5cb0d86a07df654a9089a20",  "f11f106848780fc9ecdd80a",  "1fbb5364fb8d2c9d730d5ba",  "fcb86bc70a50c9d02a5d034",  "a534433029eac15f322e34c",  "c989d9c7c3d3b8c55d75130",  "7bb38b2f0186d46643ae962",  "2644ebadeb44b9467d1f42c",  "608cc857594bfbb55d69600"]
-kGEN = np.array([int(row,16)>>1 for row in generator_matrix_rows])
+#==================== PACK ================================================================
+
+def ifindex(arr, val, default = None):
+    return arr.index(val) if val in arr else default
 
 def pack_message(c1, c2, gr):
     symbols, bits77 = _pack_message(c1, c2, gr)
     return symbols
 
 def _pack_message(c1, c2, gr):
-    c28a, p1a = pack_ft8_c28(c1)
-    c28b, p1b = pack_ft8_c28(c2)
+    c29a, c29b = pack_ft8_c29(c1), pack_ft8_c29(c2)
     g15, ir = pack_ft8_g15(gr)
-    i3 = 2 if c1.endswith('/P') or c2.endswith('/P') else 1
-    n3 = 0
-    if(c28a>=0 and c28b>=0):
+    if c29a and c29b:
+        c28a, p1a = c29a
+        c28b, p1b = c29b
+        i3 = 2 if c1.endswith('/P') or c2.endswith('/P') else 1
+        n3 = 0    
+        bits77 = (c28a<<28+1+1+1+15+3) | (p1a<<28+1+1+15+3) | (c28b<<1+1+15+3) | (p1b <<1+15+3) | (ir<<15+3) | (g15<< 3) | (i3)
+        symbols  = encode_bits77(bits77)
+    if c29b and not c29a:
+        add_call_hashes(c1)
+        c28a, p1a = 2063592 + hashes_for_calls[c1][2][0], 0
+        c28b, p1b = c29b
+        i3 = 2 if c2.endswith('/P') else 1
+        n3 = 0    
         bits77 = (c28a<<28+1+1+1+15+3) | (p1a<<28+1+1+15+3) | (c28b<<1+1+15+3) | (p1b <<1+15+3) | (ir<<15+3) | (g15<< 3) | (i3)
         symbols  = encode_bits77(bits77)
-    else:
-        i3 = 4
-        full_call = c1 if c28b>0 else c2
-        hash_call = c2 if c28b>0 else c1
-        c58 = pack_ft8_c58(full_call)
-        hashes = add_call_hashes(hash_call)
-        swp = 1 if hash_call == c2 else 0
-        rrr, cq_ = 0, 0
-        if gr in ('RRR', 'RR73', '73'):
-            rrr = ('', 'RRR', 'RR73', '73').index(gr)
-        bits77 = (hashes[1]<<58+1+2+1+3) | (c58 <<1+2+1+3) | (swp<<2+1+3) | (rrr<<1+3) | (cq_<<3) | (i3)
+    if c29a and not c29b:
+        add_call_hashes(c2)
+        c28b, p1b = 2063592 + hashes_for_calls[c2][2][0], 0
+        c28a, p1a = c29a
+        i3 = 2 if c1.endswith('/P') else 1
+        n3 = 0    
+        bits77 = (c28a<<28+1+1+1+15+3) | (p1a<<28+1+1+15+3) | (c28b<<1+1+15+3) | (p1b <<1+15+3) | (ir<<15+3) | (g15<< 3) | (i3)
         symbols  = encode_bits77(bits77)
+
     return symbols, bits77
 
 
@@ -96,24 +103,23 @@ def pack_ft8_c58(call):
         n58 = n58*38 + chars.index(call[i])
     return n58
 
-def pack_ft8_c28(call):
-    if '/' in call and not call.endswith("P") and not call.endswith("R"): return -1, 0
-    tkns = ['DE','QRZ','CQ']
-    if (call in tkns):
-        c28, p1 = tkns.index(call), 0
-    else:
+def pack_ft8_c29(call):
+    if '/' not in call or call.endswith("P") or call.endswith("R"):
+        t = ifindex(['DE','QRZ','CQ'], call)
+        if t is not None:
+            return t, 0
         p1 = 1 if call[-2:] in ('/P', '/R')  else 0
         call = call.replace('/P','').replace('/R','')
-        if len(call) > 6:
-            return -1, 0
-        prepend_space = '' if call[2].isdigit() else ' '
-        call = (prepend_space + call + '  ')[:6]
-        a = ' 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        b = ' ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-        x = [a.index(call[0]),  a.index(call[1])-1, a.index(call[2])-1, b.index(call[3]),   b.index(call[4]), b.index(call[5]), 1                    ]
-        y = [36*10*27*27*27,    10*27*27*27,        27*27*27,           27*27,              27,               1,                2_063_592 + 4_194_304]
-        c28 = int(np.dot(x,y))
-    return c28, p1
+        if len(call) <= 6:
+            prepend_space = '' if call[2].isdigit() else ' '
+            call = (prepend_space + call + '  ')[:6]
+            a = ' 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+            b = ' ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+            x = [ifindex(a, call[0]),  ifindex(a[1:], call[1]), ifindex(a[1:], call[2]), ifindex(b, call[3]),   ifindex(b, call[4]), ifindex(b, call[5]), 1                    ]
+            if not None in x:
+                y = [36*10*27*27*27,    10*27*27*27,        27*27*27,           27*27,              27,               1,                2_063_592 + 4_194_304]
+                c28 = int(np.dot(x,y))
+                return c28, p1
 
 def pack_ft8_g15(txt):
     ir = 0
@@ -138,6 +144,11 @@ def pack_ft8_g15(txt):
     v = v * 10 + int(txt[3])
     return int(v), ir
 
+#============ ENCODE ========================================================================================================================
+
+generator_matrix_rows = ["8329ce11bf31eaf509f27fc",  "761c264e25c259335493132",  "dc265902fb277c6410a1bdc",  "1b3f417858cd2dd33ec7f62",  "09fda4fee04195fd034783a",  "077cccc11b8873ed5c3d48a",  "29b62afe3ca036f4fe1a9da",  "6054faf5f35d96d3b0c8c3e",  "e20798e4310eed27884ae90",  "775c9c08e80e26ddae56318",  "b0b811028c2bf997213487c",  "18a0c9231fc60adf5c5ea32",  "76471e8302a0721e01b12b8",  "ffbccb80ca8341fafb47b2e",  "66a72a158f9325a2bf67170",  "c4243689fe85b1c51363a18",  "0dff739414d1a1b34b1c270",  "15b48830636c8b99894972e",  "29a89c0d3de81d665489b0e",  "4f126f37fa51cbe61bd6b94",  "99c47239d0d97d3c84e0940",  "1919b75119765621bb4f1e8",  "09db12d731faee0b86df6b8",  "488fc33df43fbdeea4eafb4",  "827423ee40b675f756eb5fe",  "abe197c484cb74757144a9a",  "2b500e4bc0ec5a6d2bdbdd0",  "c474aa53d70218761669360",  "8eba1a13db3390bd6718cec",  "753844673a27782cc42012e",  "06ff83a145c37035a5c1268",  "3b37417858cc2dd33ec3f62",  "9a4a5a28ee17ca9c324842c",  "bc29f465309c977e89610a4",  "2663ae6ddf8b5ce2bb29488",  "46f231efe457034c1814418",  "3fb2ce85abe9b0c72e06fbe",  "de87481f282c153971a0a2e",  "fcd7ccf23c69fa99bba1412",  "f0261447e9490ca8e474cec",  "4410115818196f95cdd7012",  "088fc31df4bfbde2a4eafb4",  "b8fef1b6307729fb0a078c0",  "5afea7acccb77bbc9d99a90",  "49a7016ac653f65ecdc9076",  "1944d085be4e7da8d6cc7d0",  "251f62adc4032f0ee714002",  "56471f8702a0721e00b12b8",  "2b8e4923f2dd51e2d537fa0",  "6b550a40a66f4755de95c26",  "a18ad28d4e27fe92a4f6c84",  "10c2e586388cb82a3d80758",  "ef34a41817ee02133db2eb0",  "7e9c0c54325a9c15836e000",  "3693e572d1fde4cdf079e86",  "bfb2cec5abe1b0c72e07fbe",  "7ee18230c583cccc57d4b08",  "a066cb2fedafc9f52664126",  "bb23725abc47cc5f4cc4cd2",  "ded9dba3bee40c59b5609b4",  "d9a7016ac653e6decdc9036",  "9ad46aed5f707f280ab5fc4",  "e5921c77822587316d7d3c2",  "4f14da8242a8b86dca73352",  "8b8b507ad467d4441df770e",  "22831c9cf1169467ad04b68",  "213b838fe2ae54c38ee7180",  "5d926b6dd71f085181a4e12",  "66ab79d4b29ee6e69509e56",  "958148682d748a38dd68baa",  "b8ce020cf069c32a723ab14",  "f4331d6d461607e95752746",  "6da23ba424b9596133cf9c8",  "a636bcbc7b30c5fbeae67fe",  "5cb0d86a07df654a9089a20",  "f11f106848780fc9ecdd80a",  "1fbb5364fb8d2c9d730d5ba",  "fcb86bc70a50c9d02a5d034",  "a534433029eac15f322e34c",  "c989d9c7c3d3b8c55d75130",  "7bb38b2f0186d46643ae962",  "2644ebadeb44b9467d1f42c",  "608cc857594bfbb55d69600"]
+kGEN = np.array([int(row,16)>>1 for row in generator_matrix_rows])
+
 def ldpc_encode(msg_crc: int) -> int:
     msg_crc = int(msg_crc)
     parity_bits = 0
@@ -182,6 +193,8 @@ def append_crc(bits77_int):
 #==================== TESTS ================================================================
 
 if __name__ == "__main__":
+
+    print("Test standard calls")
     OK = True
     msgs = [("G1OJS/P", "G1OJS/P", "IO90"),("WM3PEN","EA6VQ","+08"),("E67A/P","EA6VQ","R-08"),
             ("CQ","CT7ARQ/P","JO03"), ("EC5A","9A5E","RR73"), ("EC5A/P","9A5E","73"), ("EC5A/MM","9A5E","73"),
@@ -195,5 +208,24 @@ if __name__ == "__main__":
         #print(''.join([str(s) for s in symbols]))
     print("\nPASSED" if OK else "\nFAILED")
 
+    print("\nTest non-standard calls")
+    OK = True
+    msgs = [("SX200M","G1OJS","IO90"),
+            ("G1OJS","SX200M","CB21"),
+            ("CQ","SX200M","CB21")]
+    expected_symbols = ["3140652203407700750145313654745000003140652276403052651370607066332604363140652",
+                        "",
+                        "3140652564261623472565070174400214333140652601351750040163007617513443213140652"]
+    for i, msg_tx in enumerate(msgs):
+        symbols, bits77 = _pack_message(*msg_tx)
+        from PyFT8.receiver import unpack
+        msg_rx = unpack(bits77)
+        print(f"\n{msg_tx}\n{msg_rx}")
+        OK = OK and (msg_tx == msg_rx) or 'implemented' in msg_rx
+        print(f"exp: {expected_symbols[i]}")
+        print(f"gen: {''.join([str(s) for s in symbols])}")
+    print("\nPASSED" if OK else "\nFAILED")
+
+    print("\nUnpack 'CQ DX G1OJS IO90'")
     print(unpack(int('00000000000000000100011011110000010010000000000111000001100011111000010010001',2)))
         

{pyft8-3.0.0 → pyft8-3.0.2}/PyFT8.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 3.0.0
+Version: 3.0.2
 Summary: FT8 Decoding and Encoding in Python with test/loopback code
 Author-email: G1OJS <g1ojs@yahoo.com>
 License-Expression: GPL-3.0-or-later
@@ -27,7 +27,8 @@ PyFT8 is somewhat experimental, with a focus on demonstrating FT8 written in Pyt
 If you're interested in how this works, maybe have a look at [MiniPyFT8](https://github.com/G1OJS/MiniPyFT8) which puts all of the receive code in a single 300 line Python file.
 
 ## Features
- - Rx and Tx of standard messages with optional /P and /R, and nonstandard calls plus hashed calls
+ - Rx and Tx of standard messages with optional /P and /R
+ - RX of nonstandard calls plus hashed calls
  - Launches quickly (~2 seconds on my old Dell Optiplex 790)
  - Use with or without gui (receive and send messages via command line commands)
  - Automatically chooses clearest Tx frequency
@@ -127,7 +128,7 @@ PyFT8 doesn't decode / encode *all* message types. The table below shows which a
 |1|Std Msg  |Y| Y  |Standard <=6 char callsigns, can include /R  |
 |2|EU VHF  |Y|Y| Standard <=6 char callsigns,  can include /P |
 |3|RTTY RU   |   |   | |
-|4|NonStd Call   |Y|Y| <=11 char callsigns + hashed call|
+|4|NonStd Call   |Y|N| <=11 char callsigns + hashed call|
 |5|EU VHF  |   |   | |
 
 ## Acknowledgements

{pyft8-3.0.0 → pyft8-3.0.2}/README.md

@@ -8,7 +8,8 @@ PyFT8 is somewhat experimental, with a focus on demonstrating FT8 written in Pyt
 If you're interested in how this works, maybe have a look at [MiniPyFT8](https://github.com/G1OJS/MiniPyFT8) which puts all of the receive code in a single 300 line Python file.
 
 ## Features
- - Rx and Tx of standard messages with optional /P and /R, and nonstandard calls plus hashed calls
+ - Rx and Tx of standard messages with optional /P and /R
+ - RX of nonstandard calls plus hashed calls
  - Launches quickly (~2 seconds on my old Dell Optiplex 790)
  - Use with or without gui (receive and send messages via command line commands)
  - Automatically chooses clearest Tx frequency
@@ -108,7 +109,7 @@ PyFT8 doesn't decode / encode *all* message types. The table below shows which a
 |1|Std Msg  |Y| Y  |Standard <=6 char callsigns, can include /R  |
 |2|EU VHF  |Y|Y| Standard <=6 char callsigns,  can include /P |
 |3|RTTY RU   |   |   | |
-|4|NonStd Call   |Y|Y| <=11 char callsigns + hashed call|
+|4|NonStd Call   |Y|N| <=11 char callsigns + hashed call|
 |5|EU VHF  |   |   | |
 
 ## Acknowledgements

{pyft8-3.0.0 → pyft8-3.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "PyFT8"
-version = "3.0.0"
+version = "3.0.2"
 license = "GPL-3.0-or-later"
 
 authors = [