PyFT8 2.1.3__tar.gz → 2.2.0__tar.gz

{pyft8-2.1.3 → pyft8-2.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 2.1.3
+Version: 2.2.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
@@ -34,7 +34,8 @@ PyFT8 is somewhat experimental, with a focus on demonstrating FT8 written in Pyt
  - Modern programming language throughout
  - Finds sound cards by keywords so follows them if windows moves them ...
 
-<img width="883" height="1001" alt="image" src="https://github.com/user-attachments/assets/7a93560e-2f3c-4d8b-ac5a-3db97329bf36" />
+<img width="1003" height="1020" alt="image" src="https://github.com/user-attachments/assets/bf6e3f78-531a-4c9b-ab2b-b51cc04ad980" />
+
 
 
 ## Motivation
@@ -61,7 +62,9 @@ Once installed, you can use the following commands to run it. Otherwise, please
 | Launch configured GUI|pyft8 -i "Keyword1, Keyword2" -o "Keyword1, Keyword2" -c {config folder}| Config folder stores PyFT8.ini (your callsign, grid, buttons) and PyFT8.adi log file. Run this once to create default PyFT8.ini file.|
 
 ### Rig control 
-PyFT8 doesn't currently support CAT control for rigs in general. However, I've included the Python code that I use with my Icom IC-7100 in the file 'rigctrl.py'. You can modify this to control your own rig of course if you know Python.
+I'm resisting interfacing this to middleware such as Hamlib and Omnirig, because I want to keep the whole thing self-contained and simple, and losing connections to/from middleware was one motivation for writing this in the first place.
+
+However, I've included the Python code that I use with my Icom IC-7100 in the file 'rigctrl.py', and believe I've moved sufficient 'specification' for the rig protocol into the .ini file so that you can paste in your own rig specification (see for e.g. the Omnirig .ini file for your rig) and get it working with PyFT8 controlling PTT and frequency.
 
 Alternatively, you can run PyFT8 without rig control; if there is no rig found, PyFT8 defaults to running without a rig connected. In this case, you need to provide your own PTT method and note that the band buttons will only set the information used for logging QSOs to the PyFT8.adi file. Or you can use PyFT8 as Rx-only.
 
@@ -69,9 +72,11 @@ Alternatively, you can run PyFT8 without rig control; if there is no rig found,
 
 The image below shows the number of decodes from PyFT8, WSJT-x V2.7.0 running in NORM mode, and FT8_lib, using the same 10 minutes of busy 20m audio that is used to test ft8_lib. 
 
-<img width="844" height="562" alt="performance snapshot" src="https://github.com/user-attachments/assets/08ba1946-b816-448f-9510-7763a2f065bd" />
+<img width="640" height="480" alt="performance snapshot" src="https://github.com/user-attachments/assets/fc84702a-4d76-475b-b7fe-489f4a09deed" />
+
 
 ## Limitations
+
 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%).
 

{pyft8-2.1.3 → pyft8-2.2.0}/PyFT8/gui.py

@@ -8,6 +8,29 @@ from matplotlib.widgets import Slider, Button
 rcParams['toolbar'] = 'None'
 # ================== WATERFALL ======================================================
 
+class Scrollbox:
+    def __init__(self, fig, ax, nlines = 5):
+        self.fig, self.ax = fig, ax
+        bbox = ax.get_window_extent().transformed(fig.dpi_scale_trans.inverted())
+        self.fontsize = 0.5 * bbox.height * fig.dpi / nlines
+        self.nlines = nlines
+        self.line_height = 0.9 / nlines
+        self.lines = []
+        self.lineartists = []
+        for i in range(self.nlines):
+            self.lineartists.append(self.ax.text(0.03,1 - self.line_height * (i+1),
+                            '', color = 'white', fontsize = self.fontsize))
+        self.ax.set_xticks([])
+        self.ax.set_yticks([])
+        self.ax.set_facecolor('black')
+
+    def print(self, text, color = 'white'):
+        self.lines = self.lines[-(self.nlines-1):]
+        self.lines.append({'text':text, 'color':color})
+        for i, line in enumerate(self.lines):
+            self.lineartists[i].set_text(line['text'])
+            self.lineartists[i].set_color(line['color'])
+
 class Msg_box:
     def __init__(self, fig, ax, tbin, fbin, w, h, onclick):
         from matplotlib.patches import Rectangle
@@ -47,50 +70,48 @@ class Msg_box:
 
 class Gui:
     def __init__(self, dBgrid, hps, bpt, config, on_msg_click, on_control_click):
-        self.mStation = {'c':config['station']['call'], 'g':config['station']['grid']}
+        if config is not None:
+            self.mStation = {'c':config['station']['call'], 'g':config['station']['grid']}
         self.on_msg_click = on_msg_click
         self.on_control_click = on_control_click
         self.dBgrid = dBgrid
         self.hps, self.bpt = hps, bpt
         self.msg_boxes = {}
         self.decode_queue = queue.Queue()
