not1mm 24.4.25.1__py3-none-any.whl → 24.4.30__py3-none-any.whl

not1mm/__main__.py

@@ -38,7 +38,7 @@ except OSError as exception:
 import soundfile as sf
 from PyQt6 import QtCore, QtGui, QtWidgets, uic
 from PyQt6.QtCore import QDir, Qt, QThread
-from PyQt6.QtGui import QFontDatabase, QColorConstants
+from PyQt6.QtGui import QFontDatabase, QColorConstants, QPalette, QColor
 from PyQt6.QtWidgets import QFileDialog
 
 from not1mm.lib.about import About
@@ -150,10 +150,11 @@ class MainWindow(QtWidgets.QMainWindow):
         "cluster_port": 7373,
         "cluster_filter": "Set DX Filter SpotterCont=NA",
         "cluster_mode": "OPEN",
-        "logwindow": True,
-        "bandmapwindow": True,
-        "checkwindow": True,
+        "logwindow": False,
+        "bandmapwindow": False,
+        "checkwindow": False,
         "vfowindow": False,
+        "darkmode": True,
     }
     appstarted = False
     contact = {}
@@ -566,76 +567,50 @@ class MainWindow(QtWidgets.QMainWindow):
         """
         print(f"{result=}")
 
-    def setDarkMode(self, dark):
-        """testing"""
+    def setDarkMode(self, setdarkmode=False) -> None:
+        """Forces a darkmode palette."""
 
-        logger.debug(f"Dark mode set to: {dark}")
+        logger.debug(f"Dark mode set to: {setdarkmode}")
 
         cmd = {}
         cmd["cmd"] = "DARKMODE"
-        cmd["state"] = dark
+        cmd["state"] = setdarkmode
         cmd["station"] = platform.node()
         self.multicast_interface.send_as_json(cmd)
 
-        if dark:
-            darkPalette = QtGui.QPalette()
-            darkColor = QtGui.QColor(56, 56, 56)
-            disabledColor = QtGui.QColor(127, 127, 127)
-            darkPalette.setColor(QtGui.QPalette.ColorRole.Window, darkColor)
+        if setdarkmode:
+            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.WindowText, QColorConstants.White
+                QPalette.ColorRole.HighlightedText, QColorConstants.Black
             )
             darkPalette.setColor(
-                QtGui.QPalette.ColorRole.Base, QtGui.QColor(45, 45, 45)
-            )
-            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,
             )
-            dark_button_style = (
-                "QPushButton {"
-                "background-color: rgb(56,56,56);"
-                "color: white;"
-                "border-style: outset;"
-                "border-width: 2px;"
-                "border-radius: 5px;"
-                "border-color: rgb(45,45,45);"
-                "padding: 6px;"
-                "}"
-                "QPushButton:pressed {"
-                "background-color: rgb(127, 127, 127);"
-                "border-style: inset;"
-                "}"
-            )
+
             self.current_palette = darkPalette
             self.setPalette(darkPalette)
             self.text_color = QColorConstants.White
@@ -650,18 +625,6 @@ class MainWindow(QtWidgets.QMainWindow):
             self.other_1.setPalette(darkPalette)
             self.other_2.setPalette(darkPalette)
             self.cw_entry.setPalette(darkPalette)
-            self.F1.setStyleSheet(dark_button_style)
-            self.F2.setStyleSheet(dark_button_style)
-            self.F3.setStyleSheet(dark_button_style)
-            self.F4.setStyleSheet(dark_button_style)
-            self.F5.setStyleSheet(dark_button_style)
-            self.F6.setStyleSheet(dark_button_style)
-            self.F7.setStyleSheet(dark_button_style)
-            self.F8.setStyleSheet(dark_button_style)
-            self.F9.setStyleSheet(dark_button_style)
-            self.F10.setStyleSheet(dark_button_style)
-            self.F11.setStyleSheet(dark_button_style)
-            self.F12.setStyleSheet(dark_button_style)
         else:
             palette = self.style().standardPalette()
             self.current_palette = palette
@@ -678,33 +641,6 @@ class MainWindow(QtWidgets.QMainWindow):
             self.other_2.setPalette(palette)
             self.cw_entry.setPalette(palette)
             self.text_color = QColorConstants.Black
-            light_button_style = (
-                "QPushButton {"
-                "background-color: rgb(245,245,245);"
-                "color: rgb(52,52,52);"
-                "border-style: outset;"
-                "border-width: 2px;"
-                "border-radius: 5px;"
-                "border-color: rgb(150,150,150);"
-                "padding: 6px;"
-                "}"
-                "QPushButton:pressed {"
-                "background-color: rgb(127, 127, 127);"
-                "border-style: inset;"
-                "}"
-            )
-            self.F1.setStyleSheet(light_button_style)
-            self.F2.setStyleSheet(light_button_style)
-            self.F3.setStyleSheet(light_button_style)
-            self.F4.setStyleSheet(light_button_style)
-            self.F5.setStyleSheet(light_button_style)
-            self.F6.setStyleSheet(light_button_style)
-            self.F7.setStyleSheet(light_button_style)
-            self.F8.setStyleSheet(light_button_style)
-            self.F9.setStyleSheet(light_button_style)
-            self.F10.setStyleSheet(light_button_style)
-            self.F11.setStyleSheet(light_button_style)
-            self.F12.setStyleSheet(light_button_style)
 
     def set_radio_icon(self, state: int) -> None:
         """
