PyFT8 2.7.2__tar.gz → 2.7.4__tar.gz

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

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

@@ -50,12 +50,12 @@ class Scrollbox:
         for i in range(self.nlines):
             self.lineartists[i].set_text(self.default_text)
 
-    def list_print(self, lst):
-        self.lines = [{'text':l, 'color':'white'} for l in lst[:self.nlines]]
-        for i, line in enumerate(self.lines):
-            if line['text'] != self.lineartists[i].get_text():
-                self.lineartists[i].set_text(line['text'])
-                self.lineartists[i].set_color(line['color'])
+    def list_print(self, lst, colors = None):
+        for i, txt in enumerate(lst[:self.nlines]):
+            if txt != self.lineartists[i].get_text():
+                self.lineartists[i].set_text(txt)
+                col = colors[i] if colors is not None and i < len(colors) else 'white'
+                self.lineartists[i].set_color(col)
         for i in range(len(lst), self.nlines):
             if self.lineartists[i].get_text() != '':
                 self.lineartists[i].set_text('')          
@@ -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.2 → pyft8-2.7.4}/PyFT8/mqtt.py

@@ -10,10 +10,10 @@ import pickle
 
 class DiskDict:
     def __init__(self, file):
+        self.lock = threading.Lock()
         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):
@@ -22,22 +22,30 @@ class DiskDict:
             self.save()
 
     def load(self):
-        if(os.path.exists(self.file)):
-            with open(f"{self.file}","rb") as f:
-                self.data = pickle.load(f)
+        with self.lock:        
+            if(os.path.exists(self.file)):
+                with open(f"{self.file}","rb") as f:
+                    self.data = pickle.load(f)
 
     def save(self):
         with self.lock:
-            with open(f"{self.file}","wb") as f:
+            tmp_file = f"{self.file}.tmp"
+            with open(tmp_file, "wb") as f:
                 pickle.dump(self.data, f)
-
+                f.flush()
+                os.fsync(f.fileno())
+            os.replace(tmp_file, self.file)
+                
 class PSKR_MQTT_listener:
     def __init__(self, config_folder, my_call, home_square):
         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_271.pkl")
+        self.band_TxRx_homecall_report_times = DiskDict(f"{config_folder}/report_times.pkl")
         self.band_TxRx_homecall_couniTxRxemotes = {}
         self.home_activity = {}
         self.home_most_remotes = {}
@@ -68,13 +76,22 @@ class PSKR_MQTT_listener:
         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'], {})[d['rc']] = {'t': time.time(),'rp': d['rp'],'c': d['rc']}
-
+                self.hearing_me.data.setdefault(d['b'], {})
+                if d['rc'] not in self.hearing_me.data:
+                    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:
+                    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
         while True:
@@ -107,14 +124,6 @@ class PSKR_MQTT_listener:
                         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]:
-                        if (time.time() - self.hearing_me.data[b][c]['t']) < SPOTLIFE:
-                            newdict[c] = self.hearing_me.data[b][c]
-                    self.hearing_me.data[b] = newdict
-
     def get_spot_counts(self, band, 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), [])

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

@@ -14,9 +14,10 @@ from PyFT8.hamlib import Rig_hamlib
 from PyFT8.mqtt import PSKR_MQTT_listener
 import PyFT8.maidenhead as maidenhead
 
-VER = '2.7.2'
+VER = '2.7.4'
 
 MAX_TX_START_SECONDS = 2.5
+SPOTLIFE = 5*60
 rig, gui, qso, adif_logging, pskr_info, pskr_upload = None, None, None, None, None, None
 busy_profile, hearing_me = None, None
 
@@ -263,7 +264,7 @@ def on_rx_decode(c):
     write_all_txt_row(message)
 
 def on_rx_busy_profile(busy_profile_new, cycle):
-    global busy_profile
+    global busy_profile, clearest_frequency
     if output_device_idx is None:
         return
     if busy_profile is not None:
@@ -273,7 +274,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] Set Tx freq to {clearest_frequency:6.1f}")
 
 #============= Callbacks for GUI ==========================================================
 def on_gui_sidebars_refresh(gui):
@@ -306,14 +307,19 @@ def on_gui_sidebars_refresh(gui):
         gui.band_stats.scroll_print(f"{call:<7} {rx_lead[0]:<7}", color = '#b6f0c6')
         gui.band_stats.scroll_print(f"{n_spotted:<7} {rx_lead[1]:<7}", color = '#b6f0c6')
 
-    #refresh hearing me
-    hearing_me_text = []
-    if b is not None and b in pskr_info.hearing_me.data:
-        hm = pskr_info.hearing_me.data[b].values()
+    #refresh hearing me / heard by me panel
+    cycle = global_time_utils.curr_cycle_from_time()
+    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'])
-            hearing_me_text.append(f"{h['c']:<7} {int(h['rp']):+03d} {geo_text:<12}")
-    gui.hm.list_print(['Hearing me:'] + hearing_me_text)
+            txts.append(f"{h['c']:<7} {int(h['rp']):+03d} {geo_text:<12}")
+            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):
     btn_action = btn_def['action']

{pyft8-2.7.2 → pyft8-2.7.4}/PyFT8/time_utils.py

@@ -12,7 +12,7 @@ class Time_utils:
 
     def curr_cycle_from_time(self):
         t = time.time()
-        return int((t % 2*self.cycle_seconds) / self.cycle_seconds)
+        return int((t % (2*self.cycle_seconds)) / self.cycle_seconds)
 
     def cyclestart(self, t):
         cst = self.cycle_seconds * int(t / self.cycle_seconds)

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

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

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