PyFT8 3.0.2__tar.gz → 3.1.0__tar.gz

{pyft8-3.0.2 → pyft8-3.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyFT8
-Version: 3.0.2
+Version: 3.1.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-3.0.2 → pyft8-3.1.0}/PyFT8/databases.py

@@ -71,12 +71,17 @@ class DiskDict:
                         pass
 
     def save(self):
-        with self.lock:
-            with open(self.file, "w") as f:
-                try:
-                    json.dump(self.data, f)
-                except:
-                    pass
+        if self.data != {}:
+            with self.lock:
+                with open(f"{self.file}_tmp", "w") as f:
+                    try:
+                        json.dump(self.data, f)
+                    except:
+                        return
+            try:
+                os.replace(f"{self.file}_tmp", self.file)
+            except:
+                return
 
 class History:
     def __init__(self, config_folder, my_call, home_square, pskr_refresh_mins, parse_all_file):
@@ -185,7 +190,7 @@ class History:
         self._update_new_alert(band, call, historic_data, new_alert_data)
         historic_data.setdefault(band, {})
         if call in historic_data[band]:
-            if t < historic_data[band][call]['t']:
+            if int(t) < int(historic_data[band][call]['t']):
                 return
         historic_data[band][call] = {'t': int(t),'rp':int(rp)}
 

{pyft8-3.0.2 → pyft8-3.1.0}/PyFT8/pyft8.py

@@ -9,10 +9,10 @@ from PyFT8.pskreporter import PSKR_upload
 from PyFT8.gui import Gui
 from PyFT8.transmitter import AudioOut
 from PyFT8.time_utils import global_time_utils
-from PyFT8.rigctrl import Rig_hamlib
+from PyFT8.rigctrl import Rig_hamlib, Rig_CAT
 from PyFT8.databases import History, ADIF
 
-VER = '3.0.2'
+VER = '3.1.0'
 
 MAX_TX_START_SECONDS = 2.5
 HEARING_PANEL_LIFE_MINS = 20
@@ -315,8 +315,7 @@ def cli():
     import time, sys
     parser = argparse.ArgumentParser(prog='PyFT8rx', description = 'Command Line FT8 decoder')
     parser.add_argument('-c', '--config_folder', help = 'Location of config folder e.g. C:/Users/drala/Documents/Projects/GitHub/G1OJS/PyFT8_cfg', default = './') 
-    parser.add_argument('-i', '--inputcard_keywords', help = 'Comma-separated keywords to identify the input sound device') 
-    #parser.add_argument('-v','--verbose',  action='store_true',  help = 'Verbose: include debugging output')    
+    parser.add_argument('-i', '--inputcard_keywords', help = 'Comma-separated keywords to identify the input sound device')  
     parser.add_argument('-o','--outputcard_keywords', help = 'Comma-separated keywords to identify the output sound device')
     parser.add_argument('-n','--no_gui',  action='store_true',  help = "Don't create a gui")
     parser.add_argument('-m','--transmit_message', nargs='?', help = 'Transmit a message')
@@ -348,6 +347,12 @@ def cli():
     if config.has_section('hamlib_rig'):
         console_print("Connecting to rig via Hamlib")
         rig = Rig_hamlib(config)
+    else:
+        console_print("Connecting to rig via CAT")
+        rig = Rig_CAT(config)
+
+    if config.has_section('launch'):
+        os.system(config['launch']['app'])
 
     if args.outputcard_keywords:
         outputcard_keywords = args.outputcard_keywords.replace(' ','').split(',')

{pyft8-3.0.2 → pyft8-3.1.0}/PyFT8/receiver.py

@@ -45,10 +45,10 @@ def unpack(bits):
     i3, bits74 = get_bitfields(bits,[3])
     if i3 == 0:
         n3, bits71 = get_bitfields(bits74,[3])
-        if n3 == 0:
-            return ('Free text','not','implemented')
+        if n3 <= 4:
+            return (['Free text', 'DXpedition','Field Day', 'Field Day', 'Telemetry'][n3],'not','implemented')
         else:
-            return (['DXpedition','Field Day', 'Field Day', 'Telemetry'][n3-1],'not','implemented')
+            return ('Unknown mode','not','implemented')
     elif i3 == 1 or i3 == 2: # 1 = Std Msg incl /R 2 = 'EU VHF' = Std Msg incl /P
         return unpack_std(bits74, i3)
     elif i3 == 3:

pyft8-3.1.0/PyFT8/rigctrl.py

@@ -0,0 +1,103 @@
+import serial, time, socket, subprocess, threading, psutil
+
+class Rig_CAT:
+    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)
+
+class Rig_hamlib:
+    def __init__(self, config):
+        com = config['hamlib_rig']['port']
+        s = config['hamlib_rig']['baud_rate']
+        rigctld = config['hamlib_rig']['rigctld']
+        rig = config['hamlib_rig']['model']
+        host, port ="localhost", 4532
+        if not any(['rigctld' in i.name() for i in psutil.process_iter()]):
+            cmd = f"{rigctld} -m {rig} -r {com} -s {s}"
+            threading.Thread(target = subprocess.run, args = (cmd,)).start()
+            time.sleep(0.5)
+        self.sock = socket.create_connection((host, port))
+        self.set_mode("PKTUSB")
+
+    def cmd(self, command):
+        if self.sock:
+            self.sock.sendall((command + "\n").encode())
+            return self.sock.recv(1024).decode()
+
+    def set_mode(self, mode):
+        self.cmd(f"M {mode} 0")
+
+    def set_freq_Hz(self, hz):
+        self.cmd(f"F {hz}")
+
+    def ptt_on(self):
+        self.cmd(f"T 1")
+
+    def ptt_off(self):
+        self.cmd(f"T 0")
+
+

{pyft8-3.0.2 → pyft8-3.1.0}/PyFT8.egg-info/PKG-INFO

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

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

pyft8-3.0.2/PyFT8/rigctrl.py

@@ -1,43 +0,0 @@
-import time, socket, subprocess, threading
-
-class Rig_hamlib:
-    def __init__(self, config):
-        com = config['hamlib_rig']['port']
-        s = config['hamlib_rig']['baud_rate']
-        rigctld = config['hamlib_rig']['rigctld']
-        rig = config['hamlib_rig']['model']
-        host, port ="localhost", 4532
-        cmd = f"{rigctld} -m {rig} -r {com} -s {s}"
-        self.sock = None
-        if not self.create_socket(host, port):
-            threading.Thread(target = subprocess.run, args = (cmd,)).start()
-            time.sleep(0.5)
-            if not self.create_socket(host, port):
-                print(f"Couldn't create socket for hamlib on {host}:{port}")
-        self.set_mode("PKTUSB")
-
-    def create_socket(self, host, port):
-        try:
-            self.sock = socket.create_connection((host, port))
-        except:
-            return False
-        return True
-
-    def cmd(self, command):
-        if self.sock:
-            self.sock.sendall((command + "\n").encode())
-            return self.sock.recv(1024).decode()
-
-    def set_mode(self, mode):
-        self.cmd(f"M {mode} 0")
-
-    def set_freq_Hz(self, hz):
-        self.cmd(f"F {hz}")
-
-    def ptt_on(self):
-        self.cmd(f"T 1")
-
-    def ptt_off(self):
-        self.cmd(f"T 0")
-
-