-        self.simple_message_art = None
+        self.pmarg = 0.04
         self.make_layout(config)
+        self.ani = FuncAnimation(self.fig, self._animate, interval = 40, frames=(100000), blit=True)
 
-    def simple_message(self, text, color):
-        if self.simple_message_art:
-            self.simple_message_art.remove()
-        self.simple_message_art = self.fig.text(0.2,0.985, text, color = color)
-        self.fig.canvas.draw()
-        self.fig.canvas.flush_events()
-
-    def make_layout(self, config):
-        self.fig, self.ax_wf = plt.subplots(figsize=(10,10), frameon = False)
-        self.fig.canvas.manager.set_window_title('PyFT8 by G1OJS')
+    def make_layout(self, config, wf_left = 0.15, wf_top = 0.87):
         self.plt = plt
-        plt.tight_layout()
-        self.image = self.ax_wf.imshow(self.dBgrid.T,vmax=120,vmin=90,origin='lower',interpolation='none')
-        wf_ylim = self.ax_wf.get_ylim()
-        self.ax_wf.set_axis_off()
-        
+        self.fig = plt.figure(figsize = (10,10), facecolor=(.18, .71, .71, 0.4)) 
+        self.fig.canvas.manager.set_window_title('PyFT8 by G1OJS')
+        self.ax_wf = self.fig.add_axes([self.pmarg + wf_left, self.pmarg, 1-2*self.pmarg-wf_left, wf_top-self.pmarg])
+        self.image = self.ax_wf.imshow(self.dBgrid.T,vmax=120,vmin=90,origin='lower',interpolation='none', aspect = 'auto')
+        self.ax_wf.set_xticks([])
+        self.ax_wf.set_yticks([])
+        self.ax_console = self.fig.add_axes([self.pmarg + wf_left, wf_top, 1-2*self.pmarg - wf_left, 1-self.pmarg-wf_top])
+        self.console = Scrollbox(self.fig, self.ax_console)
+
+        if config is not None:
+            styles = {'ctrl':{'fc':'grey','c':'black'}, 'band':{'fc':'green','c':'white'}}
+            button_defs = [{'label':'CQ','style':'ctrl','data':None}, {'label':'Repeat last','style':'ctrl','data':None},
+                               {'label':'Tx off','style':'ctrl','data':None}]
+                               #{'label':'Averaging','style':'ctrl','data':None}]
+            for band, freq in config['bands'].items():
+                button_defs.append({'label':band,'style':'band','data':freq})
+            self._make_buttons(button_defs, styles, wf_top, 0.02, 0.1, 0.002)
+
+    def _make_buttons(self, buttons, styles, btns_top, btn_h, btn_w, sep_h):
         self.buttons = []
-        styles = {'ctrl':{'fc':'grey','c':'black'}, 'band':{'fc':'green','c':'white'}}
-        control_buttons = [{'label':'CQ','style':'ctrl','data':None}, {'label':'Repeat last','style':'ctrl','data':None},
-                           {'label':'Tx off','style':'ctrl','data':None}]
-                           #{'label':'Averaging','style':'ctrl','data':None}]
-        for band, freq in config['bands'].items():
-            control_buttons.append({'label':band,'style':'band','data':freq})
-            
-        btn_axs = []
-        for i, btn in enumerate(control_buttons):
-            btn_axs.append(plt.axes([0.05, 0.9 - 0.022 * i, 0.1, 0.02]))
+        for i, btn in enumerate(buttons):
+            btn_axs = plt.axes([self.pmarg, btns_top - (i+1) * btn_h, btn_w, btn_h-sep_h])
             style = styles[btn['style']]
-            btn_widg = Button(btn_axs[-1], btn['label'], color=style['fc'], hovercolor='skyblue')
+            btn_widg = Button(btn_axs, btn['label'], color=style['fc'], hovercolor='skyblue')
             btn_widg.data = btn['data']
             btn_widg.on_clicked(lambda event, btn_widg=btn_widg: self.on_control_click(btn_widg))
             self.buttons.append(btn_widg)
-        self.ani = FuncAnimation(self.fig, self._animate, interval = 40, frames=(100000), blit=True)
-
+        
     def add_message_box(self, message):
         self.decode_queue.put(message)
 
@@ -111,6 +132,6 @@ class Gui:
             self._display_message_box(self.decode_queue.get())
         if (frame % 10 == 0):
             self._tidy_msg_boxes()
-        return [self.image, *self.ax_wf.patches, *self.ax_wf.texts]
+        return [self.image, *self.ax_wf.patches, *self.ax_wf.texts, *self.console.lineartists]
 
                                     

{pyft8-2.1.3 → pyft8-2.2.0}/PyFT8/pyft8.py

@@ -8,21 +8,12 @@ from PyFT8.receiver import Receiver, AudioIn
 from PyFT8.gui import Gui
 from PyFT8.transmitter import AudioOut
 from PyFT8.time_utils import global_time_utils
