Merge branch 'master' into 482-cabrillo-exports-do-not-contain-the-correct-mode-identifiers-at-least-for-winter-field-day

Author: mbridak

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+- [2026-01-28] Merge pull request #485 from mbridak/484-1mm-doesnt-launch-if-the-route-to-flrig-fails
+  - Add TimeoutError handling in CAT class methods
+  - Add OSError handling in CAT class methods
 - [2026-01-24] Merge pull request #481 from mbridak/478-crashes-save-qso
   - Add error handling for data parsing in MainWindow class
 - [2026-01-23] Merge pull request #477 from mbridak/highlight-599

README.md

@@ -60,6 +60,9 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [2026-01-28] Merge pull request #485 from mbridak/484-1mm-doesnt-launch-if-the-route-to-flrig-fails
+  - Add TimeoutError handling in CAT class methods
+  - Add OSError handling in CAT class methods
 - [2026-01-24] Merge pull request #481 from mbridak/478-crashes-save-qso
   - Add error handling for data parsing in MainWindow class
 - [2026-01-23] Merge pull request #477 from mbridak/highlight-599

not1mm/lib/cat_interface.py

@@ -99,6 +99,8 @@ def __init__(self, interface: str, host: str, port: int) -> None:
                 http.client.BadStatusLine,
                 socket.error,
                 socket.gaierror,
+                TimeoutError,
+                OSError,
             ):
                 self.online = False
         elif self.interface == "rigctld":
@@ -271,6 +273,8 @@ def sendcwxmlrpc(self, texttosend):
             http.client.BadStatusLine,
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
+            TimeoutError,
+            OSError,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
@@ -290,6 +294,8 @@ def set_flrig_cw_send(self, send: bool) -> None:
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
             ValueError,
+            TimeoutError,
+            OSError,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
@@ -308,6 +314,8 @@ def set_flrig_cw_speed(self, speed):
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
             ValueError,
+            TimeoutError,
+            OSError,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
@@ -339,6 +347,8 @@ def __getvfo_flrig(self) -> str:
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
             AttributeError,
+            TimeoutError,
+            OSError,
         ) as exception:
             self.online = False
             logger.debug(f"{exception=}")
@@ -396,6 +406,8 @@ def __getmode_flrig(self) -> str:
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
             AttributeError,
+            TimeoutError,
+            OSError,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
@@ -454,6 +466,8 @@ def __getbw_flrig(self):
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
             AttributeError,
+            TimeoutError,
+            OSError,
         ) as exception:
             self.online = False
             logger.debug("getbw_flrig: %s", f"{exception}")
@@ -482,6 +496,8 @@ def __getpower_flrig(self):
             http.client.BadStatusLine,
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
+            TimeoutError,
+            OSError,
         ) as exception:
             self.online = False
             logger.debug("getpower_flrig: %s", f"{exception}")
@@ -528,6 +544,8 @@ def __getptt_flrig(self):
             http.client.BadStatusLine,
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
+            TimeoutError,
+            OSError,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
@@ -578,6 +596,8 @@ def __get_mode_list_flrig(self):
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
             AttributeError,
+            TimeoutError,
+            OSError,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
@@ -633,6 +653,8 @@ def __setvfo_flrig(self, freq: str) -> bool:
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
             AttributeError,
+            TimeoutError,
+            OSError,
         ) as exception:
             self.online = False
             logger.debug("setvfo_flrig: %s", f"{exception}")
@@ -685,6 +707,8 @@ def __setmode_flrig(self, mode: str) -> bool:
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
             AttributeError,
+            TimeoutError,
+            OSError,
         ) as exception:
             self.online = False
             logger.debug(f"{exception=}")
@@ -734,6 +758,8 @@ def __setpower_flrig(self, power):
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
             AttributeError,
+            TimeoutError,
+            OSError,
         ) as exception:
             self.online = False
             logger.debug("setpower_flrig: %s", f"{exception}")
@@ -805,6 +831,8 @@ def __ptt_on_flrig(self):
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
             AttributeError,
+            TimeoutError,
+            OSError,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
@@ -850,6 +878,8 @@ def __ptt_off_flrig(self):
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
             AttributeError,
+            TimeoutError,
+            OSError,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")
@@ -917,6 +947,8 @@ def __send_cat_string_flrig(self, cmd, thisishex):
             http.client.CannotSendRequest,
             http.client.ResponseNotReady,
             AttributeError,
+            TimeoutError,
+            OSError,
         ) as exception:
             self.online = False
             logger.debug("%s", f"{exception}")

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "26.1.24"
+__version__ = "26.1.28.1"

pyproject.toml

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