@@ -769,7 +705,9 @@ class MainWindow(QtWidgets.QMainWindow):
             # self.send_backspace()
             self.oldtext = newtext
             return
-        if self.cw is not None:
+        if self.pref.get("cwtype") == 3 and self.rig_control is not None:
+            self.rig_control.sendcw(newtext[len(self.oldtext) :])
+        elif self.cw is not None:
             self.cw.sendcw(newtext[len(self.oldtext) :])
         self.oldtext = newtext
 
@@ -2374,6 +2312,9 @@ class MainWindow(QtWidgets.QMainWindow):
             self.voice_string(self.process_macro(function_key.toolTip()))
             return
         if self.cw:
+            if self.pref.get("cwtype") == 3 and self.rig_control is not None:
+                self.rig_control.sendcw(self.process_macro(function_key.toolTip()))
+                return
             self.cw.sendcw(self.process_macro(function_key.toolTip()))
 
     def run_sp_buttons_clicked(self) -> None:

not1mm/bandmap.py

@@ -17,7 +17,7 @@ from decimal import Decimal
 from json import loads
 
 from PyQt6 import QtCore, QtGui, QtWidgets, uic, QtNetwork
-from PyQt6.QtGui import QColorConstants
+from PyQt6.QtGui import QColorConstants, QPalette, QColor
 from PyQt6.QtWidgets import QDockWidget
 
 import not1mm.fsutils as fsutils
@@ -319,7 +319,7 @@ class BandMapWindow(QDockWidget):
     bandwidth_mark = []
     worked_list = {}
     multicast_interface = None
-    text_color = QtGui.QColor(45, 45, 45)
+    text_color = QColor(45, 45, 45)
 
     def __init__(self):
         super().__init__()
@@ -366,101 +366,50 @@ class BandMapWindow(QDockWidget):
                 return loads(file_descriptor.read())
 
     def setDarkMode(self, setdarkmode=False):
-        """testing"""
-
+        """Set dark mode"""
         if setdarkmode:
-            darkPalette = QtGui.QPalette()
-            darkColor = QtGui.QColor(56, 56, 56)
+            darkPalette = QPalette()
+            darkColor = 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
-            )
+            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.callsignField.setPalette(darkPalette)
             self.update()
-            dark_button_style = (
-                "QPushButton {"
-                "background-color: rgb(56,56,56);"
-                "color: white;"
-                "border-style: outset;"
-                "border-width: 2px;"
-                "border-radius: 5px;"
-                "border-color: rgb(45,45,45);"
-                "padding: 6px;"
-                "}"
-                "QPushButton:pressed {"
-                "background-color: rgb(127, 127, 127);"
-                "border-style: inset;"
-                "}"
-            )
-            self.connectButton.setStyleSheet(dark_button_style)
-            self.clearButton.setStyleSheet(dark_button_style)
-            self.zoominButton.setStyleSheet(dark_button_style)
-            self.zoomoutButton.setStyleSheet(dark_button_style)
         else:
             palette = self.style().standardPalette()
             self.setPalette(palette)
             self.callsignField.setPalette(palette)
             self.text_color = QColorConstants.Black
             self.update()