+from PyFT8.rigctrl import Rig
 
 MAX_TX_START_SECONDS = 2.5
 T_CYC = 15
-rig = None
-gui = None
+rig, gui, qso, worked_before = None, None, None, None
 
-def load_rigctrl():
-    try:
-        from PyFT8.rigctrl import Rig
-        print("Loaded Rig control")
-        return Rig()
-    except ImportError:
-        print("No Rig control found")
-        return None
- 
 def get_config(config_folder):
     import configparser
     global config
@@ -31,10 +22,13 @@ def get_config(config_folder):
     if not os.path.exists(ini_file):
         config['station'] = {'call':'station_callsign', 'grid':'station_grid'}
         config['bands'] = {'20m':14.074}
+        config['rig'] = {'port': 'COM4', 'baud_rate':9600,
+                         'set_freq_command':'FEFE88E0.05.0000000000.FD', 'set_freq_value':'5|5|vfBcdLU|1|0',
+                         'ptt_on_command':'FEFE88E0.1C00.01.FD', 'ptt_off_command':'FEFE88E0.1C00.00.FD'}
         with open(ini_file, 'w') as f:
             config.write(f)
-        print(f"Wrote default config to {ini_file}")
-    print(f"Reading config from {ini_file}")
+        console_print(f"Wrote default config to {ini_file}")
+    console_print(f"Reading config from {ini_file}")
     config.read(ini_file)
 
 def parse_from_adif_rec(rec, field):
@@ -97,13 +91,15 @@ class Logging:
                 f.write(f"<{k}:{len(v)}>{v} ")
             f.write(f"<eor>\n")
         self.update_worked_before(oStation['c'], time.time())
-        print(f"Logged QSO with {oStation['c']}")
+        console_print(f"Logged QSO with {oStation['c']}")
 
 
 class Message:
     def __init__(self, candidate):
         c = candidate
-        mycall = qso.mStation['c']
+        mycall = ''
+        if qso is not None:
+            mycall = qso.mStation['c']
         self.h0_idx, self.f0_idx, self.msg_tuple, self.msg, self.snr, self.dt, self.fHz = c.h0_idx, c.f0_idx, c.msg_tuple, c.msg, c.snr, c.dt, c.fHz
         self.cyclestart = c.cyclestart
         self.expire = time.time() + 29.8
@@ -111,7 +107,7 @@ class Message:
         self.is_to_me = c.msg_tuple[0] == mycall
         self.is_cq = c.msg_tuple[0].startswith('CQ')
         gui_wb_text = ''
-        if self.is_cq:
+        if self.is_cq and worked_before is not None:
             if c.msg_tuple[1] in worked_before:
                 gui_wb_text = f"wb: {global_time_utils.format_duration(time.time() - worked_before[c.msg_tuple[1]])}"
         self.gui_text = f"{c.msg} {gui_wb_text}"
@@ -123,7 +119,8 @@ class Message:
 class FT8_QSO:
     def __init__(self, logging):
         self.logging = logging
-        self.mStation = {'c':config['station']['call'], 'g':config['station']['grid']}
+        if config is not None:
+            self.mStation = {'c':config['station']['call'], 'g':config['station']['grid']}
         self.band_info = {'b':None, 'f':0}
         self.tx_freq = 750
         threading.Thread(target = self._transmitter, daemon = True).start()
@@ -139,9 +136,9 @@ class FT8_QSO:
 
     def set_tx_message(self, message):
         if gui and self.band_info['b'] is None:
-            gui.simple_message("Please select a band before transmitting", color = 'red')
+            console_print("[PyFT8] Please select a band before transmitting", color = 'red')
             return
-        print(f"[QSO] Set transmit message to '{message}' with tx cycle = {self.tx_cycle}")
+        console_print(f"[QSO] Set transmit message to '{message}' with tx cycle = {self.tx_cycle}")
         self.message_to_transmit = message
 
     def _transmitter(self):
@@ -150,7 +147,7 @@ class FT8_QSO:
             if self.message_to_transmit is None:
                 continue
             if output_device_idx is None:
-                print("No output device")
+                console_print("No output device")
                 return
             ct = global_time_utils.cycle_time()
             if ct > MAX_TX_START_SECONDS:
@@ -159,17 +156,18 @@ class FT8_QSO:
             if self.tx_cycle is None:
                 self.tx_cycle = global_time_utils.curr_cycle_from_time()
                 self.tx_freq = clear_frequencies[self.tx_cycle]
-            print(f"Transmitting {self.message_to_transmit} on cycle {self.tx_cycle}")
+            console_print(f"Transmitting {self.message_to_transmit} on cycle {self.tx_cycle}")
             symbols = audio_out.create_ft8_symbols(self.message_to_transmit)
             audio_data = audio_out.create_ft8_wave(symbols, f_base = self.tx_freq)
