PyFT8 2.4.0__tar.gz → 2.4.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 2.4.0
+Version: 2.4.2
 Summary: FT8 Decoding and Encoding in Python with test/loopback code
 Author-email: G1OJS <g1ojs@yahoo.com>
 License-Expression: GPL-3.0-or-later
@@ -17,7 +17,7 @@ Requires-Dist: matplotlib
 Requires-Dist: pyaudio
 Dynamic: license-file
 
-# PyFT8 [![PyPI Downloads](https://static.pepy.tech/personalized-badge/pyft8?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/pyft8)
+# PyFT8 [![PyPI Downloads](https://static.pepy.tech/personalized-badge/pyft8?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/pyft8) [![PyPI Downloads](https://static.pepy.tech/personalized-badge/pyft8?period=weekly&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads/wk)](https://pepy.tech/projects/pyft8)
 # All-Python FT8 Transceiver GUI / Command Line Modem
 
 This repository contains the source code for PyFT8, an all-Python open source FT8 transceiver that you can run as a basic GUI or from the command line to receive and transmit. Decoding performance (number of decodes) is about 70% of that achieved by WSJT-x in NORM mode, but (tbc) slightly above ft8_lib. 
@@ -86,9 +86,22 @@ The image below shows the number of decodes from PyFT8, WSJT-x V2.7.0 running in
 
 
 ## Limitations
+PyFT8 doesn't decode / encode *all* message types. The table below shows which are handled.
+
+|i3.n3|Known as|Rx|Tx|notes|
+|------|--------|----|----|-----|
+|0.0|Free Text  |   |   | |
+|0.1|DXpedition   |   |   | Call1 RR73; Call2 +07| 
+|0.3|Field Day  |   |   |  |
+|0.4|Field Day  |   |   |  |
+|0.5|Telemetry  |   |   |  |
+|1|Std Msg  |Y| Y  |Standard <=6 char callsigns, can include /R  |
+|2|EU VHF  |Y|Y| Standard <=6 char callsigns,  can include /P |
+|3|RTTY RU   |   |   | |
+|4|NonStd Call   |Y|Y| <=11 char callsigns + hashed call|
+|5|EU VHF  |   |   | |
+
 
-In pursuit of tight code, I've concentrated on core standard messages, leaving out some of the less-used features. The receive part of the
-code doesn't (yet) have the full capability of the advanced decoders used in WSJT-x, and so gets fewer decodes than WSJT-x gets, depending on band conditions (on a quiet band with only good signals PyFT8 will get close to 100%).
 
 ## Acknowledgements
 This project implements a decoder for the FT8 digital mode.

{pyft8-2.4.0 → pyft8-2.4.2}/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.0'
+VER = '2.4.2'
 
 MAX_TX_START_SECONDS = 2.5
 rig, gui, qso, worked_before, pskr_upload = None, None, None, None, None
@@ -50,16 +50,16 @@ class Logging:
                 f.write("header <eoh>")
         if(not os.path.exists(self.worked_before_file)):
             with open(f"{self.worked_before_file}","wb") as f:
-                pickle.dump({'dummy':'dummy'}, f)
+                pickle.dump({'dummy':0}, f)
         self.load_wb()
+        console_print(f"Logging to {self.adif_log_file}")
 
     def load_wb(self):
         global worked_before
         with open(f"{self.worked_before_file}","rb") as f:
             worked_before = pickle.load(f)
-        #self.load_wb_from_txt()
 
-    def load_wb_from_txt(self, file = 'c:/users/drala/recent_log.adi'):
+    def merge_adif_to_wb_not_used(self, file = 'c:/users/drala/recent_log.adi'):
         import datetime
         with open(file, 'r') as f:
             for l in f.readlines():
@@ -69,14 +69,18 @@ class Logging:
                     t = parse_from_adif_rec(l, 'time_on')
                     d = parse_from_adif_rec(l, 'qso_date')
                     tm = time.mktime(datetime.datetime.strptime(d+t, "%Y%m%d%H%M%S").timetuple())
+                    if callsign in worked_before:
+                        if tm < worked_before[callsign]:
+                            continue
                     self.update_worked_before(callsign, tm)
 
-    def update_worked_before(self, callsign, tm):
+    def update_worked_before(self, callsign, band, mode, tm):
         global worked_before
-        #self.load_wb()
-        if not callsign in worked_before:
-            worked_before[callsign] = {}
+        self.load_wb()
+        worked_before[callsign] = tm
+        cbm = callsign + "_"+band+"_"+mode
         worked_before[callsign] = tm
