not1mm 24.9.22__py3-none-any.whl → 24.9.23__py3-none-any.whl

not1mm/__main__.py

@@ -2342,7 +2342,15 @@ class MainWindow(QtWidgets.QMainWindow):
             self.voice_process.voice_string(self.process_macro(function_key.toolTip()))
             # self.voice_string(self.process_macro(function_key.toolTip()))
             return
-        if self.radio_state.get("mode") in ["RTTY"]:
+        if self.radio_state.get("mode") in [
+            "RTTY",
+            "USB-D",
+            "LSB-D",
+            "PKTLSB",
+            "PKTUSB",
+            "DIGI-U",
+            "DIGI-L",
+        ]:
             self.fldigi_util.send_string(self.process_macro(function_key.toolTip()))
         if self.cw:
             if self.pref.get("cwtype") == 3 and self.rig_control is not None:
@@ -3210,6 +3218,10 @@ class MainWindow(QtWidgets.QMainWindow):
         self.contact["Band"] = get_logged_band(str(vfo))
         self.set_band_indicator(band)
 
+        if self.rig_control:
+            if self.rig_control.online:
+                self.rig_control.get_modes()
+
         if self.radio_state.get("mode") != mode:
             info_dirty = True
             self.radio_state["mode"] = mode

not1mm/data/rttymacros.txt

@@ -1,5 +1,5 @@
 S|F1|MyCall|{MYCALL}
-S|F2|Exch|{EXCH}
+S|F2|Exch|{SNT} {EXCH}
 S|F3|My NR|{SENTNR}
 S|F4|empty| 
 S|F5|AGN|agn
@@ -12,7 +12,7 @@ S|F11|NR??|NR?
 S|F12|TU|tu
 R|F1|Run CQ|cq test {MYCALL} {MYCALL} test
 R|F2|HisCall|{HISCALL}
-R|F3|Run Exch|{HISCALL} {SNT} {SENTNR}
+R|F3|Run Exch|{HISCALL} {SNT} {EXCH}
 R|F4|Run TU|tu {MYCALL} qrz
 R|F5|MyCall|{MYCALL}
 R|F6|MyNR|{SENTNR}

not1mm/lib/cat_interface.py

@@ -90,7 +90,7 @@ class CAT:
     def __initialize_rigctrld(self):
         try:
             self.rigctrlsocket = socket.socket()
-            self.rigctrlsocket.settimeout(0.5)
+            self.rigctrlsocket.settimeout(0.1)
             self.rigctrlsocket.connect((self.host, self.port))
             logger.debug("Connected to rigctrld")
             self.online = True
@@ -104,6 +104,18 @@ class CAT:
         if self.interface == "rigctld":
             self.__initialize_rigctrld()
 
+    def __get_serial_string(self):
+        """Gets any serial data waiting"""
+        dump = ""
+        thegrab = ""
+        try:
+            while True:
+                thegrab += self.rigctrlsocket.recv(1024).decode()
+                dump += thegrab
+        except socket.error:
+            ...
+        return dump
+
     def sendcw(self, texttosend):
         """..."""
         logger.debug(f"{texttosend=} {self.interface=}")
@@ -119,7 +131,7 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(bytes(f"b{texttosend}\n", "utf-8"))
-                _ = self.rigctrlsocket.recv(1024).decode().strip()
+                _ = self.__get_serial_string()
                 return True
             except socket.error as exception:
                 self.online = False
@@ -216,7 +228,7 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(b"f\n")
-                return self.rigctrlsocket.recv(1024).decode().strip()
+                return self.__get_serial_string().strip()
             except socket.error as exception:
                 self.online = False
                 logger.debug("getvfo_rigctld: %s", f"{exception}")
@@ -237,6 +249,8 @@ class CAT:
 
     def __getmode_flrig(self) -> str:
         """Returns mode via flrig"""
+        # QMX ['CW-U', 'CW-L', 'DIGI-U', 'DIGI-L']
+        # 7300 ['LSB', 'USB', 'AM', 'FM', 'CW', 'CW-R', 'RTTY', 'RTTY-R', 'LSB-D', 'USB-D', 'AM-D', 'FM-D']
         try:
             self.online = True
             return self.server.rig.get_mode()
@@ -253,11 +267,13 @@ class CAT:
 
     def __getmode_rigctld(self) -> str:
         """Returns mode vai rigctld"""
+        # QMX 'AM CW USB LSB RTTY FM CWR RTTYR'
+        # 7300 'AM CW USB LSB RTTY FM CWR RTTYR PKTLSB PKTUSB FM-D AM-D'
         if self.rigctrlsocket:
             try:
                 self.online = True
                 self.rigctrlsocket.send(b"m\n")