-            rig.PyFT8_ptt_on()
+            rig.ptt_on()
             audio_out.play_data_to_soundcard(audio_data, output_device_idx)
-            rig.PyFT8_ptt_off()
+            rig.ptt_off()
             self.last_tx = self.message_to_transmit
             self.message_to_transmit = None
 
     def log(self):
-        self.logging.log(self.times, self.band_info, self.mStation, self.oStation, self.rpts)
+        if self.logging is not None:
+            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
 def isRReport(grid_rpt):    return isReport(grid_rpt) and 'R' in grid_rpt
@@ -182,12 +180,14 @@ def progress_qso(clicked_message):
     global qso
     
     if time.time() - clicked_message.cyclestart['time'] > (15 + MAX_TX_START_SECONDS):
-        print("Try next cycle")
+        console_print("Try next cycle")
         return
     
     call_a, call_b, grid_rpt = clicked_message.msg_tuple
     my_station = qso.mStation
     reply = ""
+    msg = ' '.join(clicked_message.msg_tuple)
+    console_print(f"[QSO] Clicked on message '{msg}'")
 
     if call_a == "CQ":
         qso.clear()
@@ -212,7 +212,7 @@ def progress_qso(clicked_message):
         if isRR73(grid_rpt):
             reply = f"{qso.oStation['c']} {my_station['c']} 73"
         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() 
@@ -221,7 +221,7 @@ 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)
     audio_out.write_to_wave_file(audio_data, wave_output_file)
-    print(f"Created wave file {wave_output_file}")
+    console_print(f"Created wave file {wave_output_file}")
 
 def wait_for_keyboard():
     import time
@@ -245,7 +245,7 @@ def on_busy_profile(busy_profile, cycle):
     f0_idx, fn_idx = int(500/audio_in.df), int(fmax/audio_in.df)
     idx = np.argmin(busy_profile[f0_idx:fn_idx])
     clear_frequencies[cycle] = (f0_idx + idx) * audio_in.df
-    print(f"[on_busy] Set Tx freq to {clear_frequencies[cycle]:6.1f} for cycle {cycle}")
+    console_print(f"[on_busy] Set Tx freq to {clear_frequencies[cycle]:6.1f} for cycle {cycle}")
 
 def on_control_click(btn_widg):
     btn_text, btn_data = btn_widg.label.get_text(), btn_widg.data
@@ -255,16 +255,23 @@ def on_control_click(btn_widg):
     if btn_text == "Repeat last":
         qso.set_tx_message(qso.last_tx)
     if btn_text == "Tx off":
-        rig.PyFT8_ptt_off()
+        console_print("[PyFT8] Set PTT Off")
+        rig.ptt_off()
     if('m' in btn_text):
         qso.band_info = {'b':btn_text, 'f':btn_data}
-        rig.PyFT8_set_freq_Hz(int(1000000*float(qso.band_info['f'])))
-        gui.simple_message(f"{qso.band_info['b']} {qso.band_info['f']}", 'black')
+        rig.set_freq_Hz(int(1000000*float(qso.band_info['f'])))
+        console_print(f"[PyFT8] Set band: {qso.band_info['b']} {qso.band_info['f']}")
 
 def on_msg_click(message):
     progress_qso(message)
 
-#=============== CLI ========================================================================        
+#=============== CLI ========================================================================
+def console_print(text, color = 'white'):
+    if gui is not None:
+        gui.console.print(text, color)
+    else:
+        print(text)
+        
 def cli():
     global audio_in, audio_out, output_device_idx, rig, gui, qso, config, clear_frequencies
     import time
@@ -282,9 +289,8 @@ def cli():
     config_folder = f"{args.config_folder}".strip()
     get_config(config_folder)
     logging = Logging(config_folder)
-    #print(worked_before)
     qso = FT8_QSO(logging)
-    rig = load_rigctrl()
+    rig = Rig(config)
 
     if args.transmit_message or args.outputcard_keywords:
         audio_out = AudioOut()
@@ -303,7 +309,7 @@ def cli():
         audio_in = AudioIn(3100)
         input_device_idx = audio_in.find_device(args.inputcard_keywords.replace(' ','').split(','))
         if not input_device_idx:
-            print("No input device")
+            console_print("No input device")
         else:
             gui = None if args.no_gui else Gui(audio_in.dBgrid_main, 4, 2, config, on_msg_click, on_control_click)
             rx = Receiver(audio_in, [200, 3100], on_decode, on_busy_profile)

{pyft8-2.1.3 → pyft8-2.2.0}/PyFT8/receiver.py

@@ -275,8 +275,16 @@ class Candidate:
             bits77_int = check_crc(bits91_int)
             if(bits77_int):
                 self.msg_tuple = unpack(bits77_int)
-                self.msg = ' '.join(self.msg_tuple)
+                self.msg = self.validate(self.msg_tuple)
         self.decode_completed = time.time()