+        worked_before[cbm] = tm
         with open(f"{self.worked_before_file}","wb") as f:
             pickle.dump(worked_before, f)
                 
@@ -93,7 +97,7 @@ class Logging:
                 v = str(v)
                 f.write(f"<{k}:{len(v)}>{v} ")
             f.write(f"<eor>\n")
-        self.update_worked_before(oStation['c'], time.time())
+        self.update_worked_before(oStation['c'], band_info['b'], 'FT8', time.time())
         console_print(f"Logged QSO with {oStation['c']}")
 
 
@@ -178,6 +182,7 @@ class FT8_QSO:
 
     def log(self):
         if self.logging is not None:
+            self.times['time_off'] = time.gmtime()
             self.logging.log(self.times, self.band_info, self.mStation, self.oStation, self.rpts)
 
 def isReport(grid_rpt):     return "+" in grid_rpt or "-" in grid_rpt
@@ -220,14 +225,12 @@ def progress_qso(clicked_message):
             qso.rpts['rcvd'] = grid_rpt[-3:]
         if isRReport(grid_rpt) or isRRR(grid_rpt):
             reply = f"{qso.oStation['c']} {my_station['c']} RR73"
+            qso.log()
         if isRR73(grid_rpt):
             reply = f"{qso.oStation['c']} {my_station['c']} 73"
+            qso.log()
         qso.set_tx_message(reply)
 
-    if is73(grid_rpt) or " 73" in reply or isRR73(grid_rpt):
-        qso.times['time_off'] = time.gmtime()
-        qso.log() 
-
 def make_wav(msg, wave_output_file): # move to transmitter.py?
     symbols = audio_out.create_ft8_symbols(msg)
     audio_data = audio_out.create_ft8_wave(symbols)

{pyft8-2.4.0 → pyft8-2.4.2}/PyFT8/receiver.py

@@ -33,92 +33,89 @@ HOPS_PER_GRID = 2 * HOPS_PER_CYCLE
 global_time_utils.set_cycle_length(T_CYC)
 
 #=========== Unpacking functions ========================================
-def get_bits(bits, n):
-    mask = (1 << n) - 1
-    out = bits & mask
-    bits >>= n
-    return out, bits
+def get_bitfields(bits, lengths):
+    fields = []
+    for n in lengths:
+        mask = (1 << n) - 1
+        fields.append(bits & mask)
+        bits >>= n
+    return *fields, bits
 
 def unpack(bits):
-  #  print(f"{bits:77b}")
-    i3, bits = get_bits(bits,3)
-   # print(i3)
+    i3, bits74 = get_bitfields(bits,[3])
     if i3 == 0:
-        n3, bits = get_bits(bits,3)
+        n3, bits71 = get_bitfields(bits74,[3])
         if n3 == 0:
             return ('Free text','not','implemented')
         else:
             return (['DXpedition','Field Day', 'Field Day', 'Telemetry'][n3-1],'not','implemented')
     elif i3 == 1 or i3 == 2: # 1 = Std Msg incl /R 2 = 'EU VHF' = Std Msg incl /P
-        gr, bits = get_bits(bits,16)
-        cb, bits = get_bits(bits,29)
-        ca, bits = get_bits(bits,29)
-        return (call_28(ca, i3), call_28(cb, i3), decode_grid(gr))
+        return unpack_std(bits74, i3)
     elif i3 == 3:
         return ('RTTY RU','not','implemented')
     elif i3 == 4:
-        cq_, bits = get_bits(bits,1)
-        rrr, bits = get_bits(bits,2)
-        swp, bits = get_bits(bits,1)
-        c58, bits = get_bits(bits,58)
-        hsh, bits = get_bits(bits,12)
-        ca = "CQ" if cq_ else call_hashes.get((hsh,12), '<....>')
-        cb = call_58(c58)
+        cq, rrr, swp, c58, hsh, _ = get_bitfields(bits74, [1,2,1,58,12]) 
+        ca = "CQ" if cq else call_hashes.get((hsh,12), '<....>')
+        cb = ""
+        for i in range(12):
+            cb = " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ/"[c58 % 38] + cb
+            c58 = c58 // 38
+        cb =  cb.strip()
+        add_call_hashes(cb)
         (ca, cb) = (cb, ca) if swp else (ca, cb)
         return (ca, cb, ('', 'RRR', 'RR73', '73')[rrr])
     elif i3 == 5:
         return ('EU VHF','not','implemented')
 
