not1mm 24.4.26__py3-none-any.whl → 24.5.1__py3-none-any.whl

not1mm/lib/cwinterface.py

@@ -15,10 +15,17 @@ logger = logging.getLogger("cwinterface")
 
 
 class CW:
-    """An interface to cwdaemon and PyWinkeyerSerial"""
+    """
+
+    An interface to cwdaemon and PyWinkeyerSerial
+
+    servertype: int 1=cwdaemon, 2=pywinkeyer, 3=rigctld
+
+    """
 
     def __init__(self, servertype: int, host: str, port: int) -> None:
         self.servertype = servertype
+        self.cat = None
         self.host = host
         self.port = port
         self.speed = 20
@@ -42,35 +49,40 @@ class CW:
 
     def sendcw(self, texttosend):
         """sends cw to k1el"""
-        logger.info("sendcw: %s", texttosend)
+        logger.debug(f"{texttosend=} {self.servertype=}")
         if self.servertype == 2:
             self._sendcw_xmlrpc(texttosend)
         if self.servertype == 1:
             self._sendcw_udp(texttosend)
+        if self.servertype == 3 and self.cw is not None:
+            self._sendcwcat(texttosend)
 
     def _sendcw_xmlrpc(self, texttosend):
         """sends cw to xmlrpc"""
-        logger.info("xmlrpc: %s", texttosend)
+        logger.debug("xmlrpc: %s", texttosend)
         with ServerProxy(f"http://{self.host}:{self.port}") as proxy:
             try:
                 proxy.k1elsendstring(texttosend)
             except Error as exception:
