not1mm 25.4.28__tar.gz → 25.5.14__tar.gz

{not1mm-25.4.28 → not1mm-25.5.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.4.28
+Version: 25.5.14
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -256,31 +256,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [25-4-28] Merged PR from MicroPhonon adding VHF Sprint.
-- [25-4-25] Merged PR from @microphonon making changes to ARRL VHF and CWOps CWT.
-- [25-4-22] Mostly code cleanup. Not running some code when not needed.
-- [25-4-21] Add a couple more debug messages. Add LSB/USB to input-able commands to the callsign field.
-- [25-4-19-1] Add FM and AM as input-able commands to the callsign field.
-- [25-4-19] Changed S&P QSY wipe from 50hz to 500hz.
-- [25-4-18] Option to clear input fields when QSY in S&P mode.
-- [25-4-17] Testing sending radio voice memory. {VOICE1}, {VOICE2} etc.
-- [25-4-16] Fix serial number not updating when selecing call from checkpartial or bandmap.
-- [25-4-15] Corrected dupe_type 5 check for contest specific function. Fixed wrong ES Open plugin name. Fixed some problems with the specific_contest_check_dupe datetime namespace. And other stuff.
-- [25-4-14] Add ES Open HF Chanmpionship.
-- [25-4-13] Fix crash in JIDX Cabrillo output.
-- [25-4-12] Added an Auto CQ time to fire progress bar.
-- [25-4-11-3] Fixed issue with winkeyer not sending multiple macros in ESM mode.
-- [25-4-11-2] Fixed a crash.
-- [25-4-11-1] Add clear buffer to winkeyer interface to stop sending.
-- [25-4-11] Add Scandinavian Activity Contest
-- [25-4-10-1] Add ARI 40/80 contest. Add CTRL-R to toggle Run state.
-- [25-4-10] Add Auto CQ visual indicator.
-- [25-4-9] Added UKEI DX Contest.
-- [25-4-8] Remove focus from statistics table widget.
-- [25-4-7] Merge in changes from dj1yfk correcting SPDX Cabrillo name.
-- [25-4-5] Add SPDX.
-- [25-4-2] Add some tool tips to bandmap and main. Updated Zoom buttons on bandmap. Updated minimum Python version to 3.10.
-- [25-4-1] Fix: statistics window not populating when initially activated from the window menu. Removed unused code chucks. Removed some unused and hidden visual elements.
+- [25-5-6] Merged PR from @JG3LLB, Koji-Kawano, Adding code to stop sending morse if using rigctld to send, and @alduhoo adding more control to CW serial number padding.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 

{not1mm-25.4.28 → not1mm-25.5.14}/README.md

@@ -224,31 +224,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [25-4-28] Merged PR from MicroPhonon adding VHF Sprint.
-- [25-4-25] Merged PR from @microphonon making changes to ARRL VHF and CWOps CWT.
-- [25-4-22] Mostly code cleanup. Not running some code when not needed.
-- [25-4-21] Add a couple more debug messages. Add LSB/USB to input-able commands to the callsign field.
-- [25-4-19-1] Add FM and AM as input-able commands to the callsign field.
-- [25-4-19] Changed S&P QSY wipe from 50hz to 500hz.
-- [25-4-18] Option to clear input fields when QSY in S&P mode.
-- [25-4-17] Testing sending radio voice memory. {VOICE1}, {VOICE2} etc.
-- [25-4-16] Fix serial number not updating when selecing call from checkpartial or bandmap.
-- [25-4-15] Corrected dupe_type 5 check for contest specific function. Fixed wrong ES Open plugin name. Fixed some problems with the specific_contest_check_dupe datetime namespace. And other stuff.
-- [25-4-14] Add ES Open HF Chanmpionship.
-- [25-4-13] Fix crash in JIDX Cabrillo output.
-- [25-4-12] Added an Auto CQ time to fire progress bar.
-- [25-4-11-3] Fixed issue with winkeyer not sending multiple macros in ESM mode.
-- [25-4-11-2] Fixed a crash.
-- [25-4-11-1] Add clear buffer to winkeyer interface to stop sending.
-- [25-4-11] Add Scandinavian Activity Contest
-- [25-4-10-1] Add ARI 40/80 contest. Add CTRL-R to toggle Run state.
-- [25-4-10] Add Auto CQ visual indicator.
-- [25-4-9] Added UKEI DX Contest.
-- [25-4-8] Remove focus from statistics table widget.
-- [25-4-7] Merge in changes from dj1yfk correcting SPDX Cabrillo name.
-- [25-4-5] Add SPDX.
-- [25-4-2] Add some tool tips to bandmap and main. Updated Zoom buttons on bandmap. Updated minimum Python version to 3.10.
-- [25-4-1] Fix: statistics window not populating when initially activated from the window menu. Removed unused code chucks. Removed some unused and hidden visual elements.
+- [25-5-6] Merged PR from @JG3LLB, Koji-Kawano, Adding code to stop sending morse if using rigctld to send, and @alduhoo adding more control to CW serial number padding.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 

{not1mm-25.4.28 → not1mm-25.5.14}/not1mm/__main__.py

@@ -2121,6 +2121,9 @@ class MainWindow(QtWidgets.QMainWindow):
             if self.cw.servertype == 2:
                 self.cw.winkeyer_stop()
                 return
+            if self.cw.servertype == 3:
+                self.rig_control.cat.stopcwrigctl()
+                return
         if self.rig_control:
             if self.rig_control.online:
                 if self.pref.get("cwtype") == 3 and self.rig_control is not None:
@@ -2869,7 +2872,7 @@ class MainWindow(QtWidgets.QMainWindow):
             next_serial = "1"
         macro = macro.upper()
         if self.radio_state.get("mode") == "CW":
-            macro = macro.replace("#", next_serial.rjust(3, "T"))
+            macro = macro.replace("#", next_serial.rjust(self.pref["cwpaddinglength"], self.pref["cwpaddingchar"]))
         else:
             macro = macro.replace("#", next_serial)
         macro = macro.replace("{MYCALL}", self.station.get("Call", ""))
@@ -2882,7 +2885,7 @@ class MainWindow(QtWidgets.QMainWindow):
             macro = macro.replace("{SNT}", self.sent.text())
         if self.radio_state.get("mode") == "CW":
             macro = macro.replace(
-                "{SENTNR}", self.other_1.text().lstrip("0").rjust(3, "T")
+                "{SENTNR}", self.other_1.text().lstrip("0").rjust(self.pref["cwpaddinglength"], self.pref["cwpaddingchar"])
             )
         else:
             macro = macro.replace("{SENTNR}", self.other_1.text())

{not1mm-25.4.28 → not1mm-25.5.14}/not1mm/data/configuration.ui

@@ -799,6 +799,86 @@
          </property>
         </spacer>
        </item>
+       <item row="3" column="1">
+        <widget class="QLabel" name="label_31">
+         <property name="font">
+          <font>
+           <family>JetBrains Mono ExtraLight</family>
+           <pointsize>12</pointsize>
+           <strikeout>false</strikeout>
+          </font>
+         </property>
+         <property name="text">
+          <string>CW Sent Nr Padding:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="2">
+        <widget class="QLineEdit" name="cwpaddingchar_field">
+         <property name="font">
+          <font>
+           <family>JetBrains Mono ExtraLight</family>
+           <pointsize>12</pointsize>
+           <strikeout>false</strikeout>
+          </font>
+         </property>
+         <property name="accessibleName">
+          <string>c w padding character</string>
+         </property>
+         <property name="accessibleDescription">
+          <string>padding character when sending c w exchange number.</string>
+         </property>
+         <property name="inputMethodHints">
+          <set>Qt::InputMethodHint::ImhDigitsOnly</set>
+         </property>
+         <property name="text">
+          <string>T</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QLabel" name="label_32">
+         <property name="font">
+          <font>
+           <family>JetBrains Mono ExtraLight</family>
+           <pointsize>12</pointsize>
+           <strikeout>false</strikeout>
+          </font>
+         </property>
+         <property name="text">
+          <string>CW Sent Nr Padding Length:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="2">
+        <widget class="QLineEdit" name="cwpaddinglength_field">
+         <property name="font">
+          <font>
+           <family>JetBrains Mono ExtraLight</family>
+           <pointsize>12</pointsize>
+           <strikeout>false</strikeout>
+          </font>
+         </property>
+         <property name="accessibleName">
+          <string>c w padding character</string>
+         </property>
+         <property name="accessibleDescription">
+          <string>number of padding characters to send when sending c w exchange number.</string>
+         </property>
+         <property name="inputMethodHints">
+          <set>Qt::InputMethodHint::ImhDigitsOnly</set>
+         </property>
+         <property name="text">
+          <string>3</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="cluster_tab">

{not1mm-25.4.28 → not1mm-25.5.14}/not1mm/lib/cat_interface.py

@@ -203,6 +203,22 @@ class CAT:
         self.__initialize_rigctrld()
         return False
 
+    def stopcwrigctl(self):
+        """Stop CW via rigctld"""
+        if self.rigctrlsocket:
+            try:
+                self.online = True
+                self.rigctrlsocket.send(bytes(f"\\stop_morse", "utf-8"))
+                _ = self.__get_serial_string()
+                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 set_rigctl_cw_speed(self, speed):
         """Set CW speed via rigctld"""
         if self.rigctrlsocket:

{not1mm-25.4.28 → not1mm-25.5.14}/not1mm/lib/settings.py

@@ -138,6 +138,8 @@ class Settings(QtWidgets.QDialog):
             self.set_winkeyer_port_hint()
         elif self.preference.get("cwtype") == 3:
             self.set_catforcw_port_hint()
+        self.cwpaddingchar_field.setText(self.preference.get("cwpaddingchar", "T"))
+        self.cwpaddinglength_field.setText(str(self.preference.get("cwpaddinglength", "3")))
 
         self.connect_to_server.setChecked(bool(self.preference.get("useserver")))
         self.multicast_group.setText(str(self.preference.get("multicast_group", "")))
@@ -266,6 +268,8 @@ class Settings(QtWidgets.QDialog):
         except ValueError:
             self.preference["cwport"] = None
             ...
+        self.preference["cwpaddingchar"] = self.cwpaddingchar_field.text()
+        self.preference["cwpaddinglength"] = int(self.cwpaddinglength_field.text())
         self.preference["cwtype"] = 0
         if self.usecwdaemon_radioButton.isChecked():
             self.preference["cwtype"] = 1

{not1mm-25.4.28 → not1mm-25.5.14}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.4.28"
+__version__ = "25.5.14"

{not1mm-25.4.28 → not1mm-25.5.14}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.4.28
+Version: 25.5.14
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -256,31 +256,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [25-4-28] Merged PR from MicroPhonon adding VHF Sprint.
-- [25-4-25] Merged PR from @microphonon making changes to ARRL VHF and CWOps CWT.
-- [25-4-22] Mostly code cleanup. Not running some code when not needed.
-- [25-4-21] Add a couple more debug messages. Add LSB/USB to input-able commands to the callsign field.
-- [25-4-19-1] Add FM and AM as input-able commands to the callsign field.
-- [25-4-19] Changed S&P QSY wipe from 50hz to 500hz.
-- [25-4-18] Option to clear input fields when QSY in S&P mode.
-- [25-4-17] Testing sending radio voice memory. {VOICE1}, {VOICE2} etc.
-- [25-4-16] Fix serial number not updating when selecing call from checkpartial or bandmap.
-- [25-4-15] Corrected dupe_type 5 check for contest specific function. Fixed wrong ES Open plugin name. Fixed some problems with the specific_contest_check_dupe datetime namespace. And other stuff.
-- [25-4-14] Add ES Open HF Chanmpionship.
-- [25-4-13] Fix crash in JIDX Cabrillo output.
-- [25-4-12] Added an Auto CQ time to fire progress bar.
-- [25-4-11-3] Fixed issue with winkeyer not sending multiple macros in ESM mode.
-- [25-4-11-2] Fixed a crash.
-- [25-4-11-1] Add clear buffer to winkeyer interface to stop sending.
-- [25-4-11] Add Scandinavian Activity Contest
-- [25-4-10-1] Add ARI 40/80 contest. Add CTRL-R to toggle Run state.
-- [25-4-10] Add Auto CQ visual indicator.
-- [25-4-9] Added UKEI DX Contest.
-- [25-4-8] Remove focus from statistics table widget.
-- [25-4-7] Merge in changes from dj1yfk correcting SPDX Cabrillo name.
-- [25-4-5] Add SPDX.
-- [25-4-2] Add some tool tips to bandmap and main. Updated Zoom buttons on bandmap. Updated minimum Python version to 3.10.
-- [25-4-1] Fix: statistics window not populating when initially activated from the window menu. Removed unused code chucks. Removed some unused and hidden visual elements.
+- [25-5-6] Merged PR from @JG3LLB, Koji-Kawano, Adding code to stop sending morse if using rigctld to send, and @alduhoo adding more control to CW serial number padding.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 

{not1mm-25.4.28 → not1mm-25.5.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "25.4.28"
+version = "25.5.14"
 description = "NOT1MM Logger"
 license = { text = "GPL-3.0-or-later" }
 readme = "README.md"