not1mm 24.7.19__py3-none-any.whl → 24.7.25.1__py3-none-any.whl

not1mm/data/k6gte-not1mm.desktop

@@ -7,4 +7,4 @@ Exec=not1mm
 Icon=k6gte-not1mm
 Terminal=false
 Type=Application
-Categories=HamRadio;
+Categories=Qt;Utility;HamRadio;ContactManagement;Database;

not1mm/lib/cat_interface.py

@@ -2,6 +2,20 @@
 K6GTE, CAT interface abstraction
 Email: michael.bridak@gmail.com
 GPL V3
+
+rig.cwio_set_wpm          n:i  set cwio WPM
+rig.cwio_text             i:s  send text via cwio interface
+rig.cwio_send             n:i  cwio transmit 1/0 (on/off)
+command lines to test the CW API via XMLRPC
+
+Setting WPM
+curl -d "<?xml version='1.0'?><methodCall><methodName>rig.cwio_set_wpm</methodName><params><param><value><i4>28</i4></value></param></params></methodCall>" http://localhost:12345 
+
+Setting the text to send
+curl -d "<?xml version='1.0'?><methodCall><methodName>rig.cwio_text</methodName><params><param><value><string>test test test</string></value></param></params></methodCall>" http://localhost:12345
+
+Enable send
+curl -d "<?xml version='1.0'?><methodCall><methodName>rig.cwio_send</methodName><params><param><value><i4>1</i4></value></param></params></methodCall>" http://localhost:12345
 """
 
 import logging
@@ -94,7 +108,7 @@ class CAT:
         """..."""
         logger.debug(f"{texttosend=} {self.interface=}")
         if self.interface == "flrig":
-            ...
+            self.sendcwxmlrpc(texttosend)
             return
         if self.interface == "rigctld":
             self.sendcwrigctl(texttosend)
@@ -117,6 +131,23 @@ class CAT:
 
     def sendcwxmlrpc(self, texttosend):
         """..."""
+        print(f"{texttosend=}")
+        try:
+            self.online = True
+            self.server.rig.cwio_send(1)
+            self.server.rig.cwio_text(texttosend)
+            return
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
+        ) as exception:
+            self.online = False
+            print("sendcwxmlrpc: %s", f"{exception}")
+            # logger.debug("sendcwxmlrpc: %s", f"{exception}")
+        return False
 
     def get_vfo(self) -> str:
         """Poll the radio for current vfo using the interface"""

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.7.19"
+__version__ = "24.7.25.1"

not1mm/vfo.py

@@ -39,6 +39,7 @@ class VfoWindow(QDockWidget):
     message_shown = False
     multicast_interface = None
     current_palette = None
+    device_reconnect = False
 
     def __init__(self):
         super().__init__()
@@ -64,6 +65,7 @@ class VfoWindow(QDockWidget):
         self.poll_rig_timer = QtCore.QTimer()
         self.poll_rig_timer.timeout.connect(self.poll_radio)
         self.poll_rig_timer.start(500)
+        self.visibilityChanged.connect(self.window_state_changed)
 
     def setDarkMode(self, dark: bool) -> None:
         """Forces a darkmode palette."""
@@ -178,27 +180,37 @@ class VfoWindow(QDockWidget):
                 if "vfoknob" in data.decode().strip():
                     return device
 
-    def setup_serial(self) -> None:
+    def window_state_changed(self):
+        """Setup vfo knob if window is toggled on"""
+
+        if self.isVisible():
+            self.setup_serial()
+
+    def setup_serial(self, supress_msg=False) -> None:
         """
         Setup the device returned by discover_device()
         Or display message saying we didn't find one.
         """
 
+        if not self.isVisible():
+            return
+
         device = self.discover_device()
         if device:
             try:
                 self.pico = serial.Serial("/dev/serial/by-id/" + device, 115200)
                 self.pico.timeout = 100
                 self.lcdNumber.setStyleSheet("QLCDNumber { color: white; }")
+                self.device_reconnect = True
             except OSError:
-                if self.message_shown is False:
+                if self.message_shown is False and supress_msg is False:
                     self.message_shown = True
                     self.show_message_box(
                         "Unable to locate or open the VFO knob serial device."
                     )
                 self.lcdNumber.setStyleSheet("QLCDNumber { color: red; }")
         else:
-            if self.message_shown is False:
+            if self.message_shown is False and supress_msg is False:
                 self.message_shown = True
                 self.show_message_box(
                     "Unable to locate or open the VFO knob serial device."
@@ -269,13 +281,14 @@ class VfoWindow(QDockWidget):
                     return
                 if vfo < 1700000 or vfo > 60000000:
                     return
-                if vfo != self.old_vfo:
+                if vfo != self.old_vfo or self.device_reconnect is True:
                     self.old_vfo = vfo
                     logger.debug(f"{vfo}")
                     self.showNumber(vfo)
                     # self.lcdNumber.display(dnum)
                     # app.processEvents()
                     cmd = f"F {vfo}\r"
+                    self.device_reconnect = False
                     try:
                         if self.pico:
                             self.pico.write(cmd.encode())
@@ -302,10 +315,14 @@ class VfoWindow(QDockWidget):
                             self.showNumber(result)
                             # self.lcdNumber.display(result)
                             # app.processEvents()
+            else:
+                self.setup_serial(supress_msg=True)
         except OSError:
             logger.critical("Unable to write to serial device.")
+            self.pico = None
         except AttributeError:
             logger.critical("Unable to write to serial device.")
+            self.pico = None
         # app.processEvents()
 
     def show_message_box(self, message: str) -> None:

{not1mm-24.7.19.dist-info → not1mm-24.7.25.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.7.19
+Version: 24.7.25.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -223,6 +223,9 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [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.
+- [24-7-25] Maybe let flrig send CW... Probably not.
 - [24-7-19] Use Qt's QSettings to store window and dockwidgets states.
 - [24-7-13] Trap Exceptions in flrig xmlrpc client.
 

{not1mm-24.7.19.dist-info → not1mm-24.7.25.1.dist-info}/RECORD

@@ -6,7 +6,7 @@ not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
 not1mm/logwindow.py,sha256=pwhiwolmGnW01LF4sjlu3ywLsgfxL6KuGuKuYKYmgeY,44403
 not1mm/playsoundtest.py,sha256=_kvvOfgs-u-H4kVSiSlnDtn9HWv0RiJQybkv24CEngc,464
 not1mm/radio.py,sha256=eiB04LPMPBeMrBRI021Z7VXth66EOYb0Ujh11T9877c,3362
-not1mm/vfo.py,sha256=FVuRjA8LCLkt8pZ3enBuCcxLJchb1ysvaMnX0txrZSs,12038
+not1mm/vfo.py,sha256=ZJYJHMUrvAWX_c4xXDOuxkbE9sFuF8THoqJXaz0e_AU,12663
 not1mm/voice_keying.py,sha256=fkexCCwWcZsXxYVAk0QGcpGbLjbS10ToxWtdKihIVM4,3152
 not1mm/data/JetBrainsMono-Regular.ttf,sha256=UOHctAKY_PzCGh7zy-6f6egnCcSK0wzmF0csBqO9lDY,203952
 not1mm/data/MASTER.SCP,sha256=CEjRJNnjBZJlhCi3UFS1qCVMjDqQwhlfk0yZ_os6myI,366153
@@ -23,7 +23,7 @@ not1mm/data/donors.html,sha256=8hNzO3Q5a6p-_3egT1hfOjimPf810tKMUM5ukLzUsGM,116
 not1mm/data/editcontact.ui,sha256=ax-pm4TeECpHl3LSb5z4L403WjPWXZ9KV2it_6gIjqk,27404
 not1mm/data/editmacro.ui,sha256=wbLuNwLsMBd9hEKs_6sH3ir5BynH9Bk-u8nWRjNyQ8w,2689
 not1mm/data/greendot.png,sha256=6h6KFMj5mmu07ppPWXXewH0PLAvbOOre-5z6rpzWLLo,474
-not1mm/data/k6gte-not1mm.desktop,sha256=bSiSG7PzGygv0bBaF7Nf48PApVyrobSBVNk7j7wRCqo,205
+not1mm/data/k6gte-not1mm.desktop,sha256=dUi-YbHbavOsL3A29eglDQ0p1_cSKzJeEGQ52Qv_eKo,243
 not1mm/data/k6gte.not1mm-128.png,sha256=ZP93MfRqr4WwsFCwg1m5MZjLs8bG895vDW9DDDn1B_Q,6076
 not1mm/data/k6gte.not1mm-32.png,sha256=XdTsCa3xqwTfn26Ga7RwO_Vlbg_77RKkSc8bMxVcCac,1526
 not1mm/data/k6gte.not1mm-64.png,sha256=6ku45Gq1g5ezh04F07osoKRtanb3e4kbx5XdIEh3N90,2925
@@ -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=NDlS4vdlH18oCgvXNjqFVymCAKJKyUNh6g1hmKwoV7k,16964
+not1mm/lib/cat_interface.py,sha256=-ri3woVU_Q7r7usf5y15lm_9CQVxTgBYn2CSXt48ihg,18390
 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=X7UsWTkmHNoMFl40ndtGBSQuMBMqWBxeRhSrC6sjElw,48
+not1mm/lib/version.py,sha256=vCCHd-NGTIRQF1HQqLA4TFjkjFR_ZtwCDpkOE8lTF1M,50
 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.19.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.7.19.dist-info/METADATA,sha256=EdsnUz2o1LrulLIrNHTDLohqKB56-4s8S5VNWk5bWDw,29186
-not1mm-24.7.19.dist-info/WHEEL,sha256=rWxmBtp7hEUqVLOnTaDOPpR-cZpCDkzhhcBce-Zyd5k,91
-not1mm-24.7.19.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.7.19.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.7.19.dist-info/RECORD,,
+not1mm-24.7.25.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.7.25.1.dist-info/METADATA,sha256=F72Ht3kFbVRg_dd4Y24UagfXACEBvjkEvrQO9ScxBRU,29413
+not1mm-24.7.25.1.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
+not1mm-24.7.25.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.7.25.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.7.25.1.dist-info/RECORD,,

{not1mm-24.7.19.dist-info → not1mm-24.7.25.1.dist-info}/WHEEL

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