PyFT8 2.7.0__tar.gz → 2.7.2__tar.gz

{pyft8-2.7.0 → pyft8-2.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 2.7.0
+Version: 2.7.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
@@ -28,22 +28,24 @@ If you're interested in how this works, maybe have a look at [MiniPyFT8](https:/
 
 ## Features
  - Rx and Tx of standard messages with optional /P and /R, and nonstandard calls plus hashed calls
- - Doesn't try to do everything, so launches quickly (~2 seconds on my old Dell Optiplex 790)
+ - 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
  - Modern programming language throughout
  - Finds sound cards by keywords so follows them if windows moves them ...
  - Logs QSOs to ADIF file and all spots to WSJTX-style ALL.txt file
  - Uploads spots to pskreporter
- - Direct CAT control for some rigs drops connection when not used, allowing sharing of rig's serial port
+ - Direct CAT control for some rigs, designed to drop connection when not used, allowing sharing of rig's serial port
  - Or control rigs via Hamlib
 
  The Gui shows:
  - Simultaneous views of odd and even cycles
  - Messages overlaid on waterfall signals that produce them
- - Worked-before info and fine grid locators / distance and bearing in the message boxes 
- - Band activity on band select buttons
+ - Worked-before info and fine grid locators / distance and bearing in the message boxes
+ - List of stations hearing your transmissions on the selected band
+ - Band activity in your level 4 square live updated next to band select buttons
  - Number of remote stations hearing your Tx, number of remote Txs that you're hearing, plus the same info for the 'best' station in your level 4 square
+ - Data used for the above is cached to disk so is not lost when restarting the program
 
 To enable uploading of spots to pskreporter, make sure that your .ini file includes
 ```
@@ -51,8 +53,7 @@ To enable uploading of spots to pskreporter, make sure that your .ini file inclu
 upload = Y
 ```
 
-<img width="980" height="807" alt="screenshot" src="https://github.com/user-attachments/assets/ac393a05-277a-4d98-bd74-78bcb0ae8b03" />
-
+![screenshot](screenshot.png)
 
 ## Motivation
 This started out as me thinking "How hard can it be, really?" after some frustration with Windows moving sound devices around and wanting to get a minimal decoder running that I can fully control. 
@@ -88,8 +89,7 @@ Alternatively, you can run PyFT8 without rig control; if there is no rig found,
 
 The image below shows the number of decodes from PyFT8, WSJT-x V2.7.0 running in NORM mode, and FT8_lib, using the same 10 minutes of busy 20m audio that is used to test ft8_lib. 
 
-<img width="640" height="480" alt="performance snapshot" src="https://github.com/G1OJS/PyFT8/blob/main/performance%20snapshot.png" />
-
+![performance snapshot](performance%20snapshot.png)
 
 ## Limitations
 PyFT8 doesn't decode / encode *all* message types. The table below shows which are handled.

{pyft8-2.7.0 → pyft8-2.7.2}/PyFT8/mqtt.py

@@ -13,6 +13,7 @@ class DiskDict:
         self.file = file
         self.data = {}
         self.load()
+        self.lock = threading.Lock()
         threading.Thread(target = self._autosave, daemon = True).start()
 
     def _autosave(self, autosave_period = 15):
@@ -26,7 +27,7 @@ class DiskDict:
                 self.data = pickle.load(f)
 
     def save(self):
-        if self.data:
+        with self.lock:
             with open(f"{self.file}","wb") as f:
                 pickle.dump(self.data, f)
 
@@ -36,11 +37,12 @@ class PSKR_MQTT_listener:
         self.hearing_me = DiskDict(f"{config_folder}/hearing_me.pkl")
         self.home_square = home_square
         self.callsign_cache = DiskDict(f"{config_folder}/callsign_cache.pkl")
-        self.band_TxRx_homecall_report_times = DiskDict(f"{config_folder}/report_times.pkl")
-        self.band_TxRx_homecall_countremotes = {}
+        self.band_TxRx_homecall_report_times = DiskDict(f"{config_folder}/report_times_271.pkl")
+        self.band_TxRx_homecall_couniTxRxemotes = {}
         self.home_activity = {}
         self.home_most_remotes = {}
         self.lock = threading.Lock()
+        
         mqttc = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2)
         mqttc.on_connect = self.on_connect
         mqttc.on_message = self.on_message