-                logger.info(
+                logger.debug(
                     "http://%s:%s, xmlrpc error: %s", self.host, self.port, exception
                 )
             except ConnectionRefusedError:
-                logger.info(
+                logger.debug(
                     "http://%s:%s, xmlrpc Connection Refused", self.host, self.port
                 )
 
     def _sendcw_udp(self, texttosend):
         """send cw to udp port"""
-        logger.info("UDP: %s", texttosend)
+        logger.debug("UDP: %s", texttosend)
         server_address_port = (self.host, self.port)
         # bufferSize          = 1024
         udp_client_socket = socket.socket(family=socket.AF_INET, type=socket.SOCK_DGRAM)
         udp_client_socket.sendto(bytes(texttosend, "utf-8"), server_address_port)
 
+    def _sendcwcat(self, texttosend):
+        """..."""
+
     def set_winkeyer_speed(self, speed):
         """doc"""
         with ServerProxy(f"http://{self.host}:{self.port}") as proxy:

not1mm/lib/settings.py

@@ -58,6 +58,9 @@ class Settings(QtWidgets.QDialog):
         self.usepywinkeyer_radioButton.setChecked(
             bool(self.preference.get("cwtype") == 2)
         )
+        self.usecwviacat_radioButton.setChecked(
+            bool(self.preference.get("cwtype") == 3)
+        )
         self.connect_to_server.setChecked(bool(self.preference.get("useserver")))
         self.multicast_group.setText(str(self.preference.get("multicast_group", "")))
         self.multicast_port.setText(str(self.preference.get("multicast_port", "")))
@@ -131,8 +134,10 @@ class Settings(QtWidgets.QDialog):
         self.preference["cwtype"] = 0
         if self.usecwdaemon_radioButton.isChecked():
             self.preference["cwtype"] = 1
-        if self.usepywinkeyer_radioButton.isChecked():
+        elif self.usepywinkeyer_radioButton.isChecked():
             self.preference["cwtype"] = 2
+        elif self.usecwviacat_radioButton.isChecked():
+            self.preference["cwtype"] = 3
         self.preference["useserver"] = self.connect_to_server.isChecked()
         self.preference["multicast_group"] = self.multicast_group.text()
         self.preference["multicast_port"] = self.multicast_port.text()

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.4.26"
+__version__ = "24.5.1"

not1mm/logwindow.py

@@ -17,6 +17,7 @@ import math
 from PyQt6 import QtCore, QtGui, QtWidgets, uic
 from PyQt6.QtCore import QItemSelectionModel
 from PyQt6.QtWidgets import QDockWidget
+from PyQt6.QtGui import QColorConstants, QPalette, QColor
 
 import not1mm.fsutils as fsutils
 from not1mm.lib.database import DataBase
@@ -167,58 +168,44 @@ class LogWindow(QDockWidget):
 
         self.multicast_interface.send_as_json(cmd)
 
-    def set_dark_mode(self, dark: bool):
-        """testing"""
+    def set_dark_mode(self, dark: bool) -> None:
+        """Forces a darkmode palette."""
 
         if dark:
-            dark_palette = QtGui.QPalette()
-            dark_color = QtGui.QColor(56, 56, 56)
-            disabled_color = QtGui.QColor(127, 127, 127)
-            dark_palette.setColor(QtGui.QPalette.ColorRole.Window, dark_color)
-            dark_palette.setColor(
-                QtGui.QPalette.ColorRole.WindowText, QtGui.QColorConstants.White
-            )
-            dark_palette.setColor(
-                QtGui.QPalette.ColorRole.Base, QtGui.QColor(45, 45, 45)
-            )
-            dark_palette.setColor(QtGui.QPalette.ColorRole.AlternateBase, dark_color)
-            dark_palette.setColor(
-                QtGui.QPalette.ColorRole.Text, QtGui.QColorConstants.White
-            )
-            dark_palette.setColor(
-                QtGui.QPalette.ColorGroup.Disabled,
-                QtGui.QPalette.ColorRole.Text,
-                disabled_color,
-            )
-            dark_palette.setColor(QtGui.QPalette.ColorRole.Button, dark_color)
-            dark_palette.setColor(
-                QtGui.QPalette.ColorRole.ButtonText, QtGui.QColorConstants.White
-            )
-            dark_palette.setColor(
-                QtGui.QPalette.ColorGroup.Disabled,
-                QtGui.QPalette.ColorRole.ButtonText,
-                disabled_color,
-            )
-            dark_palette.setColor(
-                QtGui.QPalette.ColorRole.BrightText, QtGui.QColorConstants.Red
-            )
-            dark_palette.setColor(
-                QtGui.QPalette.ColorRole.Link, QtGui.QColor(42, 130, 218)
-            )
-            dark_palette.setColor(
-                QtGui.QPalette.ColorRole.Highlight, QtGui.QColor(42, 130, 218)
-            )
-            dark_palette.setColor(
-                QtGui.QPalette.ColorRole.HighlightedText, QtGui.QColorConstants.Black
-            )
-            dark_palette.setColor(
-                QtGui.QPalette.ColorGroup.Disabled,
-                QtGui.QPalette.ColorRole.HighlightedText,
-                disabled_color,
-            )
-
-            self.setPalette(dark_palette)
-            self.current_palette = dark_palette
+            darkPalette = QPalette()
+            darkColor = QColor(56, 56, 56)
+            disabledColor = QColor(127, 127, 127)
+            darkPalette.setColor(QPalette.ColorRole.Window, darkColor)
+            darkPalette.setColor(QPalette.ColorRole.WindowText, QColorConstants.White)
+            darkPalette.setColor(QPalette.ColorRole.Base, QColor(45, 45, 45))
+            darkPalette.setColor(QPalette.ColorRole.AlternateBase, darkColor)
+            darkPalette.setColor(QPalette.ColorRole.Text, QColorConstants.White)
+            darkPalette.setColor(QPalette.ColorRole.Button, darkColor)
+            darkPalette.setColor(QPalette.ColorRole.ButtonText, QColorConstants.White)
+            darkPalette.setColor(QPalette.ColorRole.BrightText, QColorConstants.Red)
+            darkPalette.setColor(QPalette.ColorRole.Link, QColor(42, 130, 218))
+            darkPalette.setColor(QPalette.ColorRole.Highlight, QColor(42, 130, 218))
+            darkPalette.setColor(
+                QPalette.ColorRole.HighlightedText, QColorConstants.Black
+            )
+            darkPalette.setColor(
+                QPalette.ColorGroup.Disabled,
+                QPalette.ColorRole.ButtonText,
+                disabledColor,
+            )
+            darkPalette.setColor(
+                QPalette.ColorGroup.Disabled,
+                QPalette.ColorRole.HighlightedText,
+                disabledColor,
+            )
+            darkPalette.setColor(
+                QPalette.ColorGroup.Disabled,
+                QPalette.ColorRole.Text,
+                disabledColor,
+            )
+
+            self.setPalette(darkPalette)
+            self.current_palette = darkPalette
         else:
             palette = self.style().standardPalette()
             self.setPalette(palette)

not1mm/radio.py

@@ -10,10 +10,13 @@ GPL V3
 # pylint: disable=logging-fstring-interpolation, line-too-long, no-name-in-module
 
 import datetime
+import logging
 
 from PyQt6.QtCore import QObject, pyqtSignal, QThread
 from not1mm.lib.cat_interface import CAT
 
+logger = logging.getLogger("cat_interface")
+
 
 class Radio(QObject):
     """Radio class"""
@@ -72,6 +75,12 @@ class Radio(QObject):
                 )
             QThread.msleep(100)
 
+    def sendcw(self, texttosend):
+        """..."""
+        logger.debug(f"Send CW: {texttosend}")
+        if self.cat:
+            self.cat.sendcw(texttosend)
+
     def set_vfo(self, vfo):
         if self.cat:
             self.cat.set_vfo(vfo)

not1mm/vfo.py

@@ -14,10 +14,10 @@ import platform
 from json import loads, JSONDecodeError
 
 import serial
-from PyQt6 import QtCore, QtGui, QtWidgets, uic
+from PyQt6 import QtCore, QtWidgets, uic
 from PyQt6.QtCore import QTimer
 from PyQt6.QtWidgets import QDockWidget
-from PyQt6.QtGui import QColorConstants
+from PyQt6.QtGui import QColorConstants, QPalette, QColor
 
 import not1mm.fsutils as fsutils
 from not1mm.lib.cat_interface import CAT
@@ -61,57 +61,45 @@ class VfoWindow(QDockWidget):
         self.poll_rig_timer.timeout.connect(self.poll_radio)
         self.poll_rig_timer.start(500)
 
-    def setDarkMode(self, dark: bool):
-        """testing"""
+    def setDarkMode(self, dark: bool) -> None:
+        """Forces a darkmode palette."""
 
         if dark:
-            darkPalette = QtGui.QPalette()
-            darkColor = QtGui.QColor(56, 56, 56)
-            self.text_color = QColorConstants.White
-            disabledColor = QtGui.QColor(127, 127, 127)
-            darkPalette.setColor(QtGui.QPalette.ColorRole.Window, darkColor)
-            darkPalette.setColor(
-                QtGui.QPalette.ColorRole.WindowText, QColorConstants.White
-            )
+            darkPalette = QPalette()
+            darkColor = QColor(56, 56, 56)
+            disabledColor = QColor(127, 127, 127)
+            darkPalette.setColor(QPalette.ColorRole.Window, darkColor)
+            darkPalette.setColor(QPalette.ColorRole.WindowText, QColorConstants.White)
+            darkPalette.setColor(QPalette.ColorRole.Base, QColor(45, 45, 45))
+            darkPalette.setColor(QPalette.ColorRole.AlternateBase, darkColor)
+            darkPalette.setColor(QPalette.ColorRole.Text, QColorConstants.White)
+            darkPalette.setColor(QPalette.ColorRole.Button, darkColor)
+            darkPalette.setColor(QPalette.ColorRole.ButtonText, QColorConstants.White)
+            darkPalette.setColor(QPalette.ColorRole.BrightText, QColorConstants.Red)
+            darkPalette.setColor(QPalette.ColorRole.Link, QColor(42, 130, 218))
+            darkPalette.setColor(QPalette.ColorRole.Highlight, QColor(42, 130, 218))
             darkPalette.setColor(
-                QtGui.QPalette.ColorRole.Base, QtGui.QColor(45, 45, 45)
+                QPalette.ColorRole.HighlightedText, QColorConstants.Black
             )
-            darkPalette.setColor(QtGui.QPalette.ColorRole.AlternateBase, darkColor)
-            darkPalette.setColor(QtGui.QPalette.ColorRole.Text, QColorConstants.White)
             darkPalette.setColor(
-                QtGui.QPalette.ColorGroup.Disabled,
-                QtGui.QPalette.ColorRole.Text,
+                QPalette.ColorGroup.Disabled,
+                QPalette.ColorRole.ButtonText,
                 disabledColor,
             )
-            darkPalette.setColor(QtGui.QPalette.ColorRole.Button, darkColor)
-            darkPalette.setColor(
-                QtGui.QPalette.ColorRole.ButtonText, QColorConstants.White
-            )
             darkPalette.setColor(
-                QtGui.QPalette.ColorGroup.Disabled,
-                QtGui.QPalette.ColorRole.ButtonText,
+                QPalette.ColorGroup.Disabled,
+                QPalette.ColorRole.HighlightedText,
                 disabledColor,
             )
             darkPalette.setColor(
-                QtGui.QPalette.ColorRole.BrightText, QColorConstants.Red
-            )
-            darkPalette.setColor(
-                QtGui.QPalette.ColorRole.Link, QtGui.QColor(42, 130, 218)
-            )
-            darkPalette.setColor(
-                QtGui.QPalette.ColorRole.Highlight, QtGui.QColor(42, 130, 218)
-            )
-            darkPalette.setColor(
-                QtGui.QPalette.ColorRole.HighlightedText, QColorConstants.Black
-            )
-            darkPalette.setColor(
-                QtGui.QPalette.ColorGroup.Disabled,
-                QtGui.QPalette.ColorRole.HighlightedText,
+                QPalette.ColorGroup.Disabled,
+                QPalette.ColorRole.Text,
                 disabledColor,
             )
 
-            self.setPalette(darkPalette)
             self.current_palette = darkPalette
+            self.setPalette(darkPalette)
+            self.text_color = QColorConstants.White
         else:
             palette = self.style().standardPalette()
             self.current_palette = palette

not1mm/voice_keying.py

@@ -0,0 +1,100 @@
+#!/usr/bin/env python3
+
+"""
+Not1MM Contest logger
+Email: michael.bridak@gmail.com
+GPL V3
+"""
+
+# pylint: disable=unused-import, c-extension-no-member, no-member, invalid-name, too-many-lines
+# pylint: disable=logging-fstring-interpolation, line-too-long, no-name-in-module
+
+import logging
+from pathlib import Path
+
+try:
+    import sounddevice as sd
+except OSError as exception:
+    print(exception)
+    print("portaudio is not installed")
+    sd = None
+import soundfile as sf
+
+from PyQt6.QtCore import QObject, pyqtSignal, QThread
+
+logger = logging.getLogger("cat_interface")
+
+
+class Voice(QObject):
+    """Voice class"""
+
+    ptt_on = pyqtSignal()
+    ptt_off = pyqtSignal()
+    data_path = None
+    current_op = None
+    sounddevice = None
+    voicings = []
+
+    def __init__(self) -> None:
+        super().__init__()
+        """setup interface"""
+
+    def run(self):
+        while True:
+            keyed = False
+            while len(self.voicings):
+                if not keyed:
+                    self.ptt_on.emit()
+                    keyed = True
+                filename = self.voicings.pop(0)
+                if Path(filename).is_file():
+                    logger.debug("Voicing: %s", filename)
+                    data, _fs = sf.read(filename, dtype="float32")
+                    # self.ptt_on.emit()
+                    try:
+                        sd.default.device = self.sounddevice
+                        sd.default.samplerate = 44100.0
+                        sd.play(data, blocking=True)
+                        # _status = sd.wait()
+                        # https://snyk.io/advisor/python/sounddevice/functions/sounddevice.PortAudioError
+                    except sd.PortAudioError as err:
+                        logger.warning("%s", f"{err}")
+            if keyed:
+                self.ptt_off.emit()
+            QThread.msleep(100)
+
+    def voice_string(self, the_string: str) -> None:
+        """
+        voices string using nato phonetics.
+
+        Parameters
+        ----------
+        the_string : str
+        String to voicify.
+
+        Returns
+        -------
+        None
+        """
+
+        logger.debug("Voicing: %s", the_string)
+        if sd is None:
+            logger.warning("Sounddevice/portaudio not installed.")
+            return
+        # fsutils.USER_DATA_PATH
+        # self.current_op
+        op_path = self.data_path / self.current_op
+        if "[" in the_string:
+            sub_string = the_string.strip("[]").lower()
+            filename = f"{str(op_path)}/{sub_string}.wav"
+            if Path(filename).is_file():
+                self.voicings.append(filename)
+            return
+        for letter in the_string.lower():
+            if letter in "abcdefghijklmnopqrstuvwxyz 1234567890":
+                if letter == " ":
+                    letter = "space"
+                filename = f"{str(op_path)}/{letter}.wav"
+                if Path(filename).is_file():
+                    logger.debug("Voicing: %s", filename)
+                    self.voicings.append(filename)

{not1mm-24.4.26.dist-info → not1mm-24.5.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.4.26
+Version: 24.5.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -31,6 +31,7 @@ Requires-Dist: appdata
 Requires-Dist: Levenshtein
 
 # Not1MM
+<!-- markdownlint-disable MD001 MD033 -->
 
  ![logo](https://github.com/mbridak/not1mm/raw/master/not1mm/data/k6gte.not1mm.svg)
 
@@ -55,16 +56,16 @@ Requires-Dist: Levenshtein
     - [Common installation recipes for Ubuntu and Fedora](#common-installation-recipes-for-ubuntu-and-fedora)
       - [Ubuntu 22.04 LTS](#ubuntu-2204-lts)
       - [Ubuntu 23.04](#ubuntu-2304)
-      - [Ubuntu 24.04](#ubuntu-2404)
+      - [Ubuntu 24.04 LTS](#ubuntu-2404-lts)
       - [Fedora 38 \& 39](#fedora-38--39)
       - [Fedora 40](#fedora-40)
     - [Python, PyPI, pip and pipx](#python-pypi-pip-and-pipx)
       - [Bootstrapping pipx](#bootstrapping-pipx)
       - [Installing with pipx](#installing-with-pipx)
+    - [Installing from GitHub source](#installing-from-github-source)
   - [After the install](#after-the-install)
     - [You may or may not get a warning message like](#you-may-or-may-not-get-a-warning-message-like)
     - [Or this fan favorite](#or-this-fan-favorite)
-    - [Installing from GitHub source](#installing-from-github-source)
   - [Various data file locations](#various-data-file-locations)
     - [Data](#data)
     - [Config](#config)
@@ -179,22 +180,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
-- [24-4-25-1] Reduce delta time to poll. Reorder poll_radio callback. Remove unused CAT lib from main.
-- [24-4-25] Limited loop in radio.py, reducing clock cycles used. Moved Log window to the top of the logger.
-- [24-4-24] Placed CAT control into a thread so disconnecting the radio wouldn't lock up the interface.
-- [24-4-17] Trap OSError if no sound device. Stop fsutils/appdata from creating useless .not1mm and .username folder structures on Linux platforms.
-- [24-4-15] checkwindow.py Tighter results. Changed the call selection to use a single click.
-- [24-4-9-4] Check for portaudio instead of crash boom. Removed empty dockwidget. Tested on Plasma 6.
-- [24-4-9-3] Ugh. It's not a real day unless you forget to test.
-- [24-4-9-2] Put back the floatable dock widgets, 'cause Wayland strikes again.
-- [24-4-9-1] Removed DockWidgetFloatable from the dock widgets since my wee brain can't figure out how to add a dragable window frame to them once they are floating. Added a minimum size for the VFO LCD digits. Defaulted bandmap window to the right.
-- [24-4-9] Fixed Checkwindow not showing calls from logged contacts.
-- [24-4-7] Added FT8Watcher class to prep for FT8 support.
-- [24-4-4-1] Made docking widgets open state persistent.
-- [24-4-4] Added per-contest echange hint when adding new contest.
-- [24-4-2] Migrated to PyQt6. I'm sure there are broken things.
-- [24-4-1-2] Added color text indicators to the Check Partial window. Poached the code from @kyleboyle. Thanks! Fixed the Log, VFO and Check Partial windows to be actual docking widgets. Refocus call field after double clicking on item in the check partial window.
-- [24-4-1] Removed some un-needed loops and widgets from the check window. Fixed docking to the left side.
+- [24-5-1] Moved the voice keying into it's own thread.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 
@@ -217,6 +203,10 @@ through your distribution's package manager before continuing.
 I've taken the time to install some common Linux distributions into a VM and
 noted the minimum steps needed to install not1mm.
 
+<details>
+
+<summary><b>Ubuntu 22.04 LTS, 23.04 and 24.04 LTS</b></summary>
+
 #### Ubuntu 22.04 LTS
 
 ```bash
@@ -236,7 +226,7 @@ pipx install not1mm
 pipx ensurepath
 ```
 
-#### Ubuntu 24.04
+#### Ubuntu 24.04 LTS
 
 ```bash
 sudo apt update
@@ -246,6 +236,12 @@ pip install --break-system-packages not1mm
 source .profile
 ```
 
+</details>
+
+<details>
+
+<summary><b>Fedora 38, 39 and 40</b></summary>
+
 #### Fedora 38 & 39
 
 ```bash
@@ -262,6 +258,9 @@ sudo dnf install python3-pip python3-pyqt6 portaudio
 pip install not1mm
 ```
 
+</details>
+<br>
+
 You can now open a new terminal and type not1mm. On it's first run, it may or
 may not install a lovely non AI generated icon, which you can later click on to
 launch the application.
@@ -313,6 +312,40 @@ If you need to later update not1mm, you can do so with:
 pipx upgrade not1mm
 ```
 
+<details>
+<summary><b>Installing from GitHub source.</b></summary>
+
+### Installing from GitHub source
+
+Since this is packaged for PyPI, if you want to work on your own source branch,
+after cloning from github you would:
+
+```bash
+pip install --upgrade pip
+pip install setuptools
+pip install build
+source rebuild.sh
+```
+
+from the root directory. This installs a build chain and a local editable copy
+of not1mm.
+
+There's two ways to launch the program from the local editable copy.
+
+You can either be in the root of the source directory and type:
+
+```bash
+python not1mm
+```
+
+or be in some other directory and just type:
+
+```bash
+not1mm
+```
+
+</details>
+
 ## After the install
 
 You can now open a new terminal and type `not1mm`. On it's first run, it may or
@@ -344,35 +377,6 @@ For a more permanent solution you can place the line
 `export QT_QPA_PLATFORM=wayland` in your home directories .bashrc file. Then
 after logging out and back in you should be able to launch it normally.
 
-### Installing from GitHub source
-
-Since this is packaged for PyPI, if you want to work on your own source branch,
-after cloning from github you would:
-
-```bash
-pip install --upgrade pip
-pip install setuptools
-pip install build
-source rebuild.sh
-```
-
-from the root directory. This installs a build chain and a local editable copy
-of not1mm.
-
-There's two ways to launch the program from the local editable copy.
-
-You can either be in the root of the source directory and type:
-
-```bash
-python not1mm
-```
-
-or be in some other directory and just type:
-
-```bash
-not1mm
-```
-
 ## Various data file locations
 
 ### Data
@@ -482,7 +486,10 @@ onscreen icon for CAT status. Green good, Red bad, Grey neither.
 
 Under the `CW` TAB, There are three options. `cwdaemon`, which normally uses IP
 `127.0.0.1` and port `6789`. `pywinkeyer` which normally uses IP `127.0.0.1` and
-port `8000`. Or `None`, if you want to Morse it like it's 1899.
+`CAT` which if your radio supports it, sends Morse characters via rigctld. As far
+as I can tell rigctld does not support setting the radios internal keyer speed. So
+the CW speed control widget will not be functional and you'd need to control the
+keyer speed thru the radios interface.
 
 ### Cluster