+
+    def validate(self, msg_tuple):
+        mt = msg_tuple
+        e = False
+        e = e or (' ' in mt[0].strip() and not mt[0].startswith('CQ'))
+        #e = e or (' ' in mt[1].strip())
+        if not e:
+            return ' '.join(self.msg_tuple)
         
 #============== RECEIVER ===========================================================
         

pyft8-2.2.0/PyFT8/rigctrl.py

@@ -0,0 +1,72 @@
+import serial, time
+
+class Rig:
+
+    def __init__(self, config, verbose = False):
+        self.serial_port = False
+        self.port = config['rig']['port']
+        self.baud_rate = config['rig']['baud_rate']
+        self.ptt_on_cmd = self.parse_configstr(config['rig']['ptt_on_command']) if config['rig']['ptt_on_command']else None
+        self.ptt_off_cmd = self.parse_configstr(config['rig']['ptt_off_command']) if config['rig']['ptt_off_command'] else None
+        self.set_freq_cmd = self.parse_configstr(config['rig']['set_freq_command']) if config['rig']['set_freq_command'] else None
+        self.set_freq_value = config['rig']['set_freq_value'] if config['rig']['set_freq_value'] else None
+        self.verbose = verbose
+
+    def parse_configstr(self, configstr):
+        if "." in configstr:
+            hexstr = configstr.replace(".", "")
+            return bytearray.fromhex(hexstr)
+        else:
+            return bytearray(configstr.encode())
+        
+    def vprint(self, text):
+        if self.verbose:
+            print(text)
+
+    def _sendCAT(self, msg):
+        try:
+            self.serial_port = serial.Serial(port = self.port, baudrate = self.baud_rate, timeout = 0.1)
+        except Exception as e:
+            print(f"[CAT] couldn't open {self.port}: {e}")
+        if (self.serial_port):
+            self.serial_port.reset_input_buffer()
+            self.vprint(f"[CAT] send {msg.hex(' ')}")
+            try:
+                self.serial_port.write(msg)
+                time.sleep(0.05)
+                self.serial_port.close()
+            except Exception as e:
+                print(f"[CAT] couldn't send CAT command {msg} on {self.port}: {e}")
+
+    def set_freq_Hz(self, freqHz):
+        if self.set_freq_cmd and self.set_freq_value:
+            self.vprint(f"[CAT] SET frequency to {freqHz} Hz")
+            start, length, fmt, mult, offset = self.set_freq_value.split("|")
+            start, length, mult, offset = int(start), int(length), int(mult), int(offset)
+            fVal = freqHz * mult + offset
+            nDigits = length if fmt == "text" else 2*length
+            s = f"{fVal:0{nDigits}d}"
+            if fmt=='text':
+                fBytes = s.encode()
+            else:
+                pairs = [(int(s[i]) << 4) | int(s[i+1]) for i in range(0, len(s), 2)]
+                if fmt == "vfBcdLU":
+                    fBytes = bytes(pairs[::-1])
+                else:
+                    fBytes = bytes(pairs)
+            cmd = bytearray(self.set_freq_cmd)
+            cmd[start:start+length] = fBytes
+            if fmt.startswith("vfBcd"):  # CI-V
+                cmd = b'\x00' + cmd
+            self._sendCAT(cmd)
+
+    def ptt_on(self):
+        if self.ptt_on_cmd:
+            self.vprint(f"[CAT] PTT On")
+            self._sendCAT(self.ptt_on_cmd)
+
+    def ptt_off(self):
+        if self.ptt_off_cmd:
+            self.vprint(f"[CAT] PTT Off")
+            self._sendCAT(self.ptt_off_cmd)
+

{pyft8-2.1.3 → pyft8-2.2.0}/PyFT8.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 2.1.3
+Version: 2.2.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
@@ -34,7 +34,8 @@ PyFT8 is somewhat experimental, with a focus on demonstrating FT8 written in Pyt
  - Modern programming language throughout
  - Finds sound cards by keywords so follows them if windows moves them ...
 
-<img width="883" height="1001" alt="image" src="https://github.com/user-attachments/assets/7a93560e-2f3c-4d8b-ac5a-3db97329bf36" />
+<img width="1003" height="1020" alt="image" src="https://github.com/user-attachments/assets/bf6e3f78-531a-4c9b-ab2b-b51cc04ad980" />
+
 
 
 ## Motivation
@@ -61,7 +62,9 @@ Once installed, you can use the following commands to run it. Otherwise, please
 | Launch configured GUI|pyft8 -i "Keyword1, Keyword2" -o "Keyword1, Keyword2" -c {config folder}| Config folder stores PyFT8.ini (your callsign, grid, buttons) and PyFT8.adi log file. Run this once to create default PyFT8.ini file.|
 
 ### Rig control 