-def call_58(call_int):
-    call = ""
-    chars = " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ/"
-    for i in range(12):
-        call = chars[call_int % 38] + call
-        call_int = call_int // 38
-    call =  call.strip()
-    add_call_hashes(call)
-    return call
+def unpack_std(bits74, i3):
+    g16, cb29, ca29, _ = get_bitfields(bits74,[16,29,29])
+    g15 = g16 & 0x7FFF
+    if g15 < 32400:
+        a, nn = divmod(g15, 1800)
+        b, nn = divmod(nn, 100)
+        c, d = divmod(nn, 10)
+        grid_rpt =  chr(65+a) + chr(65+b) + str(c) + str(d)
+    elif g15 - 32400 <= 4:
+        grid_rpt =  ('', '', 'RRR', 'RR73', '73')[g15 - 32400]
+    else:
+        prefix = 'R' if (g16 >> 15) else ''
+        grid_rpt = prefix + f"{(g15 - 32435):+03d}"
+    return (call_29(ca29, i3), call_29(cb29, i3), grid_rpt)
 
-def call_28(call_int, i3):
-    def get_table_7(call_int):
-        table_7 = {'DE':(0,0),'QRZ':(1,1),'CQ':(2,2), 'CQ nnn':(3,1002),'CQ x':(1004,1029),
-                   'CQ xx':(1031,1731),'CQ xxxx':(21443,532443),'hash':(2063592,2063592+4194303)}
-        for ct, (lo, hi) in table_7.items():
-            if lo <= call_int <= hi:
-                return ct        
+def call_29(call_int29, i3):    
+    portable_rover = call_int29 & 1
+    call_int28 = call_int29>>1
+    if call_int28 < 3:
+        return ['DE', 'QRZ', 'CQ'][call_int28]
+    elif call_int28 < 1004:
+        return f"CQ {call_int28 - 3:03d}"
+    elif call_int28 < 21443:
+        x, txt = call_int28 - 1003, ''
+        for i in range(4):
+            txt = " ABCDEFGHIJKLMNOPQRSTUVWXYZ"[int(x % 27)] + txt
+            x //= 27
+        return f"CQ {txt.strip()}"
+    elif call_int28 < 2063592+4194303:
+        return call_hashes.get((call_int28 - 2063592, 22), '<....>')
+    else:
+        call = standard_call28(call_int28, i3)
+        if portable_rover:
+            call = call + ('/P' if i3 == 2 else '/R')
+        add_call_hashes(call)
+        return call
+
+def standard_call28(call_int28, i3):
+    nn = call_int28 - (2063592 + 4194304)
     from string import ascii_uppercase as ltrs, digits as digs
     call_fields = [ (' ' + digs + ltrs, 36*10*27**3),   (digs + ltrs, 10*27**3), (digs + ' ' * 17, 27**3),
                     (' ' + ltrs, 27**2),           (' ' + ltrs,   27), (' ' + ltrs,   1) ]
-    portable_rover = call_int & 1
-    call_int >>= 1
-    t7 = get_table_7(call_int)
-    if t7 is not None:
-        return t7 if t7 != 'hash' else call_hashes.get((call_int - 2063592, 22), '<....>')
-    call_int -= (2063592 + 4194304)
     chars = []
     for alphabet, div in call_fields:
-        idx, call_int = divmod(call_int, div)
+        idx, nn = divmod(nn, div)
         chars.append(alphabet[idx])
     call = ''.join(chars).strip()
-    if portable_rover:
-        call = call + ('/P' if i3 == 2 else '/R')
-    add_call_hashes(call)
     return call
 
-def decode_grid(grid_int):
-    g15 = grid_int & 0x7FFF
-    if g15 < 32400:
-        a, nn = divmod(g15, 1800)
-        b, nn = divmod(nn, 100)
-        c, d = divmod(nn, 10)
-        return chr(65+a) + chr(65+b) + str(c) + str(d)
-    r = g15 - 32400
-    if r <= 4:
-        return ('', '', 'RRR', 'RR73', '73')[r]
-    snr = r - 35
-    ir = grid_int >> 15
-    prefix = 'R' if ir else ''
-    return prefix + f"{snr:+03d}"
 #============== CRC ===========================================================
 def check_crc(bits91_int):
     bits77_int = bits91_int >> 14

{pyft8-2.4.0 → pyft8-2.4.2}/PyFT8/transmitter.py

@@ -68,13 +68,12 @@ def _pack_message(c1, c2, gr):
     c28a, p1a = pack_ft8_c28(c1)
     c28b, p1b = pack_ft8_c28(c2)
     g15, ir = pack_ft8_g15(gr)
-    i3 = 2 if p1a or p1b else 1
+    i3 = 2 if c1.endswith('/P') or c2.endswith('/P') else 1
     n3 = 0