-                mode = self.rigctrlsocket.recv(1024).decode()
+                mode = self.__get_serial_string()
                 mode = mode.strip().split()[0]
                 # logger.debug("%s", mode)
                 return mode
@@ -302,7 +318,7 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(b"m\n")
-                mode = self.rigctrlsocket.recv(1024).decode()
+                mode = self.__get_serial_string()
                 mode = mode.strip().split()[1]
                 # logger.debug("%s", mode)
                 return mode
@@ -344,7 +360,7 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(b"l RFPOWER\n")
-                return int(float(self.rigctrlsocket.recv(1024).decode().strip()) * 100)
+                return int(float(self.__get_serial_string().strip()) * 100)
             except socket.error as exception:
                 self.online = False
                 logger.debug("getpower_rigctld: %s", f"{exception}")
@@ -381,7 +397,7 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(b"t\n")
-                ptt = self.rigctrlsocket.recv(1024).decode()
+                ptt = self.__get_serial_string()
                 logger.debug("%s", ptt)
                 ptt = ptt.strip()
                 return ptt
@@ -391,6 +407,49 @@ class CAT:
                 self.rigctrlsocket = None
         return "0"
 
+    def get_mode_list(self):
+        "Get a list of modes supported by the radio"
+        if self.interface == "flrig":
+            return self.__get_mode_list_flrig()
+        if self.interface == "rigctld":
+            return self.__get_mode_list_rigctld()
+        return False
+
+    def __get_mode_list_flrig(self):
+        """Returns list of modes supported by the radio"""
+        try:
+            self.online = True
+            return self.server.rig.get_modes()
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
+        ) as exception:
+            self.online = False
+            logger.debug("%s", f"{exception}")
+        return ""
+
+    def __get_mode_list_rigctld(self):
+        """Returns list of modes supported by the radio"""
+        # Mode list: AM CW USB LSB RTTY FM CWR RTTYR
+        if self.rigctrlsocket:
+            try:
+                self.online = True
+                self.rigctrlsocket.send(b"1\n")
+                dump = self.__get_serial_string()
+                for line in dump.splitlines():
+                    if "Mode list:" in line:
+                        modes = line.split(":")[1].strip()
+                        return modes
+                return ""
+            except socket.error as exception:
+                self.online = False
+                logger.debug("%s", f"{exception}")
+                self.rigctrlsocket = None
+        return ""
+
     def set_vfo(self, freq: str) -> bool:
         """Sets the radios vfo"""
         try:
@@ -424,7 +483,7 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(bytes(f"F {freq}\n", "utf-8"))
-                _ = self.rigctrlsocket.recv(1024).decode().strip()
+                _ = self.__get_serial_string()
                 return True
             except socket.error as exception:
                 self.online = False
@@ -464,7 +523,7 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(bytes(f"M {mode} 0\n", "utf-8"))
-                _ = self.rigctrlsocket.recv(1024).decode().strip()
+                _ = self.__get_serial_string()
                 return True
             except socket.error as exception:
                 self.online = False
@@ -503,7 +562,7 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(rig_cmd)
-                _ = self.rigctrlsocket.recv(1024).decode().strip()
+                _ = self.__get_serial_string()
             except socket.error:
                 self.online = False
                 self.rigctrlsocket = None
@@ -532,7 +591,7 @@ class CAT:
         try:
             self.online = True
             self.rigctrlsocket.send(rig_cmd)
-            _ = self.rigctrlsocket.recv(1024).decode().strip()
+            _ = self.__get_serial_string()
         except socket.error:
             self.online = False
             self.rigctrlsocket = None
@@ -568,7 +627,7 @@ class CAT:
         try:
             self.online = True
             self.rigctrlsocket.send(rig_cmd)
-            _ = self.rigctrlsocket.recv(1024).decode().strip()
+            _ = self.__get_serial_string()
         except socket.error:
             self.online = False
             self.rigctrlsocket = None

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.9.22"
+__version__ = "24.9.23"

not1mm/radio.py

@@ -34,6 +34,7 @@ class Radio(QObject):
     interface = None
     host = None
     port = None
+    modes = ""
 
     def __init__(self, interface: str, host: str, port: int) -> None:
         super().__init__()
@@ -45,6 +46,7 @@ class Radio(QObject):
     def run(self):
         try:
             self.cat = CAT(self.interface, self.host, self.port)
+            self.modes = self.cat.get_mode_list()
         except ConnectionResetError:
             ...
         while not self.time_to_quit:
@@ -113,6 +115,9 @@ class Radio(QObject):
             }
         )
 
+    def get_modes(self):
+        return self.modes
+
     def ptt_on(self):
         if self.cat:
             self.cat.ptt_on()

not1mm/test.py

