not1mm 24.7.12__py3-none-any.whl → 24.7.13__py3-none-any.whl

not1mm/__main__.py

@@ -2863,7 +2863,7 @@ class MainWindow(QtWidgets.QMainWindow):
         None
         """
 
-        if mode == "CW":
+        if mode in ("CW", "CW-U", "CW-L"):
             self.setmode("CW")
             self.radio_state["mode"] = "CW"
             if self.rig_control:
@@ -3015,7 +3015,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def setmode(self, mode: str) -> None:
         """Call when the mode changes."""
-        if mode == "CW":
+        if mode in ("CW", "CW-U", "CW-L"):
             if self.current_mode != "CW":
                 self.current_mode = "CW"
                 self.sent.setText("599")
@@ -3032,7 +3032,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.receive.setText("59")
                 self.read_cw_macros()
             return
-        if mode == "RTTY":
+        if mode in ("RTTY", "DIGI-U", "DIGI-L"):
             if self.current_mode != "RTTY":
                 self.current_mode = "RTTY"
                 self.sent.setText("59")
@@ -3145,7 +3145,7 @@ class MainWindow(QtWidgets.QMainWindow):
             info_dirty = True
             self.radio_state["bw"] = bw
 
-        if mode == "CW":
+        if mode in ("CW", "CW-U", "CW-L"):
             self.setmode(mode)
         if mode == "LSB" or mode == "USB":
             self.setmode("SSB")
@@ -3153,26 +3153,29 @@ class MainWindow(QtWidgets.QMainWindow):
             self.setmode("RTTY")
 
         if info_dirty:
-            logger.debug("VFO: %s  MODE: %s BW: %s", vfo, mode, bw)
-            self.set_window_title()
-            cmd = {}
-            cmd["cmd"] = "RADIO_STATE"
-            cmd["station"] = platform.node()
-            cmd["band"] = band
-            cmd["vfoa"] = vfo
-            cmd["mode"] = mode
-            cmd["bw"] = bw
-            self.multicast_interface.send_as_json(cmd)
-            if self.n1mm:
-                if self.n1mm.send_radio_packets:
-                    self.n1mm.radio_info["Freq"] = vfo[:-1]
-                    self.n1mm.radio_info["TXFreq"] = vfo[:-1]
-                    self.n1mm.radio_info["Mode"] = mode
-                    self.n1mm.radio_info["OpCall"] = self.current_op
-                    self.n1mm.radio_info["IsRunning"] = str(
-                        self.pref.get("run_state", False)
-                    )
-                    self.n1mm.send_radio()
+            try:
+                logger.debug("VFO: %s  MODE: %s BW: %s", vfo, mode, bw)
+                self.set_window_title()
+                cmd = {}
+                cmd["cmd"] = "RADIO_STATE"
+                cmd["station"] = platform.node()
+                cmd["band"] = band
+                cmd["vfoa"] = vfo
+                cmd["mode"] = mode
+                cmd["bw"] = bw
+                self.multicast_interface.send_as_json(cmd)
+                if self.n1mm:
+                    if self.n1mm.send_radio_packets:
+                        self.n1mm.radio_info["Freq"] = vfo[:-1]
+                        self.n1mm.radio_info["TXFreq"] = vfo[:-1]
+                        self.n1mm.radio_info["Mode"] = mode
+                        self.n1mm.radio_info["OpCall"] = self.current_op
+                        self.n1mm.radio_info["IsRunning"] = str(
+                            self.pref.get("run_state", False)
+                        )
+                        self.n1mm.send_radio()
+            except TypeError as err:
+                logger.debug(f"{err=} {vfo=} {the_dict=}")
 
     def edit_cw_macros(self) -> None:
         """

not1mm/lib/cat_interface.py

@@ -138,6 +138,8 @@ class CAT:
             ConnectionRefusedError,
             xmlrpc.client.Fault,
             http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
         ) as exception:
             self.online = False
             logger.debug("getvfo_flrig: %s", f"{exception}")
@@ -177,6 +179,8 @@ class CAT:
             ConnectionRefusedError,
             xmlrpc.client.Fault,
             http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
@@ -220,6 +224,8 @@ class CAT:
             ConnectionRefusedError,
             xmlrpc.client.Fault,
             http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
         ) as exception:
             self.online = False
             logger.debug("getbw_flrig: %s", f"{exception}")
@@ -261,6 +267,8 @@ class CAT:
             ConnectionRefusedError,
             xmlrpc.client.Fault,
             http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
         ) as exception:
             self.online = False
             logger.debug("getpower_flrig: %s", f"{exception}")
@@ -295,6 +303,8 @@ class CAT:
             ConnectionRefusedError,
             xmlrpc.client.Fault,
             http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
@@ -333,6 +343,8 @@ class CAT:
             ConnectionRefusedError,
             xmlrpc.client.Fault,
             http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
         ) as exception:
             self.online = False
             logger.debug("setvfo_flrig: %s", f"{exception}")
@@ -371,6 +383,8 @@ class CAT:
             ConnectionRefusedError,
             xmlrpc.client.Fault,
             http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
         ) as exception:
             self.online = False
             logger.debug("setmode_flrig: %s", f"{exception}")
