not1mm 24.7.28__py3-none-any.whl → 24.7.31__py3-none-any.whl

not1mm/__main__.py

@@ -564,6 +564,8 @@ class MainWindow(QtWidgets.QMainWindow):
         if self.actionVFO.isChecked():
             self.vfo_window.show()
 
+        self.cwspeed_spinbox_changed()
+
         if not DEBUG_ENABLED:
             if VersionTest(__version__).test():
                 self.show_message_box(
@@ -1588,6 +1590,10 @@ class MainWindow(QtWidgets.QMainWindow):
             self.cw.sendcw(f"\x1b2{self.cw.speed}")
         if self.cw.servertype == 2:
             self.cw.set_winkeyer_speed(self.cw_speed.value())
+        if self.rig_control:
+            if self.pref.get("cwtype") == 3 and self.rig_control is not None:
+                if self.rig_control.interface == "flrig":
+                    self.rig_control.cat.set_flrig_cw_speed(self.cw_speed.value())
 
     def keyPressEvent(self, event) -> None:  # pylint: disable=invalid-name
         """
@@ -2227,14 +2233,22 @@ class MainWindow(QtWidgets.QMainWindow):
         if next_serial == "None":
             next_serial = "1"
         macro = macro.upper()
-        macro = macro.replace("#", next_serial)
+        if self.radio_state.get("mode") == "CW":
+            macro = macro.replace("#", next_serial.rjust(3, "T"))
+        else:
+            macro = macro.replace("#", next_serial)
         macro = macro.replace("{MYCALL}", self.station.get("Call", ""))
         macro = macro.replace("{HISCALL}", self.callsign.text())
         if self.radio_state.get("mode") == "CW":
             macro = macro.replace("{SNT}", self.sent.text().replace("9", "n"))
         else:
             macro = macro.replace("{SNT}", self.sent.text())
-        macro = macro.replace("{SENTNR}", self.other_1.text())
+        if self.radio_state.get("mode") == "CW":
+            macro = macro.replace(
+                "{SENTNR}", self.other_1.text().lstrip("0").rjust(3, "T")
+            )
+        else:
+            macro = macro.replace("{SENTNR}", self.other_1.text())
         macro = macro.replace(
             "{EXCH}", self.contest_settings.get("SentExchange", "xxx")
         )
@@ -2887,6 +2901,7 @@ class MainWindow(QtWidgets.QMainWindow):
                     self.rig_control.set_mode("CW")
                     if self.pref.get("cwtype") == 3 and self.rig_control is not None:
                         if self.rig_control.interface == "flrig":
+                            self.cwspeed_spinbox_changed()
                             self.rig_control.cat.set_flrig_cw_send(True)
             band = getband(str(self.radio_state.get("vfoa", "0.0")))
             self.set_band_indicator(band)

not1mm/lib/cat_interface.py

@@ -114,7 +114,7 @@ class CAT:
             self.sendcwrigctl(texttosend)
 
     def sendcwrigctl(self, texttosend):
-        """..."""
+        """Send text via rigctld"""
         if self.rigctrlsocket:
             try:
                 self.online = True
@@ -130,7 +130,7 @@ class CAT:
         return False
 
     def sendcwxmlrpc(self, texttosend):
-        """..."""
+        """Add text to flrig's cw send buffer."""
         logger.debug(f"{texttosend=}")
         try:
             self.online = True
@@ -147,8 +147,8 @@ class CAT:
             logger.debug("%s", f"{exception}")
         return False
 
-    def set_flrig_cw_send(self, send: bool):
-        """..."""
+    def set_flrig_cw_send(self, send: bool) -> None:
+        """Turn on flrig cw keyer send flag."""
         if self.interface == "rigctld":
             return
         try:
@@ -165,6 +165,24 @@ class CAT:
             self.online = False
             logger.debug("%s", f"{exception}")
 
+    def set_flrig_cw_speed(self, speed):
+        """Set flrig's CW send speed"""
+        if self.interface == "rigctld":
+            return
+        try:
+            self.online = True
+            self.server.rig.cwio_set_wpm(int(speed))
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
+            ValueError,
+        ) as exception:
+            self.online = False
+            logger.debug("%s", f"{exception}")
+
     def get_vfo(self) -> str:
         """Poll the radio for current vfo using the interface"""
         vfo = ""

not1mm/lib/version.py

@@ -1,3 +1,4 @@
 """It's the version"""
 
-__version__ = "24.7.28"
+__version__ = "24.7.31"
+

