PyFT8 2.4.2__tar.gz → 2.4.3__tar.gz

{pyft8-2.4.2 → pyft8-2.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 2.4.2
+Version: 2.4.3
 Summary: FT8 Decoding and Encoding in Python with test/loopback code
 Author-email: G1OJS <g1ojs@yahoo.com>
 License-Expression: GPL-3.0-or-later
@@ -27,6 +27,7 @@ PyFT8 is somewhat experimental, with a focus on demonstrating FT8 written in Pyt
 If you're interested in how this works, maybe have a look at [MiniPyFT8](https://github.com/G1OJS/MiniPyFT8) which puts all of the receive code in a single 300 line Python file.
 
 ## Features
+ - Rx and Tx of standard messages with optional /P and /R, and nonstandard calls plus hashed calls
  - Doesn't try to do everything, so launches quickly (~2 seconds on my old Dell Optiplex 790)
  - Use with or without gui (receive and send messages via command line commands)
  - GUI provides simultaneous views of odd and even cycles

{pyft8-2.4.2 → pyft8-2.4.3}/PyFT8/pskr_upload.py

@@ -9,14 +9,16 @@ MAX_REPORTS = 90
 class PSKR_upload:
     # https://pskreporter.info/pskdev.html
     # https://pskreporter.info/cgi-bin/psk-analysis.pl
-    def __init__(self, mycall, mygrid, software, tt, console_print):
+    def __init__(self, mycall, mygrid, software, console_print):
         self.RxInfoRecDescriptor_CallLocSoft = b"\x00\x03\x00\x24\x99\x92\x00\x03\x00\x01\x80\x02\xFF\xFF\x00\x00\x76\x8F\x80\x04\xFF\xFF\x00\x00\x76\x8F\x80\x08\xFF\xFF\x00\x00\x76\x8F\x00\x00"
         self.SenderInfoRecDescriptor_SenderFreqSNRiMDModeSourceTime = b"\x00\x02\x00\x3C\x99\x93\x00\x07\x80\x01\xFF\xFF\x00\x00\x76\x8F\x80\x05\x00\x04\x00\x00\x76\x8F\x80\x06\x00\x01\x00\x00\x76\x8F\x80\x07\x00\x01\x00\x00\x76\x8F\x80\x0A\xFF\xFF\x00\x00\x76\x8F\x80\x0B\x00\x01\x00\x00\x76\x8F\x00\x96\x00\x04"
-        self.tt = tt
-        self.includeDescriptors = 0
+        self.last_descriptors_time = 0
+        self.descriptors_sent_count = 0
         self.last_report_time = time.time() - 300 + 60
         self.addr = ("report.pskreporter.info", 4739)
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        #HOST = socket.gethostbyname(socket.gethostname())
+        #self.sock.bind((HOST, 1234))
         self.session_id = random.getrandbits(32)
         self.seq = 1
         self.reports = {}
@@ -45,22 +47,25 @@ class PSKR_upload:
         while True:
             time.sleep(60)
             with self.lock:
-                n_reports = len(self.reports)
-                if n_reports >= MAX_REPORTS or (time.time() - self.last_report_time) > 300:
-                    self._send(includeDescriptors = (time.time() - self.includeDescriptors) > 3600)
-                    self.includeDescriptors = time.time()
-                    self.last_report_time = time.time()
+                if len(self.reports) >= MAX_REPORTS or (time.time() - self.last_report_time) > 300:
+                    if (time.time() - self.last_descriptors_time) > 3600:
+                        self.descriptors_sent_count = 0
+                        self.last_descriptors_time = time.time()
+                    self._send(includeDescriptors = (self.descriptors_sent_count <4))
+                    self.descriptors_sent_count +=1
            
     def _send(self, includeDescriptors = False):
         if not self.reports:
             return
-        ipfx_header = struct.pack("!H", 10) + b"\x00\x00" + struct.pack("!I", self.tt) + struct.pack("!I", self.seq) + struct.pack("!I", self.session_id)
+        tt = int(time.time())
+        ipfx_header = struct.pack("!H", 10) + b"\x00\x00" + struct.pack("!I", tt) + struct.pack("!I", self.seq) + struct.pack("!I", self.session_id)
         header = ipfx_header
         if includeDescriptors:
+            print(f"[pskr_upload] Packing descriptors")
             header = header + self.RxInfoRecDescriptor_CallLocSoft + self.SenderInfoRecDescriptor_SenderFreqSNRiMDModeSourceTime
         senders = bytearray()
         for dxcall, freq_hz, snr, mode, source, tt in self.reports.values():
-            print(f"Sending report {dxcall}, {freq_hz}, {snr}, {mode}, {source}, {tt}")
+            print(f"[pskr_upload] Packing report {dxcall}, {freq_hz}, {snr}, {mode}, {source}, {tt}")
             sender = self._enc_str(dxcall) + struct.pack("!I", int(freq_hz)) + struct.pack("b", int(snr)) + struct.pack("b", 0) + self._enc_str(mode) + struct.pack("B", source) + struct.pack("!I", tt)
             senders += sender
         packet = bytearray(header + self.rx_block + self._block(b"\x99\x93", senders))
@@ -71,8 +76,9 @@ class PSKR_upload:
         print(txt)
         self.console_print(txt)
         self.reports = {}
+        self.last_report_time = time.time()
 
 
-#pskr = PSKReporter('G1OJS', 'IO90ju', software = 'PyFT8', tt = int(time.time()))
+#pskr = PSKR_upload('G1OJS', 'IO90ju', software = 'PyFT8', console_print = None)
 #pskr.add_report('G1OJS', 14074000, -5, 'FT8', 2, int(time.time()))
-#pskr.send(includeDescriptors = True)
+#pskr._send(includeDescriptors = True)

{pyft8-2.4.2 → pyft8-2.4.3}/PyFT8/pyft8.py

@@ -11,7 +11,7 @@ from PyFT8.transmitter import AudioOut
 from PyFT8.time_utils import global_time_utils
 from PyFT8.rigctrl import Rig
 
-VER = '2.4.2'
+VER = '2.4.3'
 
 MAX_TX_START_SECONDS = 2.5
 rig, gui, qso, worked_before, pskr_upload = None, None, None, None, None
@@ -209,16 +209,18 @@ def progress_qso(clicked_message):
         qso.clear()
         qso.times['time_on'] = time.gmtime()
         qso.oStation = {'c': call_b, 'g': grid_rpt}
+        qso.rpts['sent'] = f"{clicked_message.snr:+03d}"
         qso.set_tx_message(f"{qso.oStation['c']} {my_station['c']} {my_station['g']}")
         return
 
     if call_a == my_station['c']:
         if qso.times['time_on'] is None:
             qso.times['time_on'] = time.gmtime()
+        if qso.rpts['sent'] is None:
+            qso.rpts['sent'] = f"{clicked_message.snr:+03d}"
         qso.oStation['c'] = call_b
         if isGrid(grid_rpt):
             qso.oStation = {'c': call_b, 'g': grid_rpt}
-            qso.rpts['sent'] = f"{clicked_message.snr:+03d}"
             reply = f"{qso.oStation['c']} {my_station['c']} {clicked_message.snr:+03d}"
         if isReport(grid_rpt):
             reply = f"{qso.oStation['c']} {my_station['c']} R{clicked_message.snr:+03d}"
@@ -323,7 +325,7 @@ def cli():
     mc, mg = config['station']['call'], config['station']['grid']
     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}", tt = int(time.time()), console_print = console_print) if not mc is None else None
