PyFT8 2.7.7__tar.gz → 2.8.0__tar.gz

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

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

@@ -38,13 +38,13 @@ class PSKR_MQTT_listener:
     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")
+        self.hearing_me = DiskDict(f"{config_folder}/hearing_me.pkl")   # all-time record of hearing me
+        self.heard_by_me = DiskDict(f"{config_folder}/heard_by_me.pkl") # all-time record of heard by me
         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")
+        self.callsign_cache = DiskDict(f"{config_folder}/callsign_cache.pkl") # all time cache call -> fine locator
+        self.band_TxRx_homecall_report_times = DiskDict(f"{config_folder}/report_times.pkl") # last 20 mins data -> per band tx/rx & current band detail
         self.home_activity = {}
         self.home_most_remotes = {}
         self.lock = threading.Lock()
@@ -72,33 +72,32 @@ class PSKR_MQTT_listener:
 
     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)
+        self.band_TxRx_homecall_report_times.data[key].append(int(t))
 
     def add_myspots_record(self, data, band, call, t, rp):
         data.setdefault(band, {})
-        data[band][call] = {'t': t,'rp':rp,'c':call}
+        data[band][call] = {'t': int(t),'rp':int(rp)}
 
     def on_message(self, client, userdata, msg):
         try:
             d = literal_eval(msg.payload.decode())
         except:
             return
-        tnow = time.time()
+        tnow = int(time.time())
         sc, rc = (d['sc'], d['sl']), (d['rc'], d['rl'])
         for iTxRx, call_loc in enumerate([sc, rc]):
             call, loc = call_loc
             self.store_best_location(call, loc)
             if self.home_square in loc:
                 self.add_homespots_record((d['b'], iTxRx, call), tnow)
-            if d['sc'] == self.my_call:
-                if d['rc'] not in self.hearing_me.data[d['b']]:
-                    self.hearing_me_new.append(d['rc'])
-                self.add_myspots_record(self.hearing_me.data, d['b'], d['rc'], tnow, d['rp'])
-            if d['rc'] == self.my_call:
-                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']}
+        if d['sc'] == self.my_call:
+            if d['rc'] not in self.hearing_me.data[d['b']]:
+                self.hearing_me_new.append(d['rc'])
+            self.add_myspots_record(self.hearing_me.data, d['b'], d['rc'], tnow, d['rp'])
+        if d['rc'] == self.my_call:
+            if d['sc'] not in self.heard_by_me.data[d['b']]:
+                self.heard_by_me_new.append(d['sc'])
+            self.add_myspots_record(self.heard_by_me.data, d['b'], d['sc'], tnow, d['rp'])
                                
     def count_activity(self):
         import numpy as np
@@ -128,8 +127,10 @@ class PSKR_MQTT_listener:
                         self.home_activity[b][iTxRx] +=1
                         self.home_most_remotes.setdefault(b, [('',0), ('',0)])
                         nremotes = len(band_TxRx_homecall_report_times)
-                        if nremotes>self.home_most_remotes[b][iTxRx][1]:
-                            self.home_most_remotes[b][iTxRx] = (c, nremotes)
+                        current_winner = self.home_most_remotes[b][iTxRx]
+                        if nremotes > current_winner[1]:
+                            if c != self.my_call:
+                                self.home_most_remotes[b][iTxRx] = (c, nremotes)
 
     def get_spot_counts(self, band, call):
         tx_reports = self.band_TxRx_homecall_report_times.data.get((band, 0, call), [])

{pyft8-2.7.7 → pyft8-2.8.0}/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.7'
+VER = '2.8.0'
 
 MAX_TX_START_SECONDS = 2.5
 HEARING_PANEL_LIFE_MINS = 5
@@ -75,7 +75,7 @@ class ADIF:
         console_print(f"Logged QSO with {oStation['c']}")
 
     def _build_cache(self):
-        import datetime
+        import calendar
         def parse(rec, field):
             p = rec.find(field)
             if p > 0:
@@ -87,7 +87,10 @@ class ADIF:
             for l in f.readlines():
                 if parse(l, 'mode') == "FT8":
                     c, b, d, t = parse(l, 'call'), parse(l, 'band'), parse(l, 'qso_date'), parse(l, 'time_on')
-                    tm = time.mktime(datetime.datetime.strptime(d+t, "%Y%m%d%H%M%S").timetuple())
+                    time_tuple = time.strptime(d+t, "%Y%m%d%H%M%S")
+                    tm = calendar.timegm(time_tuple)
+                   # if time.time()-tm < 36000:
+                   #     print(c, b, d, t, int(time.time()-tm))
                     cache[c] = tm
                     cache[c + "_"+b+"_FT8"] = tm
         return cache
@@ -130,7 +133,7 @@ class FT8_QSO:
     def __init__(self):
         if config is not None:
             self.mStation = {'c':config['station']['call'], 'g':config['station']['grid']}
-        self.band_info = {'b':None, 'fMHz':0}
+        self.band_info = {'b':None, 'fMHz':0, 'time_set':0}
         self.tx_freq = 750
         threading.Thread(target = self._transmitter, daemon = True).start()
         self.clear()
@@ -254,7 +257,7 @@ 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
+    if (c.decode_completed - qso.band_info['time_set']) < 9: # prevent bad QRG -> heard_by_me and pskreporter upload data
         return
     message = Message(c)
     if gui:
@@ -285,7 +288,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] Clear Tx frequency found at {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, display_cycle):
@@ -331,7 +334,7 @@ def on_gui_sidebars_refresh(gui, display_cycle):
         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']
+            snr, geo_text, timestamp = 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)

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

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

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