-PyFT8 doesn't currently support CAT control for rigs in general. However, I've included the Python code that I use with my Icom IC-7100 in the file 'rigctrl.py'. You can modify this to control your own rig of course if you know Python.
+I'm resisting interfacing this to middleware such as Hamlib and Omnirig, because I want to keep the whole thing self-contained and simple, and losing connections to/from middleware was one motivation for writing this in the first place.
+
+However, I've included the Python code that I use with my Icom IC-7100 in the file 'rigctrl.py', and believe I've moved sufficient 'specification' for the rig protocol into the .ini file so that you can paste in your own rig specification (see for e.g. the Omnirig .ini file for your rig) and get it working with PyFT8 controlling PTT and frequency.
 
 Alternatively, you can run PyFT8 without rig control; if there is no rig found, PyFT8 defaults to running without a rig connected. In this case, you need to provide your own PTT method and note that the band buttons will only set the information used for logging QSOs to the PyFT8.adi file. Or you can use PyFT8 as Rx-only.
 
@@ -69,9 +72,11 @@ Alternatively, you can run PyFT8 without rig control; if there is no rig found,
 
 The image below shows the number of decodes from PyFT8, WSJT-x V2.7.0 running in NORM mode, and FT8_lib, using the same 10 minutes of busy 20m audio that is used to test ft8_lib. 
 
-<img width="844" height="562" alt="performance snapshot" src="https://github.com/user-attachments/assets/08ba1946-b816-448f-9510-7763a2f065bd" />
+<img width="640" height="480" alt="performance snapshot" src="https://github.com/user-attachments/assets/fc84702a-4d76-475b-b7fe-489f4a09deed" />
+
 
 ## Limitations
+
 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%).
 

pyft8-2.2.0/PyFT8.egg-info/SOURCES.txt

@@ -0,0 +1,23 @@
+LICENSE
+MANIFEST.in
+README.md
+pyproject.toml
+PyFT8/__init__.py
+PyFT8/gui.py
+PyFT8/pyft8.py
+PyFT8/receiver.py
+PyFT8/rigctrl.py
+PyFT8/time_utils.py
+PyFT8/transmitter.py
+PyFT8.egg-info/PKG-INFO
+PyFT8.egg-info/SOURCES.txt
+PyFT8.egg-info/dependency_links.txt
+PyFT8.egg-info/entry_points.txt
+PyFT8.egg-info/requires.txt
+PyFT8.egg-info/top_level.txt
+tests/plot_baseline.py
+tests/spare.py
+tests/test_batch_and_live.py
+tests/dev/osd.py
+tests/dev/test_generate_wav.py
+tests/dev/test_loopback_performance.py

{pyft8-2.1.3 → pyft8-2.2.0}/README.md

@@ -15,7 +15,8 @@ PyFT8 is somewhat experimental, with a focus on demonstrating FT8 written in Pyt
  - Modern programming language throughout
  - Finds sound cards by keywords so follows them if windows moves them ...
 
-<img width="883" height="1001" alt="image" src="https://github.com/user-attachments/assets/7a93560e-2f3c-4d8b-ac5a-3db97329bf36" />
+<img width="1003" height="1020" alt="image" src="https://github.com/user-attachments/assets/bf6e3f78-531a-4c9b-ab2b-b51cc04ad980" />
+
 
 
 ## Motivation
@@ -42,7 +43,9 @@ Once installed, you can use the following commands to run it. Otherwise, please
 | Launch configured GUI|pyft8 -i "Keyword1, Keyword2" -o "Keyword1, Keyword2" -c {config folder}| Config folder stores PyFT8.ini (your callsign, grid, buttons) and PyFT8.adi log file. Run this once to create default PyFT8.ini file.|
 
 ### Rig control 
-PyFT8 doesn't currently support CAT control for rigs in general. However, I've included the Python code that I use with my Icom IC-7100 in the file 'rigctrl.py'. You can modify this to control your own rig of course if you know Python.
+I'm resisting interfacing this to middleware such as Hamlib and Omnirig, because I want to keep the whole thing self-contained and simple, and losing connections to/from middleware was one motivation for writing this in the first place.
+
+However, I've included the Python code that I use with my Icom IC-7100 in the file 'rigctrl.py', and believe I've moved sufficient 'specification' for the rig protocol into the .ini file so that you can paste in your own rig specification (see for e.g. the Omnirig .ini file for your rig) and get it working with PyFT8 controlling PTT and frequency.
 
 Alternatively, you can run PyFT8 without rig control; if there is no rig found, PyFT8 defaults to running without a rig connected. In this case, you need to provide your own PTT method and note that the band buttons will only set the information used for logging QSOs to the PyFT8.adi file. Or you can use PyFT8 as Rx-only.
 
@@ -50,9 +53,11 @@ Alternatively, you can run PyFT8 without rig control; if there is no rig found,
 
 The image below shows the number of decodes from PyFT8, WSJT-x V2.7.0 running in NORM mode, and FT8_lib, using the same 10 minutes of busy 20m audio that is used to test ft8_lib. 
 
