PyFT8 2.7.6__tar.gz → 2.7.7__tar.gz

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

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

@@ -145,6 +145,7 @@ class Gui:
         self.msg_boxes = {}
         self.decode_queue = queue.Queue()
         self.make_layout(config)
+        self.display_cycle = 0
         self.ani = FuncAnimation(self.fig, self._animate, interval = 40, frames=(100000), blit=True)
 
     def set_bandstats_title(self, txt):
@@ -195,7 +196,8 @@ class Gui:
         
 
     def refresh_sidebars(self):
-        self.on_gui_sidebars_refresh(self)
+        self.display_cycle = (self.display_cycle + 1) %2
+        self.on_gui_sidebars_refresh(self, self.display_cycle)
         
     def add_message_box(self, message):
         self.decode_queue.put(message)
@@ -217,6 +219,7 @@ class Gui:
             self._display_message_box(self.decode_queue.get())
         if (frame % 10 == 0):
             self._tidy_msg_boxes()
+        if (frame % 30 == 0):
             self.refresh_sidebars()
         return [self.image, *self.ax_wf.patches, *self.ax_wf.texts, *self.band_stats.lineartists, *self.console.lineartists, *self.hm.lineartists,
                 *[bb.label for bb in self.button_boxes], *[bb.label2 for bb in self.button_boxes]]

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

@@ -35,8 +35,8 @@ class DiskDict:
             os.replace(tmp_file, self.file)
                 
 class PSKR_MQTT_listener:
-    def __init__(self, config_folder, my_call, home_square, spotlife):
-        self.spotlife = spotlife
+    def __init__(self, config_folder, my_call, home_square, pskr_refresh_mins):
+        self.pskr_refresh_mins = pskr_refresh_mins
         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")
@@ -45,7 +45,6 @@ class PSKR_MQTT_listener:
         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_couniTxRxemotes = {}
         self.home_activity = {}
         self.home_most_remotes = {}
         self.lock = threading.Lock()
@@ -66,30 +65,37 @@ class PSKR_MQTT_listener:
         client.subscribe(f"pskr/filter/v2/+/FT8/+/+/{self.home_square}/#")
         client.subscribe(f"pskr/filter/v2/+/FT8/+/+/+/{self.home_square}/#")
 
+    def store_best_location(self, call, loc):
+        existing_loc = self.callsign_cache.data.get(call, '')
+        if len(loc) > len(existing_loc):
+            self.callsign_cache.data[call] = loc
+
+    def add_homespots_record(self, key, t):
+        self.band_TxRx_homecall_report_times.data.setdefault(key, [])
+        self.band_TxRx_homecall_report_times.data[key].append(t)
+
+    def add_myspots_record(self, data, band, call, t, rp):
+        data.setdefault(band, {})
+        data[band][call] = {'t': t,'rp':rp,'c':call}
+
     def on_message(self, client, userdata, msg):
         try:
             d = literal_eval(msg.payload.decode())
         except:
             return
-        self.add_spot(d)
-
-    def add_spot(self, d):
+        tnow = time.time()
         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()
+        for iTxRx, call_loc in enumerate([sc, rc]):
+            call, loc = call_loc
+            self.store_best_location(call, loc)
             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(tnow)
+                self.add_homespots_record((d['b'], iTxRx, call), tnow)
             if d['sc'] == self.my_call:
-                self.hearing_me.data.setdefault(d['b'], {})
                 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']}
+                self.add_myspots_record(self.hearing_me.data, d['b'], d['rc'], tnow, d['rp'])
             if d['rc'] == self.my_call:
-                self.heard_by_me.data.setdefault(d['b'], {})
+                self.add_myspots_record(self.heard_by_me.data, d['b'], d['sc'], tnow, d['rp'])
                 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']}
@@ -99,7 +105,6 @@ class PSKR_MQTT_listener:
         while True:
             time.sleep(5)
             self.home_activity = {}
-            self.band_TxRx_homecall_couniTxRxemotes = {}
             self.home_most_remotes = {}
             with self.lock:
                 # clear counters for each band
@@ -108,10 +113,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 self.spotlife window
+                # keep only the remote spots that happened in the self.pskr_refresh_mins 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) < self.spotlife]
+                    band_TxRx_homecall_report_times = [t for t in band_TxRx_homecall_report_times if (time.time() - t) < 60*self.pskr_refresh_mins]
                     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
@@ -133,13 +138,3 @@ class PSKR_MQTT_listener:
         n_spotted = len(rx_reports) if rx_reports else 0
         return n_spotted, n_spotting
                 
-if __name__ == '__main__':
-    pskr = PSKR_MQTT_listener("IO90")
-        
-
-        
-
-    
-
-
-    

{pyft8-2.7.6 → pyft8-2.7.7}/PyFT8/pyft8.py

@@ -14,10 +14,11 @@ from PyFT8.hamlib import Rig_hamlib
 from PyFT8.mqtt import PSKR_MQTT_listener
 import PyFT8.maidenhead as maidenhead
 
-VER = '2.7.6'
+VER = '2.7.7'
 
 MAX_TX_START_SECONDS = 2.5
-SPOTLIFE = 5*60
+HEARING_PANEL_LIFE_MINS = 5
+PSKR_REFRESH_MINS = 20
 rig, gui, qso, adif_logging, pskr_info, pskr_upload = None, None, None, None, None, None
 busy_profile, hearing_me = None, None
 