+            pskr_upload = PSKR_upload(mc, mg, software = f"PyFT8 v{VER}", console_print = console_print) if not mc is None else None
             console_print(f"[PyFT8] Spots will upload to pskreporter") 
     qso = FT8_QSO(logging)
     rig = Rig(config)

{pyft8-2.4.2 → pyft8-2.4.3}/PyFT8.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 2.4.2
+Version: 2.4.3
 Summary: FT8 Decoding and Encoding in Python with test/loopback code
 Author-email: G1OJS <g1ojs@yahoo.com>
 License-Expression: GPL-3.0-or-later
@@ -27,6 +27,7 @@ PyFT8 is somewhat experimental, with a focus on demonstrating FT8 written in Pyt
 If you're interested in how this works, maybe have a look at [MiniPyFT8](https://github.com/G1OJS/MiniPyFT8) which puts all of the receive code in a single 300 line Python file.
 
 ## Features
+ - Rx and Tx of standard messages with optional /P and /R, and nonstandard calls plus hashed calls
  - Doesn't try to do everything, so launches quickly (~2 seconds on my old Dell Optiplex 790)
  - Use with or without gui (receive and send messages via command line commands)
  - GUI provides simultaneous views of odd and even cycles

{pyft8-2.4.2 → pyft8-2.4.3}/README.md

@@ -8,6 +8,7 @@ PyFT8 is somewhat experimental, with a focus on demonstrating FT8 written in Pyt
 If you're interested in how this works, maybe have a look at [MiniPyFT8](https://github.com/G1OJS/MiniPyFT8) which puts all of the receive code in a single 300 line Python file.
 
 ## Features
+ - Rx and Tx of standard messages with optional /P and /R, and nonstandard calls plus hashed calls
  - Doesn't try to do everything, so launches quickly (~2 seconds on my old Dell Optiplex 790)
  - Use with or without gui (receive and send messages via command line commands)
  - GUI provides simultaneous views of odd and even cycles

{pyft8-2.4.2 → pyft8-2.4.3}/pyproject.toml

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