-<img width="844" height="562" alt="performance snapshot" src="https://github.com/user-attachments/assets/08ba1946-b816-448f-9510-7763a2f065bd" />
+<img width="640" height="480" alt="performance snapshot" src="https://github.com/user-attachments/assets/fc84702a-4d76-475b-b7fe-489f4a09deed" />
+
 
 ## Limitations
+
 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%).
 

{pyft8-2.1.3 → pyft8-2.2.0}/pyproject.toml

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

{pyft8-2.1.3 → pyft8-2.2.0}/tests/test_batch_and_live.py

@@ -5,6 +5,7 @@ import pickle
 import threading
 from PyFT8.receiver import Receiver, AudioIn
 from PyFT8.gui import Gui
+from PyFT8.pyft8 import Message
 
 class Wsjtx_all_tailer:
     
@@ -37,6 +38,7 @@ class Wsjtx_all_tailer:
 
 
 data_folder = "C:/Users/drala/Documents/Projects/GitHub/PyFT8/tests/data/ft8_lib_20m_busy"
+wav_folder = "C:/Users/drala/Documents/Projects/GitHub/ft8_lib/test/wav/20m_busy"
 
 global decodes, py_times, ws_times, decodes
 decodes, py_times, ws_times = [], [], []
@@ -52,11 +54,10 @@ def get_cumulative_from_text_files(i0, i1, postfix):
     return times
 
 def on_decode(c):
-    global decodes, py_times
-    decode_pack = (c.h0_idx, c.f0_idx, c.msg, int(c.snr))
-    gui.post_decode(decode_pack)
-    print(f"{c.cyclestart_str} {c.snr} {c.dt:4.1f} {c.fHz} ~ {c.msg}")
-    decodes.append(decode_pack)
+    message = Message(c)
+    if gui:
+        gui.add_message_box(message)
+    print(message.wsjtx_screen_format())
     py_times.append(time.time() - t_start)
 
 def batch_test(i0, i1):
@@ -64,10 +65,10 @@ def batch_test(i0, i1):
     global t_start, gui
     wav_files = []
     for idx in range(i0, i1):
-        wav_files.append(f"{data_folder}/test_{idx:02d}.wav")
+        wav_files.append(f"{wav_folder}/test_{idx:02d}.wav")
     audio_in = AudioIn(3100, wav_files)
-    gui = Gui(audio_in.dBgrid_main, 4, 2, {'c':'xxx', 'g':''}, None, None)
-    rx = Receiver(audio_in, [200, 3100], on_decode)
+    gui = Gui(audio_in.dBgrid_main, 4, 2, None, None, None)
+    rx = Receiver(audio_in, [200, 3100], on_decode, None)
     audio_in.start_wav_load()
     t_start = time.time()
     with open('baseline.pkl', 'rb') as f:
@@ -104,8 +105,8 @@ def live_test():
     from matplotlib.animation import FuncAnimation
     global t_start, gui
     audio_in = AudioIn(3100)
-    gui = Gui(audio_in.dBgrid_main, 4, 2, {'c':'xxx', 'g':''}, None, None)
-    rx = Receiver(audio_in, [200, 3100], on_decode)
+    gui = Gui(audio_in.dBgrid_main, 4, 2, config, None, None)
+    rx = Receiver(audio_in, [200, 3100], on_decode, None)
     t_start = time.time()
     input_device_idx = audio_in.find_device(["Cable", "Out"])
     audio_in.start_streamed_audio(input_device_idx)
@@ -133,7 +134,6 @@ def live_test():
     gui.plt.show()
 
 #live_test()
-
 batch_test(1,39)
 
 

pyft8-2.1.3/PyFT8/rigctrl.py