@@ -52,7 +54,7 @@ class PSKR_MQTT_listener:
         threading.Thread(target = self.count_activity, daemon = True).start()
 
     def on_connect(self, client, userdata, flags, reason_code, properties):
-        #pskr/filter/v2/{band}/{mode}/{sendercall}/{receivercall}/{senderlocator}/{receiverlocator}/{sendercountry}/{receivercountry}
+        #pskr/filter/v2/{band}/{mode}/{sendercall}/{receivercall}/{senderlocator}/{receiverlocator}/{sendercouniTxRxy}/{receivercouniTxRxy}
         print(f"[MQTT] Requesting mqtt feed for {self.home_square}")
         client.subscribe(f"pskr/filter/v2/+/FT8/+/+/{self.home_square}/#")
         client.subscribe(f"pskr/filter/v2/+/FT8/+/+/+/{self.home_square}/#")
@@ -63,50 +65,49 @@ class PSKR_MQTT_listener:
         except:
             return
         sc, rc = (d['sc'], d['sl']), (d['rc'], d['rl'])
-        for i, c in enumerate([sc, rc]):
+        for iTxRx, c in enumerate([sc, rc]):
             call, loc = c
-            if call not in self.callsign_cache.data:
-                self.callsign_cache.data[call] = loc
+            self.callsign_cache.data[call] = loc
             if self.home_square in loc:
-                key = f"{d['b']}_{['Tx','Rx'][i]}_{call}"
-                if not key in self.band_TxRx_homecall_report_times.data:
-                    with self.lock:
-                        self.band_TxRx_homecall_report_times.data[key] = []
+                key = (d['b'], iTxRx, call)
+                self.band_TxRx_homecall_report_times.data.setdefault(key, [])
                 self.band_TxRx_homecall_report_times.data[key].append(time.time())
             if d['sc'] == self.my_call:
-                if d['b'] not in self.hearing_me.data:
-                    self.hearing_me.data[d['b']] = {}
-                if d['rc'] not in self.hearing_me.data[d['b']]:
-                    self.hearing_me.data[d['b']][d['rc']] = {'t':time.time(), 'rp':d['rp'], 'c':d['rc']}
+                self.hearing_me.data.setdefault(d['b'], {})[d['rc']] = {'t': time.time(),'rp': d['rp'],'c': d['rc']}
 
     def count_activity(self):
         import numpy as np
         while True:
             time.sleep(5)
             self.home_activity = {}
-            self.band_TxRx_homecall_countremotes = {}
+            self.band_TxRx_homecall_couniTxRxemotes = {}
             self.home_most_remotes = {}
             with self.lock:
-                for band_TxRx_homecall in self.band_TxRx_homecall_report_times.data:
-                    b = band_TxRx_homecall.split("_")[0]
+                # clear counters for each band
+                for b in self.home_activity:
                     self.home_activity[b] = [0, 0]
+                for b in self.home_most_remotes:
+                    self.home_most_remotes[b] = [('',0), ('',0)]
 
+                # keep only the remote spots that happened in the SPOTLIFE window
                 for band_TxRx_homecall in self.band_TxRx_homecall_report_times.data:
                     band_TxRx_homecall_report_times = self.band_TxRx_homecall_report_times.data[band_TxRx_homecall]
                     band_TxRx_homecall_report_times = [t for t in band_TxRx_homecall_report_times if (time.time() - t) < SPOTLIFE]
                     self.band_TxRx_homecall_report_times.data[band_TxRx_homecall] = band_TxRx_homecall_report_times
 
+                # count number of local Tx and Rx, and identify the local Tx and Rx with most remote spots
                 for band_TxRx_homecall in self.band_TxRx_homecall_report_times.data:
                     band_TxRx_homecall_report_times = self.band_TxRx_homecall_report_times.data[band_TxRx_homecall]
                     if len(band_TxRx_homecall_report_times):
-                        b, tr, c = band_TxRx_homecall.split("_")
-                        self.home_activity[b][['Tx','Rx'].index(tr)] +=1
+                        b, iTxRx, c = band_TxRx_homecall
+                        self.home_activity.setdefault(b, [0, 0])
+                        self.home_activity[b][iTxRx] +=1
+                        self.home_most_remotes.setdefault(b, [('',0), ('',0)])
                         nremotes = len(band_TxRx_homecall_report_times)
