PyFT8 2.7.3__tar.gz → 2.7.5__tar.gz

{pyft8-2.7.3 → pyft8-2.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 2.7.3
+Version: 2.7.5
 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.3 → pyft8-2.7.5}/PyFT8/gui.py

@@ -165,7 +165,7 @@ 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]}", fontsize = 10)
+        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.3 → pyft8-2.7.5}/PyFT8/mqtt.py

@@ -41,6 +41,8 @@ class PSKR_MQTT_listener:
         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")
+        self.hearing_me_new = []
+        self.heard_by_me_new = []
         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")
@@ -70,32 +72,28 @@ 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
             self.callsign_cache.data[call] = loc
+            tnow = time.time()
             if self.home_square in loc:
                 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())
+                self.band_TxRx_homecall_report_times.data[key].append(tnow)
             if d['sc'] == self.my_call:
                 self.hearing_me.data.setdefault(d['b'], {})
-                new = (d['rc'] not in self.hearing_me.data)
-                new_on_band = (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'], 'new':''}
-                if new_on_band:
-                    self.hearing_me.data[d['b']][d['rc']].update({'new':'new_on_band'})
-                if new:
-                    self.hearing_me.data[d['b']][d['rc']].update({'new':'new'})
+                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'], {})
-                new = (d['sc'] not in self.heard_by_me.data)
-                new_on_band = (d['sc'] not in self.heard_by_me.data[d['b']])
-                self.heard_by_me.data[d['b']][d['sc']] = {'t': time.time(),'rp': d['rp'],'c': d['sc'], 'new':''}
-                if new_on_band:
-                    self.heard_by_me.data[d['b']][d['sc']].update({'new':'new_on_band'})
-                if new:
-                    self.heard_by_me.data[d['b']][d['sc']].update({'new':'new'})
+                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']}
                                
     def count_activity(self):
         import numpy as np

{pyft8-2.7.3 → pyft8-2.7.5}/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.3'
+VER = '2.7.5'
 
 MAX_TX_START_SECONDS = 2.5
 SPOTLIFE = 5*60
@@ -257,9 +257,11 @@ 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)
+            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 +276,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):
@@ -309,14 +311,16 @@ def on_gui_sidebars_refresh(gui):
 
     #refresh hearing me / heard by me panel
     cycle = global_time_utils.curr_cycle_from_time()
-    data = pskr_info.heard_by_me.data if cycle == 1 else pskr_info.hearing_me.data
-    txts, cols = ['Hearing me' if cycle==1 else 'Heard by me'], ['white']
+    data = pskr_info.hearing_me.data if cycle == 1 else pskr_info.heard_by_me.data
+    new_calls = pskr_info.hearing_me_new if cycle == 1 else pskr_info.heard_by_me_new
+    txts, cols = [f"Hearing me <{SPOTLIFE/60:.0f} mins" if cycle==1 else f"Heard by me <{SPOTLIFE/60:.0f} mins"], ['white']
     if b is not None and b in data:
         hm = [h for h in data[b].values() if (time.time() - h['t']) < SPOTLIFE]
         for h in hm:
             geo_text = geo_text = get_geo_text(h['c'])
             txts.append(f"{h['c']:<7} {int(h['rp']):+03d} {geo_text:<12}")
-            cols.append('lime' if h['new'] == 'new' else ('white' if h['new'] == 'new_on_band' else 'lightgrey'))
+            col = 'white' if h['c'] in new_calls else 'lime'
+            cols.append(col)
     gui.hm.list_print(txts, cols)
 
 def on_gui_control_click(btn_def):

{pyft8-2.7.3 → pyft8-2.7.5}/PyFT8.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 2.7.3
+Version: 2.7.5
 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.3 → pyft8-2.7.5}/pyproject.toml

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