@@ -1,67 +0,0 @@
-"""
-    Modify this code to drive your particular rig.
-    
-    This example is the code I use to control my IC-7100.
-    The changes you will need to make are the serial port and baud rate,
-    the internal functions (_xxxxx) if your rig is not Icom,
-    and the commands to set ptt on and off and to set frequency.
-    
-"""
-    
-class Rig:
-    import serial, time
-
-    def __init__(self, verbose = False, port = 'COM4', baudrate = 9600):
-        self.serial_port = False
-        self.port = port
-        self.baudrate = baudrate
-        self.verbose = verbose
-
-    def vprint(self, text):
-        if self.verbose:
-            print(text)
-
-    def connect(self):
-        try:
-            self.serial_port = self.serial.Serial(port = self.port, baudrate = self.baudrate, timeout = 0.1)
-            if (self.serial_port):
-                self.vprint(f"Connected to {self.port}")
-        except IOError:
-            print(f"Couldn't connect to {self.port}")
-
-    def _decode_twoBytes(self, twoBytes):
-        if(len(twoBytes)==2):
-            n1 = int(twoBytes[0])
-            n2 = int(twoBytes[1])
-            return  n1*100 + (n2//16)*10 + n2 %16
-        
-    def _sendCAT(self, cmd):
-        self.connect()
-        try:
-            self.serial_port.reset_input_buffer()
-            msg = b'\xfe\xfe\x88\xe0' + cmd + b'\xfd'
-            self.vprint(f"[CAT] send {msg.hex(' ')}")
-            self.serial_port.write(msg)
-            resp = self.serial_port.read_until(b'\xfd')
-            resp = self.serial_port.read_until(b'\xfd')
-            self.vprint(f"[CAT] response {resp.hex(' ')}")
-            self.serial_port.close()
-            return resp
-        except:
-            print("couldn't send command")
-
-    def PyFT8_set_freq_Hz(self, freqHz):
-        s = f"{freqHz:09d}"
-        self.vprint(f"[CAT] SET frequency")
-        self.vprint(f"[CAT] {s}")
-        fBytes = b"".join(bytes([b]) for b in [16*int(s[7])+int(s[8]),16*int(s[5])+int(s[6]),16*int(s[3])+int(s[4]),16*int(s[1])+int(s[2]), int(s[0])])
-        self._sendCAT(b"".join([b'\x00', fBytes]))
-
-    def PyFT8_ptt_on(self, PTT_on = b'\x1c\x00\x01'):
-        self.vprint(f"[CAT] PTT On")
-        self._sendCAT(PTT_on)
-
-    def PyFT8_ptt_off(self, PTT_off = b'\x1c\x00\x00'):
-        self.vprint(f"[CAT] PTT Off")
-        self._sendCAT(PTT_off)
-

pyft8-2.1.3/PyFT8.egg-info/SOURCES.txt

@@ -1,61 +0,0 @@
-LICENSE
-MANIFEST.in
-README.md
-pyproject.toml
-PyFT8/__init__.py
-PyFT8/gui.py
-PyFT8/pyft8.py
-PyFT8/receiver.py
-PyFT8/rigctrl.py
-PyFT8/time_utils.py
-PyFT8/transmitter.py
-PyFT8.egg-info/PKG-INFO
-PyFT8.egg-info/SOURCES.txt
-PyFT8.egg-info/dependency_links.txt
-PyFT8.egg-info/entry_points.txt
-PyFT8.egg-info/requires.txt
-PyFT8.egg-info/top_level.txt
-tests/plot_baseline.py
-tests/spare.py
-tests/test_batch_and_live.py
-tests/data/ft8_lib_20m_busy/test_01.wav
-tests/data/ft8_lib_20m_busy/test_02.wav
-tests/data/ft8_lib_20m_busy/test_03.wav
-tests/data/ft8_lib_20m_busy/test_04.wav
-tests/data/ft8_lib_20m_busy/test_05.wav
-tests/data/ft8_lib_20m_busy/test_06.wav
-tests/data/ft8_lib_20m_busy/test_07.wav
-tests/data/ft8_lib_20m_busy/test_08.wav
-tests/data/ft8_lib_20m_busy/test_09.wav
-tests/data/ft8_lib_20m_busy/test_10.wav
-tests/data/ft8_lib_20m_busy/test_11.wav
-tests/data/ft8_lib_20m_busy/test_12.wav
-tests/data/ft8_lib_20m_busy/test_13.wav
-tests/data/ft8_lib_20m_busy/test_14.wav
-tests/data/ft8_lib_20m_busy/test_15.wav
-tests/data/ft8_lib_20m_busy/test_16.wav
-tests/data/ft8_lib_20m_busy/test_17.wav
-tests/data/ft8_lib_20m_busy/test_18.wav
-tests/data/ft8_lib_20m_busy/test_19.wav
-tests/data/ft8_lib_20m_busy/test_20.wav
-tests/data/ft8_lib_20m_busy/test_21.wav
-tests/data/ft8_lib_20m_busy/test_22.wav
-tests/data/ft8_lib_20m_busy/test_23.wav
-tests/data/ft8_lib_20m_busy/test_24.wav
-tests/data/ft8_lib_20m_busy/test_25.wav
-tests/data/ft8_lib_20m_busy/test_26.wav
-tests/data/ft8_lib_20m_busy/test_27.wav
-tests/data/ft8_lib_20m_busy/test_28.wav
-tests/data/ft8_lib_20m_busy/test_29.wav
-tests/data/ft8_lib_20m_busy/test_30.wav
-tests/data/ft8_lib_20m_busy/test_31.wav
-tests/data/ft8_lib_20m_busy/test_32.wav
-tests/data/ft8_lib_20m_busy/test_33.wav
-tests/data/ft8_lib_20m_busy/test_34.wav
-tests/data/ft8_lib_20m_busy/test_35.wav
-tests/data/ft8_lib_20m_busy/test_36.wav
-tests/data/ft8_lib_20m_busy/test_37.wav
-tests/data/ft8_lib_20m_busy/test_38.wav
-tests/dev/osd.py
-tests/dev/test_generate_wav.py
-tests/dev/test_loopback_performance.py