@@ -11,18 +11,30 @@
 # xml = '<?xml version="1.0"?>\n<HamQTH version="2.8" xmlns="https://www.hamqth.com">\n    <search>\n        <callsign>K6GTE</callsign>\n        <nick>Mike</nick>\n        <qth>Anaheim</qth>\n        <country>United States</country>\n        <adif>291</adif>\n        <itu>6</itu>\n        <cq>3</cq>\n        <grid>DM13AT</grid>\n        <adr_name>Michael C Bridak</adr_name>\n        <adr_street1>2854 W Bridgeport Ave</adr_street1>\n        <adr_city>Anaheim</adr_city>\n        <adr_zip>92804</adr_zip>\n        <adr_country>United States</adr_country>\n        <adr_adif>291</adr_adif>\n        <us_state>CA</us_state>\n        <us_county>Orange</us_county>\n        <lotw>Y</lotw>\n        <qsldirect>Y</qsldirect>\n        <qsl>?</qsl>\n        <eqsl>N</eqsl>\n        <email>michael.bridak@gmail.com</email>\n        <birth_year>1967</birth_year>\n        <lic_year>2017</lic_year>\n        <latitude>33.81</latitude>\n        <longitude>-117.97</longitude>\n        <continent>NA</continent>\n        <utc_offset>-8</utc_offset>\n        <picture>https://www.hamqth.com/userfiles/k/k6/k6gte/_header/header.jpg?ver=3</picture>\n    </search>\n</HamQTH>'
 # result = xmltodict.parse(xml)
 
-import xmlrpc.client
+# import xmlrpc.client
+
+# target = "http://127.0.0.1:7362"
+# payload = "Hello^r"
+# response = ""
+
+# try:
+#     server = xmlrpc.client.ServerProxy(target)
+#     response = server.logbook.last_record()
+#     response = server.main.tx()
+#     response = server.text.add_tx(payload)
+# except ConnectionRefusedError:
+#     ...
+
+# print(f"{response=}")
+
+
+# from not1mm.radio import Radio
+from not1mm.lib.cat_interface import CAT
 
-target = "http://127.0.0.1:7362"
-payload = "Hello^r"
-response = ""
+rig_control = CAT("rigctld", "127.0.0.1", 4532)
 
-try:
-    server = xmlrpc.client.ServerProxy(target)
-    response = server.logbook.last_record()
-    response = server.main.tx()
-    response = server.text.add_tx(payload)
-except ConnectionRefusedError:
-    ...
+modes = rig_control.get_mode_list()
+vfo = rig_control.get_vfo()
 
-print(f"{response=}")
+print(f"{modes=}\n")
+print(f"{vfo=}")

{not1mm-24.9.22.dist-info → not1mm-24.9.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.22
+Version: 24.9.23
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -230,6 +230,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-23] Improved serial interface to rigctld. Send RTTY macros to fldigi when radio modes are RTTY, USB-D, LSB-D, PKTLSB, PKTUSB, DIGI-U, DIGI-L.
 - [24-9-22] Merged in changes for CQ WW RTTY
 - [24-9-15] Fixing an ARRL VHF Cabrillo format error.
 - [24-9-14] BugFix. Starting lookups fail init if no settings.

{not1mm-24.9.22.dist-info → not1mm-24.9.23.dist-info}/RECORD

@@ -1,12 +1,12 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=pL5h_vkYiwspk-dvc5vHQDDQ6WwNICf1Tw0qsHbon6Q,126675
+not1mm/__main__.py,sha256=V43gwbqBhUAPw8HfjTcYbA61nzejpcQJSIYoXk5BKY0,126943
 not1mm/bandmap.py,sha256=1b5tXCfGTnpqqn6hPNt7zRA8SmuwSXzSwNHZXhCRt70,31434
 not1mm/checkwindow.py,sha256=aI-nr8OF90IWV7R_XRdmitvBJ9M85evCs72HoU3Jnvc,10374
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
 not1mm/logwindow.py,sha256=pwhiwolmGnW01LF4sjlu3ywLsgfxL6KuGuKuYKYmgeY,44403
 not1mm/lookupservice.py,sha256=jsFg5tsB9cVnahLP-hI3CMwbjlEpMx944O8RLWntAy4,3342
