not1mm 25.6.18.2__py3-none-any.whl → 25.6.21__py3-none-any.whl

not1mm/__main__.py

@@ -757,7 +757,11 @@ class MainWindow(QtWidgets.QMainWindow):
         self.dxcc_window.message.connect(self.dockwidget_message)
 
         self.show_splash_msg("Setting up RotatorWindow.")
-        self.rotator_window = RotatorWindow()
+        self.rotator_window = RotatorWindow(
+            host=self.pref.get("rotctld_address", "127.0.0.1"),
+            port=self.pref.get("rotctld_port", 4533),
+        )
+
         self.rotator_window.setObjectName("rotator-window")
         if os.environ.get("WAYLAND_DISPLAY") and old_Qt is True:
             self.rotator_window.setFeatures(dockfeatures)
@@ -3696,6 +3700,15 @@ class MainWindow(QtWidgets.QMainWindow):
         else:
             self.server_icon.hide()
 
+        if isinstance(self.rotator_window, RotatorWindow):
+            self.rotator_window.set_host_port(
+                host=self.pref.get(
+                    "rotctld_address",
+                    "127.0.0.1",
+                ),
+                port=self.pref.get("rotctld_port", 4533),
+            )
+
     def rtc_response(self, response):
         print(f"{response=}")
 

not1mm/data/configuration.ui

@@ -809,7 +809,7 @@
           </font>
          </property>
          <property name="text">
-          <string>CW Sent Nr Padding:</string>
+          <string>CW Sent Nr Pad Character:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -849,7 +849,7 @@
           </font>
          </property>
          <property name="text">
-          <string>CW Sent Nr Padding Length:</string>
+          <string>CW Sent Nr Pad Length:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
@@ -881,6 +881,41 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="rotator_tab">
+      <attribute name="title">
+       <string>Rotator</string>
+      </attribute>
+      <layout class="QGridLayout" name="gridLayout_12">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_33">
+         <property name="text">
+          <string>rotctld address:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QLineEdit" name="rotctld_address">
+         <property name="placeholderText">
+          <string>127.0.0.1</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_34">
+         <property name="text">
+          <string>rotctld port:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="rotctld_port">
+         <property name="placeholderText">
+          <string>4533</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="cluster_tab">
       <attribute name="title">
        <string>Cluster</string>
@@ -1104,11 +1139,8 @@
        <string>Group</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_7">
-       <item row="0" column="0" colspan="2" alignment="Qt::AlignHCenter">
-        <widget class="QCheckBox" name="connect_to_server">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
+       <item row="3" column="1">
+        <widget class="QLineEdit" name="multicast_port">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1116,13 +1148,16 @@
            <strikeout>false</strikeout>
           </font>
          </property>
+         <property name="inputMethodHints">
+          <set>Qt::InputMethodHint::ImhDigitsOnly</set>
+         </property>
          <property name="text">
-          <string>Connect to server</string>
+          <string>2239</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_3">
+       <item row="2" column="1">
+        <widget class="QLineEdit" name="multicast_group">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1131,15 +1166,29 @@
           </font>
          </property>
          <property name="text">
-          <string>Multicast Group:</string>
+          <string>224.1.1.1</string>
          </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </widget>
+       </item>
+       <item row="1" column="0" colspan="2" alignment="Qt::AlignHCenter">
+        <widget class="QCheckBox" name="connect_to_server">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="font">
+          <font>
+           <family>JetBrains Mono</family>
+           <pointsize>12</pointsize>
+           <strikeout>false</strikeout>
+          </font>
+         </property>
+         <property name="text">
+          <string>Connect to server</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QLineEdit" name="multicast_group">
+       <item row="4" column="0">
+        <widget class="QLabel" name="label_12">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1148,11 +1197,14 @@
           </font>
          </property>
          <property name="text">