-    symbols, bits77 = [], 0
     if(c28a>=0 and c28b>=0):
         bits77 = (c28a<<28+1+1+1+15+3) | (p1a<<28+1+1+15+3) | (c28b<<1+1+15+3) | (p1b <<1+15+3) | (ir<<15+3) | (g15<< 3) | (i3)
         symbols  = encode_bits77(bits77)
-    if not any(symbols):
+    else:
         i3 = 4
         full_call = c1 if c28b>0 else c2
         hash_call = c2 if c28b>0 else c1
@@ -103,8 +102,8 @@ def pack_ft8_c28(call):
     if (call in tkns):
         c28, p1 = tkns.index(call), 0
     else:
-        p1 = 1 if call[-2:] == '/P' else 0
-        call = call.replace('/P','')
+        p1 = 1 if call[-2:] in ('/P', '/R')  else 0
+        call = call.replace('/P','').replace('/R','')
         if len(call) > 6:
             return -1, 0
         prepend_space = '' if call[2].isdigit() else ' '
@@ -185,7 +184,8 @@ def append_crc(bits77_int):
 if __name__ == "__main__":
     OK = True
     msgs = [("G1OJS/P", "G1OJS/P", "IO90"),("WM3PEN","EA6VQ","+08"),("E67A/P","EA6VQ","R-08"),
-            ("CQ","CT7ARQ/P","RRR"), ("EC5A","9A5E","RR73"), ("EC5A/P","9A5E","73"), ("EC5A/MM","9A5E","73")]
+            ("CQ","CT7ARQ/P","JO03"), ("EC5A","9A5E","RR73"), ("EC5A/P","9A5E","73"), ("EC5A/MM","9A5E","73"),
+            ("CQ","CT7ARQ/R","JO03")]
     for msg_tx in msgs:
         symbols, bits77 = _pack_message(*msg_tx)
         from PyFT8.receiver import unpack
@@ -194,4 +194,6 @@ if __name__ == "__main__":
         OK = OK and (msg_tx == msg_rx) or 'implemented' in msg_rx
         #print(''.join([str(s) for s in symbols]))
     print("\nPASSED" if OK else "\nFAILED")
+
+    print(unpack(int('00000000000000000100011011110000010010000000000111000001100011111000010010001',2)))
         

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 2.4.0
+Version: 2.4.2
 Summary: FT8 Decoding and Encoding in Python with test/loopback code
 Author-email: G1OJS <g1ojs@yahoo.com>
 License-Expression: GPL-3.0-or-later
@@ -17,7 +17,7 @@ Requires-Dist: matplotlib
 Requires-Dist: pyaudio
 Dynamic: license-file
 
-# PyFT8 [![PyPI Downloads](https://static.pepy.tech/personalized-badge/pyft8?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/pyft8)
+# PyFT8 [![PyPI Downloads](https://static.pepy.tech/personalized-badge/pyft8?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/pyft8) [![PyPI Downloads](https://static.pepy.tech/personalized-badge/pyft8?period=weekly&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads/wk)](https://pepy.tech/projects/pyft8)
 # All-Python FT8 Transceiver GUI / Command Line Modem
 
 This repository contains the source code for PyFT8, an all-Python open source FT8 transceiver that you can run as a basic GUI or from the command line to receive and transmit. Decoding performance (number of decodes) is about 70% of that achieved by WSJT-x in NORM mode, but (tbc) slightly above ft8_lib. 
@@ -86,9 +86,22 @@ The image below shows the number of decodes from PyFT8, WSJT-x V2.7.0 running in
 
 
 ## Limitations
+PyFT8 doesn't decode / encode *all* message types. The table below shows which are handled.
+
+|i3.n3|Known as|Rx|Tx|notes|
+|------|--------|----|----|-----|
+|0.0|Free Text  |   |   | |
+|0.1|DXpedition   |   |   | Call1 RR73; Call2 +07| 
+|0.3|Field Day  |   |   |  |
+|0.4|Field Day  |   |   |  |
+|0.5|Telemetry  |   |   |  |
+|1|Std Msg  |Y| Y  |Standard <=6 char callsigns, can include /R  |
+|2|EU VHF  |Y|Y| Standard <=6 char callsigns,  can include /P |
+|3|RTTY RU   |   |   | |
+|4|NonStd Call   |Y|Y| <=11 char callsigns + hashed call|
+|5|EU VHF  |   |   | |
+
 
-In pursuit of tight code, I've concentrated on core standard messages, leaving out some of the less-used features. The receive part of the
-code doesn't (yet) have the full capability of the advanced decoders used in WSJT-x, and so gets fewer decodes than WSJT-x gets, depending on band conditions (on a quiet band with only good signals PyFT8 will get close to 100%).
 
 ## Acknowledgements
 This project implements a decoder for the FT8 digital mode.