-not1mm/radio.py,sha256=eiB04LPMPBeMrBRI021Z7VXth66EOYb0Ujh11T9877c,3362
-not1mm/test.py,sha256=u9BnCjgG1VYtrVNguazNZlrpzSFzePfpqKWgsGS_OR8,2046
+not1mm/radio.py,sha256=x2Oz1688uTPrq3YOwUiY3eMc4XUkkAZJpEajCKJEbwM,3479
+not1mm/test.py,sha256=b9Ro2bRdf4HOmiKQsLRk_dTm-CQLvpmnEEZq768v-ro,2299
 not1mm/vfo.py,sha256=IvmUQYMIPzLJw_BHQGis4J_IEW-vlBtdfxZLXPh7OzI,12335
 not1mm/voice_keying.py,sha256=sA3gw5_k7kShTg2qhG7HkKDM5M6KheJVRkAc_C7mxDk,3006
 not1mm/data/JetBrainsMono-ExtraLight.ttf,sha256=g5Hn7BPounWMGDj1a8zZcyKMz03HSqW__pUluRR7Evg,274144
@@ -39,7 +39,7 @@ not1mm/data/radio_green.png,sha256=PXlvRI2x0C8yLVkxRwrZe6tex8k9GtM-1Cj2Vy6KP7o,1
 not1mm/data/radio_grey.png,sha256=9eOtMHDpQvRYY29D7_vPeacWbwotRXZTMm8EiHE9TW0,1258
 not1mm/data/radio_red.png,sha256=QvkMk7thd_hCEIyK5xGAG4xVVXivl39nwOfD8USDI20,957
 not1mm/data/reddot.png,sha256=M33jEMoU8W4rQ4_MVyzzKxDPDte1ypKBch5VnUMNLKE,565
-not1mm/data/rttymacros.txt,sha256=7_KwLqj_bv-6boD9OD7c8OY3SCc9diqmCTs5zjMf2LM,443
+not1mm/data/rttymacros.txt,sha256=BRf0JJtHZylTAvpmxHS6hlanHgybZoLyDMqdif9rODY,447
 not1mm/data/settings.ui,sha256=NyHFUb3ZFEgZ4bYB3O7qlO_0TvZwcc9SFPr7z9nF6kk,40123
 not1mm/data/splash.png,sha256=85_BQotR1q24uCthrKm4SB_6ZOMwRjR-Jdp1XBHSTyg,5368
 not1mm/data/ssbmacros.txt,sha256=0Qccj4y0nlK-w5da9a9ti-jILkURtwztoDuL_D0pEJM,470
@@ -94,7 +94,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=aazvNTSeZAROq3KL8gPx-I95iVez2IiIOSk22qeqVCQ,19502
+not1mm/lib/cat_interface.py,sha256=FfLldMH4FayArOcwoZBQT3vTU2RoiG7dmaT922Z8i2Y,21459
 not1mm/lib/cwinterface.py,sha256=FrVB-MfK7CYU2QNjAK7ERrruKTL_NkHpBPIFNNaTvp4,3645
 not1mm/lib/database.py,sha256=nUVG5H2Dy98PGp6Qdr3xU7zM8-8-IiyqRkXZWlWzIe8,44446
 not1mm/lib/edit_contact.py,sha256=Ki9bGPpqyQQBB1cU8VIBDCal3lbXeQ6qxhzklmhE2_w,353
@@ -114,7 +114,7 @@ not1mm/lib/plugin_common.py,sha256=HbphFFzU1XIIHgsCHOb_tCAnQyqT-nYnxoiz1oZ2_cg,9
 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=rzvnS32IOLUxVVYT-FaUV8u8GQ0hORXp9lM6MDH2jeA,48
+not1mm/lib/version.py,sha256=KsnGHengWCv9w4hEEpMncmQfrgUm2Ng8DMA65PR0T5o,48
 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
@@ -156,9 +156,9 @@ not1mm/plugins/ref_cw.py,sha256=aWjHHkqIKutjRUtzh09y5haFfnZK9poRQDWRQMDRxxU,1632
 not1mm/plugins/stew_perry_topband.py,sha256=CKBQbYl4ETxhXJd2dma4fg_C5pag_s7Nf61SCztZtqE,10668
 not1mm/plugins/weekly_rtty.py,sha256=DQcy3SY0Zn56EdlYGf3NxrRhTnkNa5IqRQPRQdKDSPs,14255
 not1mm/plugins/winter_field_day.py,sha256=4rcfRtobwjHO6BNL3WOTHzBmyyeuX79BNGBG8PfjrI8,10238
-not1mm-24.9.22.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.9.22.dist-info/METADATA,sha256=qTy5raAHe86J7JznMAMw_XrkjZacL_mw9DkfvyrdLcs,31273
-not1mm-24.9.22.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-not1mm-24.9.22.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.9.22.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.9.22.dist-info/RECORD,,
+not1mm-24.9.23.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.9.23.dist-info/METADATA,sha256=UNYhVlycDl_2wQtVOiFN_f2Rs0rlyOUNY-WvZaqM58Y,31423
+not1mm-24.9.23.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+not1mm-24.9.23.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.9.23.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.9.23.dist-info/RECORD,,