-                        if not b in self.home_most_remotes:
-                            self.home_most_remotes[b] = [('',0), ('',0)]
-                        if nremotes>self.home_most_remotes[b][['Tx','Rx'].index(tr)][1]:
-                            self.home_most_remotes[b][['Tx','Rx'].index(tr)] = (c, nremotes)
+                        if nremotes>self.home_most_remotes[b][iTxRx][1]:
+                            self.home_most_remotes[b][iTxRx] = (c, nremotes)
 
+                # prune the hearing me list to <SPOTLIFE
                 for b in self.hearing_me.data:
                     newdict = {}
                     for c in self.hearing_me.data[b]:
@@ -115,8 +116,8 @@ class PSKR_MQTT_listener:
                     self.hearing_me.data[b] = newdict
 
     def get_spot_counts(self, band, call):
-        tx_reports = self.band_TxRx_homecall_report_times.data.get(f"{band}_Tx_{call}", [])
-        rx_reports = self.band_TxRx_homecall_report_times.data.get(f"{band}_Rx_{call}", [])
+        tx_reports = self.band_TxRx_homecall_report_times.data.get((band, 0, call), [])
+        rx_reports = self.band_TxRx_homecall_report_times.data.get((band, 1, call), [])
         n_spotting = len(tx_reports) if tx_reports else 0
         n_spotted = len(rx_reports) if rx_reports else 0
         return n_spotted, n_spotting

{pyft8-2.7.0 → pyft8-2.7.2}/PyFT8/pyft8.py

@@ -14,7 +14,7 @@ from PyFT8.hamlib import Rig_hamlib
 from PyFT8.mqtt import PSKR_MQTT_listener
 import PyFT8.maidenhead as maidenhead
 
-VER = '2.7.0'
+VER = '2.7.2'
 
 MAX_TX_START_SECONDS = 2.5
 rig, gui, qso, adif_logging, pskr_info, pskr_upload = None, None, None, None, None, None
@@ -308,8 +308,9 @@ def on_gui_sidebars_refresh(gui):
 
     #refresh hearing me
     hearing_me_text = []
-    if b is not None and b in pskr_info.hearing_me.data:    
-        for h in pskr_info.hearing_me.data[b].values():
+    if b is not None and b in pskr_info.hearing_me.data:
+        hm = pskr_info.hearing_me.data[b].values()
+        for h in hm:
             geo_text = geo_text = get_geo_text(h['c'])
             hearing_me_text.append(f"{h['c']:<7} {int(h['rp']):+03d} {geo_text:<12}")
     gui.hm.list_print(['Hearing me:'] + hearing_me_text)

{pyft8-2.7.0 → pyft8-2.7.2}/PyFT8.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 2.7.0
+Version: 2.7.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
@@ -28,22 +28,24 @@ If you're interested in how this works, maybe have a look at [MiniPyFT8](https:/
 
 ## Features
  - Rx and Tx of standard messages with optional /P and /R, and nonstandard calls plus hashed calls
- - Doesn't try to do everything, so launches quickly (~2 seconds on my old Dell Optiplex 790)
+ - 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
  - Modern programming language throughout
  - Finds sound cards by keywords so follows them if windows moves them ...
  - Logs QSOs to ADIF file and all spots to WSJTX-style ALL.txt file
  - Uploads spots to pskreporter
- - Direct CAT control for some rigs drops connection when not used, allowing sharing of rig's serial port
+ - Direct CAT control for some rigs, designed to drop connection when not used, allowing sharing of rig's serial port
  - Or control rigs via Hamlib
 
  The Gui shows:
  - Simultaneous views of odd and even cycles
  - Messages overlaid on waterfall signals that produce them
- - Worked-before info and fine grid locators / distance and bearing in the message boxes 
- - Band activity on band select buttons
+ - Worked-before info and fine grid locators / distance and bearing in the message boxes
+ - List of stations hearing your transmissions on the selected band
+ - Band activity in your level 4 square live updated next to band select buttons
  - Number of remote stations hearing your Tx, number of remote Txs that you're hearing, plus the same info for the 'best' station in your level 4 square