-            light_button_style = (
-                "QPushButton {"
-                "background-color: rgb(245,245,245);"
-                "color: rgb(52,52,52);"
-                "border-style: outset;"
-                "border-width: 2px;"
-                "border-radius: 5px;"
-                "border-color: rgb(150,150,150);"
-                "padding: 6px;"
-                "}"
-                "QPushButton:pressed {"
-                "background-color: rgb(127, 127, 127);"
-                "border-style: inset;"
-                "}"
-            )
-            self.connectButton.setStyleSheet(light_button_style)
-            self.clearButton.setStyleSheet(light_button_style)
-            self.zoominButton.setStyleSheet(light_button_style)
-            self.zoomoutButton.setStyleSheet(light_button_style)
 
     def connect(self):
         """Connect to the cluster."""
@@ -686,11 +635,9 @@ class BandMapWindow(QDockWidget):
             self.clear_freq_mark(self.bandwidth_mark)
             self.clear_freq_mark(self.rxMark)
             self.draw_bandwidth(
-                self.rx_freq, step, QtGui.QColor(30, 30, 180, 180), self.bandwidth_mark
-            )
-            self.drawfreqmark(
-                self.rx_freq, step, QtGui.QColor(30, 180, 30, 180), self.rxMark
+                self.rx_freq, step, QColor(30, 30, 180, 180), self.bandwidth_mark
             )
+            self.drawfreqmark(self.rx_freq, step, QColor(30, 180, 30, 180), self.rxMark)
 
     def Freq2ScenePos(self, freq: float):
         """doc"""
@@ -751,7 +698,7 @@ class BandMapWindow(QDockWidget):
         if freq < self.currentBand.start or freq > self.currentBand.end:
             return
         if freq and self.bandwidth:
-            # color = QtGui.QColor(30, 30, 180)
+            # color = QColor(30, 30, 180)
             bw_start = Decimal(str(freq)) - (
                 (Decimal(str(self.bandwidth)) / 2) / 1000000
             )
@@ -786,11 +733,11 @@ class BandMapWindow(QDockWidget):
             for items in result:
                 pen_color = self.text_color
                 if items.get("comment") == "MARKED":
-                    pen_color = QtGui.QColor(47, 47, 255)
+                    pen_color = QColor(47, 47, 255)
                 if items.get("callsign") in self.worked_list:
                     call_bandlist = self.worked_list.get(items.get("callsign"))
                     if self.currentBand.altname in call_bandlist:
-                        pen_color = QtGui.QColor(255, 47, 47)
+                        pen_color = QColor(255, 47, 47)
                 freq_y = (
                     (items.get("freq") - self.currentBand.start) / step
                 ) * PIXELSPERSTEP

not1mm/checkwindow.py

@@ -12,9 +12,9 @@ import queue
 from json import loads
 import Levenshtein
 
-from PyQt6 import QtGui, uic
+from PyQt6 import uic
 from PyQt6.QtWidgets import QLabel, QVBoxLayout, QWidget, QDockWidget
-from PyQt6.QtGui import QMouseEvent, QColorConstants
+from PyQt6.QtGui import QMouseEvent, QColorConstants, QPalette, QColor
 
 import not1mm.fsutils as fsutils
 from not1mm.lib.database import DataBase
@@ -70,51 +70,39 @@ class CheckWindow(QDockWidget):
             cmd["call"] = item
             self.multicast_interface.send_as_json(cmd)
 
-    def setDarkMode(self, dark: bool):
+    def setDarkMode(self, dark: bool) -> None:
         """Forces a darkmode palette."""
 
         if dark:
-            darkPalette = QtGui.QPalette()
-            darkColor = QtGui.QColor(56, 56, 56)
-            disabledColor = QtGui.QColor(127, 127, 127)
-            darkPalette.setColor(QtGui.QPalette.ColorRole.Window, darkColor)
+            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.WindowText, QColorConstants.White
+                QPalette.ColorRole.HighlightedText, QColorConstants.Black
             )
             darkPalette.setColor(
-                QtGui.QPalette.ColorRole.Base, QtGui.QColor(45, 45, 45)
-            )
-            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,
             )
 

not1mm/data/configuration.ui

@@ -726,7 +726,7 @@
         </widget>
        </item>
        <item row="2" column="3" alignment="Qt::AlignHCenter">
-        <widget class="QRadioButton" name="radioButton_5">
+        <widget class="QRadioButton" name="usecwviacat_radioButton">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -735,13 +735,13 @@
           </font>
          </property>
          <property name="accessibleName">
-          <string>none</string>
+          <string>CAT</string>
          </property>
          <property name="accessibleDescription">
-          <string>none</string>
+          <string>use cat for c w</string>
          </property>
          <property name="text">
-          <string>None</string>
+          <string>CAT</string>
          </property>
         </widget>
        </item>
@@ -1604,7 +1604,7 @@
   <tabstop>rigcontrolport_field</tabstop>
   <tabstop>cwport_field</tabstop>
   <tabstop>usepywinkeyer_radioButton</tabstop>
-  <tabstop>radioButton_5</tabstop>
+  <tabstop>usecwviacat_radioButton</tabstop>
   <tabstop>cwip_field</tabstop>
   <tabstop>usecwdaemon_radioButton</tabstop>
   <tabstop>connect_to_server</tabstop>

not1mm/lib/cat_interface.py

@@ -90,6 +90,34 @@ class CAT:
         if self.interface == "rigctld":
             self.__initialize_rigctrld()
 
+    def sendcw(self, texttosend):
+        """..."""
+        logger.debug(f"{texttosend=} {self.interface=}")
+        if self.interface == "flrig":
+            ...
+            return
+        if self.interface == "rigctld":
+            self.sendcwrigctl(texttosend)
+
+    def sendcwrigctl(self, texttosend):
+        """..."""
+        if self.rigctrlsocket:
+            try:
+                self.online = True
+                self.rigctrlsocket.send(bytes(f"b{texttosend}\n", "utf-8"))
+                _ = self.rigctrlsocket.recv(1024).decode().strip()
+                return True
+            except socket.error as exception:
+                self.online = False
+                logger.debug("setvfo_rigctld: %s", f"{exception}")
+                self.rigctrlsocket = None
+                return False
+        self.__initialize_rigctrld()
+        return False
+
+    def sendcwxmlrpc(self, texttosend):
+        """..."""
+
     def get_vfo(self) -> str:
         """Poll the radio for current vfo using the interface"""
         vfo = ""

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.25.1"
+__version__ = "24.4.30"

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-24.4.25.1.dist-info → not1mm-24.4.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.4.25.1
+Version: 24.4.30
 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,14 +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 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)