@@ -253,18 +254,25 @@ def write_all_txt_row(message):
 
 #============= Callbacks for Receiver ==========================================================
 def on_rx_decode(c):
+    if (c.decode_completed - qso.band_info['time_set']) < 5: # prevent bad QRG -> heard_by_me and pskreporter upload data
+        return
     message = Message(c)
     if gui:
         gui.add_message_box(message)
-    if qso.band_info['b'] is not None and pskr_upload is not None:
-        _, 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)
+    if qso.band_info['b'] is not None and pskr_upload is not None:
+        call_a, call_b, grid_rpt = c.msg_tuple
+        if call_b == 'not':
+            return
+        call_b_grid = grid_rpt if isGrid(grid_rpt) else ''
+        if call_b != config['station']['call']:
+            pskr_upload.add_report(call_b, int(1000000*float(qso.band_info['fMHz'])) + c.fHz, c.snr, 'FT8', 1, int(time.time()))
+            pskr_info.store_best_location(call_b, call_b_grid)
+            pskr_info.add_myspots_record(pskr_info.heard_by_me.data, qso.band_info['b'], call_b, int(time.time()), c.snr)
+        if call_b == config['station']['call'] and (isReport(grid_rpt) or isRReport(grid_rpt)):
+            rpt = grid_rpt.replace("R","")
+            pskr_info.add_myspots_record(pskr_info.hearing_me.data, qso.band_info['b'], call_a, int(time.time()), rpt)
 
 def on_rx_busy_profile(busy_profile_new, cycle):
     global busy_profile, clearest_frequency
@@ -280,7 +288,7 @@ def on_rx_busy_profile(busy_profile_new, cycle):
     console_print(f"[on_busy] Clear Tx frequency found at {clearest_frequency:6.1f}")
 
 #============= Callbacks for GUI ==========================================================
-def on_gui_sidebars_refresh(gui):
+def on_gui_sidebars_refresh(gui, display_cycle):
     if qso.band_info['b'] is None:
         console_print(f"[PyFT8] Band not set; please select a band.", color = 'red')
     if pskr_info is None:
@@ -310,18 +318,24 @@ def on_gui_sidebars_refresh(gui):
         gui.band_stats.scroll_print(f"{n_spotted:<7} {rx_lead[1]:<7}", color = '#b6f0c6')
 
     #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']
+    data = pskr_info.hearing_me.data if display_cycle == 1 else pskr_info.heard_by_me.data
+    timewindow_str = f"<{HEARING_PANEL_LIFE_MINS:.0f} mins"
+    title_txt = f"Hearing me {timewindow_str}" if display_cycle==1 else f"Heard by me {timewindow_str}"
+    display_rows = [(title_txt, 2e40, 'white')]
+    tnow = time.time()
     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}")
-            col = 'white' if h['c'] in new_calls else 'lime'
-            cols.append(col)
-    gui.hm.list_print(txts, cols)
+        band_rpts = data[b]
+        calls_now = [call for call in band_rpts if (tnow - band_rpts[call]['t']) < 60*HEARING_PANEL_LIFE_MINS]
+        subtitle_txt = f"{len(calls_now)}/{len(band_rpts)} now/ever"
+        display_rows.append((subtitle_txt, 1e40, 'white'))
+        new_calls = pskr_info.hearing_me_new if display_cycle == 1 else pskr_info.heard_by_me_new
+        for remote_call in calls_now:
+            rpt = band_rpts[remote_call]
+            call, snr, geo_text, timestamp = rpt['c'], int(rpt['rp']), get_geo_text(remote_call), rpt['t']
+            color = 'white' if remote_call in new_calls else 'lime'
+            display_rows.append((f"{remote_call:<7} {snr:+03d} {geo_text:<12}", timestamp, color))
+    display_rows.sort(key = lambda row: row[1], reverse = True)
+    gui.hm.list_print([row[0] for row in display_rows], [row[2] for row in display_rows])
 
 def on_gui_control_click(btn_def):
     btn_action = btn_def['action']
@@ -336,7 +350,7 @@ def on_gui_control_click(btn_def):
         qso.tx_cycle = None
     if(btn_action == 'SET_BAND'):
         band, freqMHz = btn_def['band'], btn_def['freq']
-        qso.band_info = {'b':band, 'fMHz':freqMHz}
+        qso.band_info = {'b':band, 'fMHz':freqMHz, 'time_set':time.time()}
         rig.set_freq_Hz(int(1000000*float(qso.band_info['fMHz'])))
         console_print(f"[PyFT8] Set band: {qso.band_info['b']} {qso.band_info['fMHz']}")
         gui.band_stats.clear()
@@ -373,7 +387,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], SPOTLIFE)
+            pskr_info = PSKR_MQTT_listener(config_folder, mc, mg[:4], PSKR_REFRESH_MINS)
     qso = FT8_QSO()
     if config.has_section('hamlib_rig'):
         console_print("Connecting to rig via Hamlib")
@@ -405,7 +419,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.set_bandstats_title(f"Pskreporter Spots\nto/from {config['station']['grid'][:4]} <{PSKR_REFRESH_MINS:.0f} mins")
                 gui.plt.show()
             else:
                 wait_for_keyboard()

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

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

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