-          <string>224.1.1.1</string>
+          <string>Interface IP:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
-       <item row="2" column="0">
+       <item row="3" column="0">
         <widget class="QLabel" name="label_9">
          <property name="font">
           <font>
@@ -1169,8 +1221,8 @@
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
-        <widget class="QLineEdit" name="multicast_port">
+       <item row="4" column="1">
+        <widget class="QLineEdit" name="interface_ip">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1178,16 +1230,13 @@
            <strikeout>false</strikeout>
           </font>
          </property>
-         <property name="inputMethodHints">
-          <set>Qt::InputMethodHint::ImhDigitsOnly</set>
-         </property>
          <property name="text">
-          <string>2239</string>
+          <string>0.0.0.0</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QLabel" name="label_12">
+       <item row="2" column="0">
+        <widget class="QLabel" name="label_3">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
@@ -1196,24 +1245,27 @@
           </font>
          </property>
          <property name="text">
-          <string>Interface IP:</string>
+          <string>Multicast Group:</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
-        <widget class="QLineEdit" name="interface_ip">
+       <item row="0" column="0" colspan="2">
+        <widget class="QLabel" name="label_35">
          <property name="font">
           <font>
            <family>JetBrains Mono</family>
-           <pointsize>12</pointsize>
+           <pointsize>14</pointsize>
            <strikeout>false</strikeout>
           </font>
          </property>
+         <property name="styleSheet">
+          <string notr="true">color: red;</string>
+         </property>
          <property name="text">
-          <string>0.0.0.0</string>
+          <string>This is not functional ignore this tab, Just move along.</string>
          </property>
         </widget>
        </item>

not1mm/lib/rot_interface.py

@@ -12,13 +12,20 @@ class RotatorInterface:
     A class to interface with a rotator control program (like rotctld).
     """
 
-    def __init__(self, host="127.0.0.1", port=4533):
+    def __init__(self, host: str = "127.0.0.1", port: int = 4533):
         self.host: str = host
         self.port: int = port
         self.socket: socket.socket | None = None
         self.connected: bool = False
         self.connect()
 
+    def set_host_port(self, host: str, port: int) -> None:
+        """Set the host and port of the rotator control program."""
+        self.host = host
+        self.port = port
+        self.disconnect()
+        self.connect()
+
     def connect(self) -> None:
         """Connect to the rotator control program."""
         try:

not1mm/lib/settings.py

@@ -120,6 +120,9 @@ class Settings(QtWidgets.QDialog):
         self.userigctld_radioButton.setChecked(bool(self.preference.get("userigctld")))
         self.useflrig_radioButton.setChecked(bool(self.preference.get("useflrig")))
 
+        self.rotctld_address.setText(str(self.preference.get("rotctld_address", "")))
+        self.rotctld_port.setText(str(self.preference.get("rotctld_port", "")))
+
         self.cwip_field.setText(str(self.preference.get("cwip", "")))
         if self.preference.get("cwport", ""):
             self.cwport_field.setText(str(self.preference.get("cwport", "")))
@@ -267,6 +270,13 @@ class Settings(QtWidgets.QDialog):
             ...
         self.preference["userigctld"] = self.userigctld_radioButton.isChecked()
         self.preference["useflrig"] = self.useflrig_radioButton.isChecked()
+
+        self.preference["rotctld_address"] = self.rotctld_address.text()
+        try:
+            self.preference["rotctld_port"] = int(self.rotctld_port.text())
+        except ValueError:
+            self.preference["rotctld_port"] = 4533
+
         self.preference["cwip"] = self.cwip_field.text()
         try:
             self.preference["cwport"] = int(self.cwport_field.text())

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.6.18.2"
+__version__ = "25.6.21"

not1mm/rotator.py

@@ -37,8 +37,10 @@ class RotatorWindow(QDockWidget):
     requestedAzimuthNeedle: QGraphicsPathItem | None = None
     antennaNeedle: QGraphicsPathItem | None = None
 
-    def __init__(self):
+    def __init__(self, host: str = "127.0.0.1", port: int = 4533):
         super().__init__()
+        self.host = host
+        self.port = port
         self.active: bool = False
         self.compassScene: QGraphicsScene | None = None
         self.mygrid: str = "DM13at"
@@ -53,13 +55,20 @@ class RotatorWindow(QDockWidget):
         self.stop_button.clicked.connect(lambda x: self.rotator.send_command("S"))
         self.park_button.clicked.connect(lambda x: self.rotator.send_command("K"))
         self.redrawMap()
-        self.rotator: RotatorInterface = RotatorInterface()
+        self.rotator: RotatorInterface = RotatorInterface(self.host, self.port)
         self.antennaAzimuth, _ = self.rotator.get_position()
         self.set_antenna_azimuth(self.antennaAzimuth)
         self.watch_timer: QTimer = QTimer()
         self.watch_timer.timeout.connect(self.check_rotator)
         self.watch_timer.start(1000)
 
+    def set_host_port(self, host: str, port: int) -> None:
+        """"""
+        self.host = host
+        self.port = port
+        self.rotator.set_host_port(self.host, self.port)
+        self.redrawMap()
+
     def msg_from_main(self, msg: dict) -> None:
         """"""
         if self.active is True and isinstance(msg, dict):

not1mm/vfo.py

@@ -34,7 +34,7 @@ class VfoWindow(QDockWidget):
     """The VFO window."""
 
     pref: dict = {}
-    old_vfo: str = ""
+    old_vfo: int = 0
     old_pico: str = ""
     message_shown: bool = False
     current_palette: QPalette | None = None
@@ -96,7 +96,7 @@ class VfoWindow(QDockWidget):
             )
             self.timer.start(100)
 
-    def discover_device(self) -> str:
+    def discover_device(self) -> str | None:
         """
         Poll all serial devices looking for correct one.
 