@@ -177,6 +180,8 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-4-30] Allowsending CW via rigctld if your radio supports it.
+- [24-4-27] Cleaned up dark mode code.
 - [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.
@@ -215,6 +220,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
@@ -234,6 +243,22 @@ pipx install not1mm
 pipx ensurepath
 ```
 
+#### Ubuntu 24.04 LTS
+
+```bash
+sudo apt update
+sudo apt upgrade
+sudo apt install -y libportaudio2 pyqt6-dev-tools python3-pip
+pip install --break-system-packages not1mm
+source .profile
+```
+
+</details>
+
+<details>
+
+<summary><b>Fedora 38, 39 and 40</b></summary>
+
 #### Fedora 38 & 39
 
 ```bash
@@ -242,6 +267,17 @@ sudo dnf install python3-pip portaudio
 pip install not1mm
 ```
 
+#### Fedora 40
+
+```bash
+sudo dnf upgrade --refresh
+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.
@@ -293,6 +329,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
@@ -324,35 +394,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
@@ -462,7 +503,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
 

{not1mm-24.4.25.1.dist-info → not1mm-24.4.30.dist-info}/RECORD

@@ -1,11 +1,11 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=TPnGFy4UQkvMBpjW1xyK1iPUNrj16nIAA6SS6IP5yF0,123515
-not1mm/bandmap.py,sha256=3kmRYItrBqpjudFb2NnkGNJpDWkwOpGPQbKwHmYnQ-o,34021
-not1mm/checkwindow.py,sha256=9ueFgYLM4RFmroMJBXXn98XWO9ZJ-Dop6MwZUXRNFF0,10577
+not1mm/__main__.py,sha256=B2BSFagNTFJ6jWChOEj41TAtsWZ4rXo59sDiKp4rie0,121264
+not1mm/bandmap.py,sha256=DyAIgEfV_Ceg_BuBwvV3a2aRHTG3M63ZokoULS0wTdk,32071
+not1mm/checkwindow.py,sha256=PHQhyN-25ZugbxKKjSxs0wqD80GTHYdIs1IIBjCGVc8,10278
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
-not1mm/logwindow.py,sha256=UcO8mgs_E7ier2gg_1ESTaRxABEvcpCwKmSibm7hl74,44603
-not1mm/radio.py,sha256=im14hFLKu0NreymcYoeSE3gyFHoXygP8azY0nsfBLP0,2876
-not1mm/vfo.py,sha256=pRRj0XTbeTU9noo3nC1dbg26VYj6gHEw_srUDbyYqC0,12169
+not1mm/logwindow.py,sha256=MpEVvnuQh9P5Z8kK2MozAaMCNSx1C4isAEYCETI7SjI,44285
+not1mm/radio.py,sha256=R_RaxdiqcMzIQN2za7qBsStrT5X0AwZcz8xtiCwsYdE,3097
+not1mm/vfo.py,sha256=7CMI0h9jCEhaonOIvN_7wSiEnsSSxsB1IvOYC9bML6w,11889
 not1mm/data/JetBrainsMono-Regular.ttf,sha256=UOHctAKY_PzCGh7zy-6f6egnCcSK0wzmF0csBqO9lDY,203952
 not1mm/data/MASTER.SCP,sha256=1vQRvEZ865brfmmajp-Lj-hgWejVGI992q8o971bUV8,366478
 not1mm/data/about.ui,sha256=7TqvtXFFm0Rmcu0bmLupwpO1CsK8MekfZ09_xn6kZrQ,2067
@@ -13,7 +13,7 @@ not1mm/data/alpha bravo charlie delta.txt,sha256=d5QMmSWEUAe4Rj1XbNjTPLa_5Be4Se6
 not1mm/data/bandmap.ui,sha256=NqVoAGyuf_Rsts_FnL0pYEtE08DJb6qm4KAQ_T01bM8,7125
 not1mm/data/check.png,sha256=UvFOLr8V-79qnjW8wUaGItXk_OSP8m8hqPevs8NDlFY,387
 not1mm/data/checkwindow.ui,sha256=aILeaBJB5Xium-JIFiJ39VEoGH6TIpK0lHVa2RcfeaQ,4614
-not1mm/data/configuration.ui,sha256=DJZxA4zZPb4sTdVn17j1fwaTw-5lJCNQ6PspQrsdMe4,51643
+not1mm/data/configuration.ui,sha256=fRdyDusgQdUl76XC__RHwpkOlOERmnGFQ3DMCgkxh8U,51672
 not1mm/data/contests.sql,sha256=4hmJCDvrbxnA_Y5S4T5o52TZieeFk6QUwFerwlFePNA,89307
 not1mm/data/cty.json,sha256=xnLK-kNB5phKPef7R7PJZcSGGHegZ1AH2xw9ZWJwccM,4790698
 not1mm/data/cwmacros.txt,sha256=PvJ7TxGILq-ErHb6Gbrm-08x76BbCdXb8AY8a7st5mg,451
@@ -89,8 +89,8 @@ not1mm/data/phonetics/yourcall.wav,sha256=4kheHJmCiRDL2kjhlgXQ8_u_eEMgKxiNGu5UBk
 not1mm/data/phonetics/z.wav,sha256=arafCi7fwmBLdVDI-PRyaL4U-03PIQDhffwY5noJ_2c,51768
 not1mm/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/lib/about.py,sha256=sWycfGcruN3SaEe4JmaJ61K6D8Itq0WxpUYT-lEcmYM,416
-not1mm/lib/cat_interface.py,sha256=dr5bBcObNtRWVHr9A5kq9GCq0wQfOOfVhkrEAzJez90,15127
-not1mm/lib/cwinterface.py,sha256=Seupz7tMkCvJ80mgmyaNU_1AUADsvNPkAfwDSlwibF0,3126
+not1mm/lib/cat_interface.py,sha256=GP06hWIFrM_6hFQCJEq6QuNF8HaZn4UojIOlt_iWLDA,16042
+not1mm/lib/cwinterface.py,sha256=Q8p3pScOHczZ8ptICfH1Yu6rCEwQJLgrNwYMN76B2i8,3389
 not1mm/lib/database.py,sha256=RQoj3JsTejMiiFIN42lY3N4jrj80htftdoFeRqVKnKs,42480
 not1mm/lib/edit_contact.py,sha256=Ki9bGPpqyQQBB1cU8VIBDCal3lbXeQ6qxhzklmhE2_w,353
 not1mm/lib/edit_macro.py,sha256=raKWBwsHInj5EUKmvyLQ6gqc3ZFDlstsD3xqoM4PC8E,517
@@ -104,9 +104,9 @@ not1mm/lib/n1mm.py,sha256=V1NiNyOHaPNYKe_vRsq44O1R42N8uS5PlfRa5Db4Tv0,5712
 not1mm/lib/new_contest.py,sha256=IznTDMq7yXHB6zBoGUEC_WDYPCPpsSZW4wwMJi16zK0,816
 not1mm/lib/plugin_common.py,sha256=AAKBPCXzTWZJb-h08uPNnHVG7bSCg7kwukc211gFivY,8605
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
-not1mm/lib/settings.py,sha256=i4Za_BZDl9UotB10o8sjIkzRdR0493rMI5VaQltUZHA,9054
+not1mm/lib/settings.py,sha256=MWiKXbasaFbzeHTjfzTaTqbCBrIijudP_-0a5jNmUAA,9265
 not1mm/lib/super_check_partial.py,sha256=p5l3u2ZOCBtlWgbvskC50FpuoaIpR07tfC6zTdRWbh4,2334
-not1mm/lib/version.py,sha256=5VfzMqJpSG9cTllQxeEteOeBs_mZEETIMigeCC1OoCI,50
+not1mm/lib/version.py,sha256=zA20U-5Ca6bsgBYAJw2MX5JgzAAvPdJ2B59giQAav24,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=fUjfwjuscDjicXIxsO0JHh7xTR9Vu0iPsrOLb896Qak,10873
 not1mm/plugins/10_10_spring_cw.py,sha256=WNaJP5mBQfaB6SxnFI0Vawt3AKDr94tKVtAK-EVhtUY,10878
@@ -140,9 +140,9 @@ not1mm/plugins/naqp_ssb.py,sha256=IWksulcb2_DxlkeW0h3048t8I-u00G_67KBVKkp-TV4,11
 not1mm/plugins/phone_weekly_test.py,sha256=gCX0ESUoiQzDp9puwibt9-dRembNsiuEeBdawCVvjHA,12316
 not1mm/plugins/stew_perry_topband.py,sha256=DIMI3mGMKokXXb9pPLqdhBI6JVnnIs7ZnAL23nFmshE,10588
 not1mm/plugins/winter_field_day.py,sha256=4rcfRtobwjHO6BNL3WOTHzBmyyeuX79BNGBG8PfjrI8,10238
-not1mm-24.4.25.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.4.25.1.dist-info/METADATA,sha256=BSMf_2zOxDbDk8E4rgSG9kr8X6itsdP00ZY8KEIxGgo,27891
-not1mm-24.4.25.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-not1mm-24.4.25.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.4.25.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.4.25.1.dist-info/RECORD,,
+not1mm-24.4.30.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.4.30.dist-info/METADATA,sha256=KBVE9BJ01q8RlE8BBesdoAtBiMt5m0z_tnkQnNGyZAY,28897
+not1mm-24.4.30.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+not1mm-24.4.30.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.4.30.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.4.30.dist-info/RECORD,,