@@ -408,6 +422,8 @@ class CAT:
             ConnectionRefusedError,
             xmlrpc.client.Fault,
             http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
         ) as exception:
             self.online = False
             logger.debug("setpower_flrig: %s", f"{exception}")
@@ -462,6 +478,8 @@ class CAT:
             ConnectionRefusedError,
             xmlrpc.client.Fault,
             http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
@@ -496,6 +514,8 @@ class CAT:
             ConnectionRefusedError,
             xmlrpc.client.Fault,
             http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")

not1mm/lib/ham_utility.py

@@ -242,7 +242,7 @@ def fakefreq(band: str, mode: str) -> str:
         "80": ["3530", "3559", "3970"],
         "60": ["5332", "5373", "5405"],
         "40": ["7030", "7040", "7250"],
-        "30": ["10130", "10130", "0000"],
+        "30": ["10130", "10130", "10130"],
         "20": ["14030", "14070", "14250"],
         "17": ["18080", "18100", "18150"],
         "15": ["21065", "21070", "21200"],

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.7.12"
+__version__ = "24.7.13"

{not1mm-24.7.12.dist-info → not1mm-24.7.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.7.12
+Version: 24.7.13
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -223,8 +223,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [24-6-27] Corrected ADIF contest_id for the Phone Weekly Test.
-- [24-6-1] Added leading zeros to S/N's less than 100.
+- [24-7-13] Trap Exceptions in flrig xmlrpc client.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 

{not1mm-24.7.12.dist-info → not1mm-24.7.13.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=_TKcKM99SBbp_ut6Q8gjMHaDMOmHbN7i7fxFkTxQ4WE,120468
+not1mm/__main__.py,sha256=OIQmaLr7Fs3ODGt5J0OnUXxArTysREun1A2nRE-5wYU,120737
 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=GP06hWIFrM_6hFQCJEq6QuNF8HaZn4UojIOlt_iWLDA,16042
+not1mm/lib/cat_interface.py,sha256=E0e1WRhXTbmXO21touJLFs9lCYSwaxSEu5mfNpB_sZg,16892
 not1mm/lib/cwinterface.py,sha256=Q8p3pScOHczZ8ptICfH1Yu6rCEwQJLgrNwYMN76B2i8,3389
 not1mm/lib/database.py,sha256=RQoj3JsTejMiiFIN42lY3N4jrj80htftdoFeRqVKnKs,42480
 not1mm/lib/edit_contact.py,sha256=Ki9bGPpqyQQBB1cU8VIBDCal3lbXeQ6qxhzklmhE2_w,353
@@ -99,7 +99,7 @@ not1mm/lib/edit_macro.py,sha256=raKWBwsHInj5EUKmvyLQ6gqc3ZFDlstsD3xqoM4PC8E,517
 not1mm/lib/edit_opon.py,sha256=j3qJ1aBsQoIOnQ9yiBl3lyeISvKTP0I_rtBYBPAfgeI,359
 not1mm/lib/edit_station.py,sha256=doL21Hs6jzIE43ohAopdFt_iqnRJZHFcqzcnCS0-iio,1965
 not1mm/lib/ft8_watcher.py,sha256=ISfXjs-Mgbz_lE5SThEnFoCe8apNLElgSuECAMCH18I,4080
-not1mm/lib/ham_utility.py,sha256=pUrysod3wGk4BYOWDAKJxZZTiUNDE4ZzRk8S5ZnllNA,10978
+not1mm/lib/ham_utility.py,sha256=rHYTHxeoMhpzmh_J6jEqCPJmVLpJbM2o4mbvydGLyvE,10979
 not1mm/lib/lookup.py,sha256=F2fl5QkMxaGSxl1XMWnLUub3T9Mt7LhCX4acOlAsks4,13952
 not1mm/lib/multicast.py,sha256=bnFUNHyy82GmIb3_88EPBVVssj7-HzkJPaH671cK8Qw,3249
 not1mm/lib/n1mm.py,sha256=H54mpgJF0GAmKavM-nb5OAq2SJFWYkux4eMWWiSRxJc,6288
@@ -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=GU472NlfU4i1_wp9gzGVF_EUTCzxGbutRBhtobYOBUM,48
+not1mm/lib/version.py,sha256=fcosrUBBIZb-_oOavjoYpxsk9G56vUMzt8LVSpPq16U,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
@@ -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.12.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.7.12.dist-info/METADATA,sha256=-XcWXP18GZTwcOb-VHquXOxgK1sfvIFx12-UdFhz4TY,29183
-not1mm-24.7.12.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-not1mm-24.7.12.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.7.12.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.7.12.dist-info/RECORD,,
+not1mm-24.7.13.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.7.13.dist-info/METADATA,sha256=8SqV2K1n5M8QA0zqtj0JSRXzPuajYxGQ-RUG1qL_0u0,29115
+not1mm-24.7.13.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+not1mm-24.7.13.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.7.13.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.7.13.dist-info/RECORD,,