{not1mm-24.7.28.dist-info → not1mm-24.7.31.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.7.28
+Version: 24.7.31
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -223,6 +223,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-7-31] Serial number leading Zeros sent as T in CW.
+- [24-7-29] Add flrig cw speed change via onscreen widget.
 - [24-7-28] Second try at flrig CW.
 - [24-7-25-1] Have VFO dock widget handle disconnect/reconnect events of the USB VFO knob more gracefully.
 - [24-7-25] Updated application categories for the desktop file.

{not1mm-24.7.28.dist-info → not1mm-24.7.31.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=3I8eJQEfM6RHZnJmXwK_VtdU1ZPcSNPlvtgziQuzGf4,121134
+not1mm/__main__.py,sha256=pMPULQlE3HkWvafftG66YBaFUpCVLyfvwe9t1CCFdrE,121804
 not1mm/bandmap.py,sha256=Ml5DDoybk_I56q2WLYDKE4lfmh6pb9XxW0qpl5nDFYY,32161
 not1mm/checkwindow.py,sha256=zHxkCQ4BJ-pN80dSTQdiKq8RqY4oWzJveXZhQ2bu3PY,10436
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
@@ -91,7 +91,7 @@ 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=2Tzez8wO9ZATjheWkHRWTMi2jkt40W6tT7BNBbjVzuI,18839
+not1mm/lib/cat_interface.py,sha256=aazvNTSeZAROq3KL8gPx-I95iVez2IiIOSk22qeqVCQ,19502
 not1mm/lib/cwinterface.py,sha256=Q8p3pScOHczZ8ptICfH1Yu6rCEwQJLgrNwYMN76B2i8,3389
 not1mm/lib/database.py,sha256=RQoj3JsTejMiiFIN42lY3N4jrj80htftdoFeRqVKnKs,42480
 not1mm/lib/edit_contact.py,sha256=Ki9bGPpqyQQBB1cU8VIBDCal3lbXeQ6qxhzklmhE2_w,353
@@ -109,7 +109,7 @@ not1mm/lib/plugin_common.py,sha256=AAKBPCXzTWZJb-h08uPNnHVG7bSCg7kwukc211gFivY,8
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=MWiKXbasaFbzeHTjfzTaTqbCBrIijudP_-0a5jNmUAA,9265
 not1mm/lib/super_check_partial.py,sha256=p5l3u2ZOCBtlWgbvskC50FpuoaIpR07tfC6zTdRWbh4,2334
-not1mm/lib/version.py,sha256=b0kTxuIhWdsBX0VMhy3fn3YyF3XFCxs03DFSvGpgZjU,48
+not1mm/lib/version.py,sha256=v1Du4KErN7-rIOcaV1iI1R8QnGFaZJPhWvwwSy73_eA,49
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=IttjX1yy4nDdACGsiYlPteFG8eVseX_WtoFio6bqHE8,10953
 not1mm/plugins/10_10_spring_cw.py,sha256=ThCptdM3dX4ywhoy2JRcOEyHSqcJolFaT7O_PYzM1Mg,10958
@@ -145,9 +145,9 @@ not1mm/plugins/naqp_ssb.py,sha256=VLWVrSzI0UP1AhSXYn61eZ7or1rz6a_pS_xCKfgS4Jw,11
 not1mm/plugins/phone_weekly_test.py,sha256=fLpMe03WB9_KgRl6vMgQQt_aktFdqfNt2Sw81CTRAUs,12325
 not1mm/plugins/stew_perry_topband.py,sha256=CKBQbYl4ETxhXJd2dma4fg_C5pag_s7Nf61SCztZtqE,10668
 not1mm/plugins/winter_field_day.py,sha256=4rcfRtobwjHO6BNL3WOTHzBmyyeuX79BNGBG8PfjrI8,10238
-not1mm-24.7.28.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.7.28.dist-info/METADATA,sha256=KLA7jJ_PK9Xk5W2b7U2UO451JFnOznjizaMPmMTdsDA,29447
-not1mm-24.7.28.dist-info/WHEEL,sha256=Rp8gFpivVLXx-k3U95ozHnQw8yDcPxmhOpn_Gx8d5nc,91
-not1mm-24.7.28.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.7.28.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.7.28.dist-info/RECORD,,
+not1mm-24.7.31.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.7.31.dist-info/METADATA,sha256=JZDYYOTLJH_Q4--hhdKxo4dmNutDcPZGoOQP8wD6Ibg,29563
+not1mm-24.7.31.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+not1mm-24.7.31.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.7.31.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.7.31.dist-info/RECORD,,

{not1mm-24.7.28.dist-info → not1mm-24.7.31.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.0.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any