@@ -220,13 +220,13 @@ class VfoWindow(QDockWidget):
         if self.rig_control is not None:
             if self.rig_control.online is False:
                 self.rig_control.reinit()
-            if self.rig_control.online:
+            if self.rig_control.online is True:
                 try:
                     vfo: int = int(self.rig_control.get_vfo())
                 except ValueError:
                     return
-                if vfo < 1700000 or vfo > 60000000:
-                    return
+                # if vfo < 1700000 or vfo > 60000000:
+                #     return
                 if vfo != self.old_vfo or self.device_reconnect is True:
                     self.old_vfo: int = vfo
                     logger.debug(f"{vfo}")

{not1mm-25.6.18.2.dist-info → not1mm-25.6.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.6.18.2
+Version: 25.6.21
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -246,6 +246,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-6-21] Remove range check on vfo display.
+- [25-6-20] Added a Rotator tab in the configuration dialog.
 - [25-6-18] Merged changes from @term73, Adding ES Manual Key contest.
 - [25-6-16] Merged PR from @awandahl SM0HPL, adding ESM buttons to General DX Logging plugin.
 - [25-6-15] Corrected tab focus of rotator windows buttons.
@@ -710,7 +712,8 @@ This window shows you a grid of DXCC entities you've aquired and on what bands.
 `Window`>`Rotator`
 
 The Rotator window is a work in progress. The Rotator window relies on the functionality
