PyFT8 2.7.4__tar.gz → 2.7.6__tar.gz

{pyft8-2.7.4 → pyft8-2.7.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 2.7.4
+Version: 2.7.6
 Summary: FT8 Decoding and Encoding in Python with test/loopback code
 Author-email: G1OJS <g1ojs@yahoo.com>
 License-Expression: GPL-3.0-or-later

{pyft8-2.7.4 → pyft8-2.7.6}/PyFT8/gui.py

@@ -147,6 +147,9 @@ class Gui:
         self.make_layout(config)
         self.ani = FuncAnimation(self.fig, self._animate, interval = 40, frames=(100000), blit=True)
 
+    def set_bandstats_title(self, txt):
+        self.band_stats.ax.set_title(txt, fontsize = 10)
+
     def make_layout(self, config):
         # figure
         self.plt = plt
@@ -165,7 +168,6 @@ class Gui:
         self.band_stats = Scrollbox(self.fig, [L['pmargin'], wf_top+L['vsep1'], L['sidebar_width'], L['banner_height']], nlines = 4, monospace = True)
         self.band_stats.ax.text(-0.2,0.75,'Tx')
         self.band_stats.ax.text(-0.2,0.25,'Rx')
-        self.band_stats.ax.set_title(f"Spots to/from {config['station']['grid'][:4]} <15 mins", fontsize = 10)
 
         # console
         self.console = Scrollbox(self.fig, [wf_left, wf_top+L['vsep1'], 1-wf_left-L['pmargin'], L['banner_height']])

{pyft8-2.7.4 → pyft8-2.7.6}/PyFT8/mqtt.py

@@ -3,8 +3,6 @@ import threading
 import time
 from ast import literal_eval
 
-SPOTLIFE = 15*60
-
 import os
 import pickle
 
@@ -37,7 +35,8 @@ class DiskDict:
             os.replace(tmp_file, self.file)
                 
 class PSKR_MQTT_listener:
-    def __init__(self, config_folder, my_call, home_square):
+    def __init__(self, config_folder, my_call, home_square, spotlife):
+        self.spotlife = spotlife
         self.my_call = my_call
         self.hearing_me = DiskDict(f"{config_folder}/hearing_me.pkl")
         self.heard_by_me = DiskDict(f"{config_folder}/heard_by_me.pkl")
@@ -72,6 +71,9 @@ class PSKR_MQTT_listener:
             d = literal_eval(msg.payload.decode())
         except:
             return
+        self.add_spot(d)
+
+    def add_spot(self, d):
         sc, rc = (d['sc'], d['sl']), (d['rc'], d['rl'])
         for iTxRx, c in enumerate([sc, rc]):
             call, loc = c
@@ -83,12 +85,12 @@ class PSKR_MQTT_listener:
                 self.band_TxRx_homecall_report_times.data[key].append(tnow)
             if d['sc'] == self.my_call:
                 self.hearing_me.data.setdefault(d['b'], {})
-                if d['rc'] not in self.hearing_me.data:
+                if d['rc'] not in self.hearing_me.data[d['b']]:
                     self.hearing_me_new.append(d['rc'])
                 self.hearing_me.data[d['b']][d['rc']] = {'t': tnow,'rp': d['rp'],'c': d['rc']}
             if d['rc'] == self.my_call:
                 self.heard_by_me.data.setdefault(d['b'], {})
-                if d['sc'] not in self.heard_by_me.data:
+                if d['sc'] not in self.heard_by_me.data[d['b']]:
                     self.heard_by_me_new.append(d['sc'])
                 self.heard_by_me.data[d['b']][d['sc']] = {'t': tnow,'rp': d['rp'],'c': d['sc']}
                                
@@ -106,10 +108,10 @@ class PSKR_MQTT_listener:
                 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
+                # keep only the remote spots that happened in the self.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]
+                    band_TxRx_homecall_report_times = [t for t in band_TxRx_homecall_report_times if (time.time() - t) < self.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

{pyft8-2.7.4 → pyft8-2.7.6}/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.4'
+VER = '2.7.6'
 
 MAX_TX_START_SECONDS = 2.5
 SPOTLIFE = 5*60
@@ -257,9 +257,12 @@ def on_rx_decode(c):
     if gui:
         gui.add_message_box(message)
     if qso.band_info['b'] is not None and pskr_upload is not None:
-        dx_call = c.msg_tuple[1]
+        _, dx_call, dx_grid = c.msg_tuple
         if dx_call != 'not' and dx_call != config['station']['call']:
             pskr_upload.add_report(dx_call, int(1000000*float(qso.band_info['fMHz'])) + c.fHz, c.snr, 'FT8', 1, int(time.time()))
+            loc = pskr_info.callsign_cache.data.get(dx_call, dx_grid)
+            # can't use the next line unless I keep more info than just time in the spots data and deduplicate
+            # pskr_info.add_spot({'sc':dx_call, 'sl':loc, 'rc':config['station']['call'], 'rl':config['station']['grid'], 'b':qso.band_info['b'], 'rp': c.snr})
     print(message.wsjtx_screen_format())
     write_all_txt_row(message)
 
@@ -274,7 +277,7 @@ def on_rx_busy_profile(busy_profile_new, cycle):
         idx = np.argmin(busy_profile[f0_idx:fn_idx])
         clearest_frequency = (f0_idx + idx) * audio_in.df
     busy_profile = busy_profile_new
-    console_print(f"[on_busy] Set Tx freq to {clearest_frequency:6.1f}")
+    console_print(f"[on_busy] Clear Tx frequency found at {clearest_frequency:6.1f}")
 
 #============= Callbacks for GUI ==========================================================
 def on_gui_sidebars_refresh(gui):
@@ -301,7 +304,6 @@ def on_gui_sidebars_refresh(gui):
         tx_lead,  rx_lead = pskr_info.home_most_remotes[b]
         call = config['station']['call']
         n_spotted, n_spotting = pskr_info.get_spot_counts(b, call)
-        # add local count here for n_spotted prior to round trip to pskreporter?
         gui.band_stats.scroll_print(f"{call:<7} {tx_lead[0]:<7}", color = '#ff756b')
         gui.band_stats.scroll_print(f"{n_spotting:<7} {tx_lead[1]:<7}", color = '#ff756b')
         gui.band_stats.scroll_print(f"{call:<7} {rx_lead[0]:<7}", color = '#b6f0c6')
@@ -371,7 +373,7 @@ def cli():
     if mc is not None and 'pskreporter' in config.keys():
         if config['pskreporter']['upload'] == 'Y':
             pskr_upload = PSKR_upload(mc, mg, software = f"PyFT8 v{VER}", console_print = console_print) if not mc is None else None
-            pskr_info = PSKR_MQTT_listener(config_folder, mc, mg[:4])
+            pskr_info = PSKR_MQTT_listener(config_folder, mc, mg[:4], SPOTLIFE)
     qso = FT8_QSO()
     if config.has_section('hamlib_rig'):
         console_print("Connecting to rig via Hamlib")
@@ -403,6 +405,7 @@ def cli():
             rx = Receiver(audio_in, [200, 3100], on_rx_decode, on_rx_busy_profile)
             audio_in.start_streamed_audio(input_device_idx)
             if gui is not None:
+                gui.set_bandstats_title(f"Spots to/from {config['station']['grid'][:4]} <{SPOTLIFE/60:.0f} mins")
                 gui.plt.show()
             else:
                 wait_for_keyboard()

{pyft8-2.7.4 → pyft8-2.7.6}/PyFT8.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 2.7.4
+Version: 2.7.6
 Summary: FT8 Decoding and Encoding in Python with test/loopback code
 Author-email: G1OJS <g1ojs@yahoo.com>
 License-Expression: GPL-3.0-or-later

{pyft8-2.7.4 → pyft8-2.7.6}/pyproject.toml

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