{pyft8-2.4.0 → pyft8-2.4.2}/PyFT8.egg-info/SOURCES.txt

@@ -20,6 +20,8 @@ PyFT8.egg-info/top_level.txt
 tests/plot_baseline.py
 tests/spare.py
 tests/test_batch_and_live.py
+tests/dev/CQ AAAA.py
 tests/dev/osd.py
 tests/dev/test_generate_wav.py
-tests/dev/test_loopback_performance.py
+tests/dev/test_loopback_performance.py
+tests/dev/view_worked_before.py

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

@@ -1,4 +1,4 @@
-# PyFT8 [![PyPI Downloads](https://static.pepy.tech/personalized-badge/pyft8?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/pyft8)
+# PyFT8 [![PyPI Downloads](https://static.pepy.tech/personalized-badge/pyft8?period=total&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads)](https://pepy.tech/projects/pyft8) [![PyPI Downloads](https://static.pepy.tech/personalized-badge/pyft8?period=weekly&units=INTERNATIONAL_SYSTEM&left_color=BLACK&right_color=GREEN&left_text=downloads/wk)](https://pepy.tech/projects/pyft8)
 # All-Python FT8 Transceiver GUI / Command Line Modem
 
 This repository contains the source code for PyFT8, an all-Python open source FT8 transceiver that you can run as a basic GUI or from the command line to receive and transmit. Decoding performance (number of decodes) is about 70% of that achieved by WSJT-x in NORM mode, but (tbc) slightly above ft8_lib. 
@@ -67,9 +67,22 @@ The image below shows the number of decodes from PyFT8, WSJT-x V2.7.0 running in
 
 
 ## Limitations
+PyFT8 doesn't decode / encode *all* message types. The table below shows which are handled.
+
+|i3.n3|Known as|Rx|Tx|notes|
+|------|--------|----|----|-----|
+|0.0|Free Text  |   |   | |
+|0.1|DXpedition   |   |   | Call1 RR73; Call2 +07| 
+|0.3|Field Day  |   |   |  |
+|0.4|Field Day  |   |   |  |
+|0.5|Telemetry  |   |   |  |
+|1|Std Msg  |Y| Y  |Standard <=6 char callsigns, can include /R  |
+|2|EU VHF  |Y|Y| Standard <=6 char callsigns,  can include /P |
+|3|RTTY RU   |   |   | |
+|4|NonStd Call   |Y|Y| <=11 char callsigns + hashed call|
+|5|EU VHF  |   |   | |
+
 
-In pursuit of tight code, I've concentrated on core standard messages, leaving out some of the less-used features. The receive part of the
-code doesn't (yet) have the full capability of the advanced decoders used in WSJT-x, and so gets fewer decodes than WSJT-x gets, depending on band conditions (on a quiet band with only good signals PyFT8 will get close to 100%).
 
 ## Acknowledgements
 This project implements a decoder for the FT8 digital mode.

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

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

pyft8-2.4.2/tests/dev/CQ AAAA.py

@@ -0,0 +1,30 @@
+
+def meth1(a):
+    c = " ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    x =  a-1003
+    ci1 = x // (27*27*27)
+    x %= 27*27*27
+    ci2 = x // (27*27)
+    x %= 27*27
+    ci3 = x // 27
+    x %= 27
+    ci4 = x
+    aaaa = c[ci1] + c[ci2] + c[ci3] + c[ci4]
+    return f"CQ {aaaa}"
+
+
+import numpy
+
+
+def meth2(a):
+    c = " ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    x = int(a - 1003)
+    print(x)
+    txt = ''
+    for i in range(4):
+        txt = c[int(x % 27)] + txt
+        x /= 27
+    return f"CQ {txt}"
+
+for a in [1004, 1029, 1031, 1731, 1760, 20685, 21443, 532443, 1135]:
+    print(meth1(a), meth2(a))

pyft8-2.4.2/tests/dev/view_worked_before.py

@@ -0,0 +1,10 @@
+import pickle
+def flat_list(worked_before_file = 'C:/Users/drala/Documents/Projects/GitHub/G1OJS/PyFT8_cfg/PyFT8_wb.pkl'):
+    with open(f"{worked_before_file}","rb") as f:
+        worked_before = pickle.load(f)
+    worked_before['dummy']=0
+    wb = sorted(worked_before.items(), key=lambda x: x[1])
+    for c in wb:
+        print(c)
+
+flat_list()