-of the rotctld daemon. It connects to rotctld over it's default port of 4533. If started
+of the rotctld daemon. It connects to rotctld on address 127.0.0.1 and port 4533. You can
+change this if needed in the configuration dialog under the rotator tab. If started
 and there is no connection, you will see this:
 
 ![Rotator Window](https://github.com/mbridak/not1mm/raw/master/pic/rot1.png)

{not1mm-25.6.18.2.dist-info → not1mm-25.6.21.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=YjYekG48jh_v0ODebaucCOWEPr8LToIvSkLfTDYisbM,174896
+not1mm/__main__.py,sha256=jtaZgDrAsuAx29lHBpmspxUl2RUiciBAmZUSjMmofCg,175330
 not1mm/bandmap.py,sha256=PpoZIuJ8dTj9erW0xYqbyneZrSQ-CEqbpek5jTlc6PQ,31173
 not1mm/checkwindow.py,sha256=zEHlw40j6Wr3rvKbCQf2lcezCoiZqaBqEvBjQU5aKW0,7630
 not1mm/dxcc_tracker.py,sha256=px1m6wcFv-ZDBDKyqSa0IcgAfE9GmQ5mptJHBbnWTcA,4379
@@ -8,11 +8,11 @@ not1mm/logwindow.py,sha256=O2dMaT_BYWsXA_dxsEHN92JwN-qVGy9nmH0MCMaG9gY,42830
 not1mm/lookupservice.py,sha256=WyLp1m4XPxK0Nk7FH8IKA8jjAs25UcEMrwpCsHmW1fY,2678
 not1mm/radio.py,sha256=4Lysf9BY3vdtYCHwKfzO5WN7IGyh4_lKSVuQ6F4Z08g,5536
 not1mm/ratewindow.py,sha256=iBjqdOetIEX0wSwdGM89Ibt4gVlFdE-K8HQPnkVPVOg,6965
-not1mm/rotator.py,sha256=jrAqO3IkeuZcOgsYFKvEv6DY2ccV85wg0o5sdJa_EUo,12760
+not1mm/rotator.py,sha256=A_qu2qyzlke0y4MstzisnWo0riUvuP9k-ww-msbh3C0,13080
 not1mm/rtc_service.py,sha256=S9mF4rnoJKfj0We9Lt2aIWMkHKhDBGUCEhWf2tN0pVI,2899
 not1mm/statistics.py,sha256=tEbAASTwmSvkZnEoIwadSZ_7Ic8yGaGpBLx_rbLLrng,8254
 not1mm/test.py,sha256=WhL0DLlJTD15aON8Dkf2q_tlP_X1juxKZJh0jEC99tU,154
-not1mm/vfo.py,sha256=VxPO9ljGvvUHO05byCEUM_NDKPKc9d_e3nlx9lX69vM,10639
+not1mm/vfo.py,sha256=QPeS0L93_JV0lwnzskKcIHaeI_PmVx1QjvbZmY9eors,10657
 not1mm/voice_keying.py,sha256=HZImqC5NgnyW2nknNYQ3b7I8-6S_hxpq5G4RcIRXn_k,3005
 not1mm/data/JetBrainsMono-Thin.ttf,sha256=B1bo6M8dZfp1GXdnZEebOXPvsVr09BnV1ydNwnrhtwI,270112
 not1mm/data/MASTER.SCP,sha256=yLV5NPU5T2JRKbDukpUB2S_WXpxjyuSPmfV5gVBAoH8,363027
@@ -23,7 +23,7 @@ not1mm/data/check.png,sha256=UvFOLr8V-79qnjW8wUaGItXk_OSP8m8hqPevs8NDlFY,387
 not1mm/data/checkwindow.ui,sha256=kRRfMXOsvyQwCk93Fm8CWTaL3DCWFTIfyqncciRY2MI,5064
 not1mm/data/cloud_green.png,sha256=MdXhls1n4XR7oM0Y84pqlsuay6byduAJF7NwgZ-g0DU,626
 not1mm/data/cloud_red.png,sha256=vSIQ1X7_z484pv3xXjTRtdtfIontsUq11suTALSsaQA,482
-not1mm/data/configuration.ui,sha256=Qze_mbSw3vS6Iwof5TyEz-3KycG1lconANEMXhPrFQQ,76372
+not1mm/data/configuration.ui,sha256=wkBOg1RJcKQt8UUqvelT4--kONBXOkGToqC0xvE9U7A,78034
 not1mm/data/contests.sql,sha256=4hmJCDvrbxnA_Y5S4T5o52TZieeFk6QUwFerwlFePNA,89307
 not1mm/data/cty.json,sha256=3Nk98AoENvBB4RwJCTheDVCjJ1AvX4ik5kg2R0iU1X0,4948509
 not1mm/data/cwmacros.txt,sha256=NztufsX6R52gAO7VyJ2AHr7wOh41pJTwHKh5Lcs32ds,468
@@ -122,11 +122,11 @@ not1mm/lib/multicast.py,sha256=KJcruI-bOuHfHXPjl3SGQhL6I9sKrygy-sdFSvxffUM,3255
 not1mm/lib/n1mm.py,sha256=H54mpgJF0GAmKavM-nb5OAq2SJFWYkux4eMWWiSRxJc,6288
 not1mm/lib/new_contest.py,sha256=IznTDMq7yXHB6zBoGUEC_WDYPCPpsSZW4wwMJi16zK0,816
 not1mm/lib/plugin_common.py,sha256=4M5CqBXPVvqiakmCEV_SvcRHAZrlwYgGRZwfxAw2e9U,13951
-not1mm/lib/rot_interface.py,sha256=bOyxpV9pQHORUY5qfNZE2QAV1V71QEG2jooiI2p9AwE,3744
+not1mm/lib/rot_interface.py,sha256=foe488PDi8wU86e3DkaKSwMbDwdWbpkvxX_Ct2U7S5o,3985
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
-not1mm/lib/settings.py,sha256=5xnsagH48qGeCDhfxPWW9yaXtv8wT13yoIVvYt8h_Qs,16023
+not1mm/lib/settings.py,sha256=kri_B6RZ8ZAq5cTSvY4AKP6KsGLm597Dss67fqE6g28,16432
 not1mm/lib/super_check_partial.py,sha256=jX7DjHesEV4KNVQbddJui0wAsYHerikH7W0iPv7PXQw,3110
-not1mm/lib/version.py,sha256=kDJqSNIusJ-S8KY_De7R90yqEEwI-0Vyqbklsj8O9jQ,50
+not1mm/lib/version.py,sha256=cAqS-YROZ_TvnaIGVxfEm2_OrtQ2gr4SSvnJ1DdP7a4,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=oJh3JKqjOpnWElSlZpiQ631UnaOd8qra5s9bl_QoInk,14783
 not1mm/plugins/10_10_spring_cw.py,sha256=p7dSDtbFK0e6Xouw2V6swYn3VFVgHKyx4IfRWyBjMZY,14786
@@ -191,9 +191,9 @@ not1mm/plugins/ukeidx.py,sha256=ZsIFXgOSwjuKNmN4W_C0TAgGqgnabJGNLMHwGkl3_bk,1910
 not1mm/plugins/vhf_sprint.py,sha256=a9QFTpv8XUbZ_GLjdVCh7svykFa-gXOWwKFZ6MD3uQM,19289
 not1mm/plugins/weekly_rtty.py,sha256=C8Xs3Q5UgSYx-mFFar8BVARWtmqlyrbeC98Ubzb4UN8,20128
 not1mm/plugins/winter_field_day.py,sha256=hmAMgkdqIXtnCNyUp8J9Bb8liN8wj10wps6ROuG-Bok,15284
-not1mm-25.6.18.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-25.6.18.2.dist-info/METADATA,sha256=p6v0jzc09G3Hm35D_u89Q45DRci2NgfSv5W9VOMa_qU,36945
-not1mm-25.6.18.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-not1mm-25.6.18.2.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-25.6.18.2.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-25.6.18.2.dist-info/RECORD,,
+not1mm-25.6.21.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-25.6.21.dist-info/METADATA,sha256=ZV62gfO_MpA1moqEFznRwWlDFryUn-3fPAujV4Xcqk4,37136
+not1mm-25.6.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+not1mm-25.6.21.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-25.6.21.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-25.6.21.dist-info/RECORD,,