+ - Data used for the above is cached to disk so is not lost when restarting the program
 
 To enable uploading of spots to pskreporter, make sure that your .ini file includes
 ```
@@ -51,8 +53,7 @@ To enable uploading of spots to pskreporter, make sure that your .ini file inclu
 upload = Y
 ```
 
-<img width="980" height="807" alt="screenshot" src="https://github.com/user-attachments/assets/ac393a05-277a-4d98-bd74-78bcb0ae8b03" />
-
+![screenshot](screenshot.png)
 
 ## Motivation
 This started out as me thinking "How hard can it be, really?" after some frustration with Windows moving sound devices around and wanting to get a minimal decoder running that I can fully control. 
@@ -88,8 +89,7 @@ Alternatively, you can run PyFT8 without rig control; if there is no rig found,
 
 The image below shows the number of decodes from PyFT8, WSJT-x V2.7.0 running in NORM mode, and FT8_lib, using the same 10 minutes of busy 20m audio that is used to test ft8_lib. 
 
-<img width="640" height="480" alt="performance snapshot" src="https://github.com/G1OJS/PyFT8/blob/main/performance%20snapshot.png" />
-
+![performance snapshot](performance%20snapshot.png)
 
 ## Limitations
 PyFT8 doesn't decode / encode *all* message types. The table below shows which are handled.

{pyft8-2.7.0 → pyft8-2.7.2}/README.md

@@ -9,22 +9,24 @@ If you're interested in how this works, maybe have a look at [MiniPyFT8](https:/
 
 ## Features
  - Rx and Tx of standard messages with optional /P and /R, and nonstandard calls plus hashed calls
- - Doesn't try to do everything, so launches quickly (~2 seconds on my old Dell Optiplex 790)
+ - 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
  - Modern programming language throughout
  - Finds sound cards by keywords so follows them if windows moves them ...
  - Logs QSOs to ADIF file and all spots to WSJTX-style ALL.txt file
  - Uploads spots to pskreporter
- - Direct CAT control for some rigs drops connection when not used, allowing sharing of rig's serial port
+ - Direct CAT control for some rigs, designed to drop connection when not used, allowing sharing of rig's serial port
  - Or control rigs via Hamlib
 
  The Gui shows:
  - Simultaneous views of odd and even cycles
  - Messages overlaid on waterfall signals that produce them
- - Worked-before info and fine grid locators / distance and bearing in the message boxes 
- - Band activity on band select buttons
+ - Worked-before info and fine grid locators / distance and bearing in the message boxes
+ - List of stations hearing your transmissions on the selected band
+ - Band activity in your level 4 square live updated next to band select buttons
  - Number of remote stations hearing your Tx, number of remote Txs that you're hearing, plus the same info for the 'best' station in your level 4 square
+ - Data used for the above is cached to disk so is not lost when restarting the program
 
 To enable uploading of spots to pskreporter, make sure that your .ini file includes
 ```
@@ -32,8 +34,7 @@ To enable uploading of spots to pskreporter, make sure that your .ini file inclu
 upload = Y
 ```
 
-<img width="980" height="807" alt="screenshot" src="https://github.com/user-attachments/assets/ac393a05-277a-4d98-bd74-78bcb0ae8b03" />
-
+![screenshot](screenshot.png)
 
 ## Motivation
 This started out as me thinking "How hard can it be, really?" after some frustration with Windows moving sound devices around and wanting to get a minimal decoder running that I can fully control. 
@@ -69,8 +70,7 @@ Alternatively, you can run PyFT8 without rig control; if there is no rig found,
 
 The image below shows the number of decodes from PyFT8, WSJT-x V2.7.0 running in NORM mode, and FT8_lib, using the same 10 minutes of busy 20m audio that is used to test ft8_lib. 
 
-<img width="640" height="480" alt="performance snapshot" src="https://github.com/G1OJS/PyFT8/blob/main/performance%20snapshot.png" />
-
+![performance snapshot](performance%20snapshot.png)
 
 ## Limitations
 PyFT8 doesn't decode / encode *all* message types. The table below shows which are handled.

{pyft8-2.7.0 → pyft8-2.7.2}/pyproject.toml

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