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

not1mm/__main__.py

@@ -66,6 +66,7 @@ from not1mm.lib.version import __version__
 from not1mm.lib.versiontest import VersionTest
 from not1mm.lib.ft8_watcher import FT8Watcher
 from not1mm.lib.fldigi_watcher import FlDigiWatcher
+from not1mm.lib.fldigi_sendstring import FlDigi_Comm
 
 import not1mm.fsutils as fsutils
 from not1mm.logwindow import LogWindow
@@ -172,6 +173,7 @@ class MainWindow(QtWidgets.QMainWindow):
     bandmap_window = None
     vfo_window = None
     lookup_service = None
+    fldigi_util = None
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -611,18 +613,19 @@ class MainWindow(QtWidgets.QMainWindow):
 
         """
 
-        datadict = {}
-        splitdata = result.upper().strip().split("<")
-        for data in splitdata:
-            if data:
-                tag = data.split(":")
-                if tag == ["EOR>"]:
-                    break
-                datadict[tag[0]] = tag[1].split(">")[1].strip()
-        logger.debug(f"{datadict=}")
-        if hasattr(self.contest, "ft8_handler"):
-            self.contest.set_self(self)
-            self.contest.ft8_handler(datadict)
+        if result and result != "NONE":
+            datadict = {}
+            splitdata = result.upper().strip().split("<")
+            for data in splitdata:
+                if data:
+                    tag = data.split(":")
+                    if tag == ["EOR>"]:
+                        break
+                    datadict[tag[0]] = tag[1].split(">")[1].strip()
+            logger.debug(f"{datadict=}")
+            if hasattr(self.contest, "ft8_handler"):
+                self.contest.set_self(self)
+                self.contest.ft8_handler(datadict)
 
     def setDarkMode(self, setdarkmode=False) -> None:
         """Forces a darkmode palette."""
@@ -1897,7 +1900,7 @@ class MainWindow(QtWidgets.QMainWindow):
             self.score.setText(str(score))
             self.contest.reset_label(self)
             if self.contest.name != "ICWC Medium Speed Test":
-                if self.current_mode == "CW":
+                if self.current_mode in ("CW", "RTTY"):
                     self.sent.setText("599")
                     self.receive.setText("599")
                 else:
@@ -1951,7 +1954,7 @@ class MainWindow(QtWidgets.QMainWindow):
             "MSK144",
             "JT65",
             "JT9",
-            "Q65"
+            "Q65",
         ):
             self.contact["Freq"] = round(
                 float(self.radio_state.get("vfoa", 0.0)) / 1000, 2
@@ -2339,6 +2342,16 @@ 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",
+            "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:
                 self.rig_control.sendcw(self.process_macro(function_key.toolTip()))
@@ -2480,6 +2493,8 @@ class MainWindow(QtWidgets.QMainWindow):
         except (RuntimeError, AttributeError):
             ...
 
+        self.fldigi_util = FlDigi_Comm()
+
         if self.pref.get("useflrig", False):
             logger.debug(
                 "Using flrig: %s",
@@ -2650,7 +2665,7 @@ class MainWindow(QtWidgets.QMainWindow):
                     fname = json_data.get("result", {}).get("fname", "")
                     name = json_data.get("result", {}).get("name", "")
                     grid = json_data.get("result", {}).get("grid", "")
-                    error_text = json_data.get("result", {}).get("error_text", "")
+                    # error_text = json_data.get("result", {}).get("error_text", "")
                     nickname = json_data.get("result", {}).get("nickname", "")
 
                     if self.contest:
@@ -2988,6 +3003,7 @@ class MainWindow(QtWidgets.QMainWindow):
             self.set_band_indicator(band)
             self.set_window_title()
             self.clearinputs()
+            self.read_cw_macros()
             return
         if mode == "SSB":
             self.setmode("SSB")
@@ -3099,8 +3115,9 @@ class MainWindow(QtWidgets.QMainWindow):
         if mode in ("RTTY", "DIGI-U", "DIGI-L"):
             if self.current_mode != "RTTY":
                 self.current_mode = "RTTY"
-                self.sent.setText("59")
-                self.receive.setText("59")
+                self.sent.setText("599")
+                self.receive.setText("599")
+                self.read_cw_macros()
 
     def get_opon(self) -> None:
         """
@@ -3201,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
@@ -3262,6 +3283,8 @@ class MainWindow(QtWidgets.QMainWindow):
         """
         if self.radio_state.get("mode") == "CW":
             macro_file = "cwmacros.txt"
+        elif self.radio_state.get("mode") == "RTTY":
+            macro_file = "rttymacros.txt"
         else:
             macro_file = "ssbmacros.txt"
         if not (fsutils.USER_DATA_PATH / macro_file).exists():
@@ -3279,6 +3302,7 @@ class MainWindow(QtWidgets.QMainWindow):
             logger.critical(
                 f"Could not open file {fsutils.USER_DATA_PATH / macro_file} {err}"
             )
+        self.read_cw_macros()
 
     def read_cw_macros(self) -> None:
         """
@@ -3289,6 +3313,8 @@ class MainWindow(QtWidgets.QMainWindow):
 
         if self.radio_state.get("mode") == "CW":
             macro_file = "cwmacros.txt"
+        elif self.radio_state.get("mode") == "RTTY":
+            macro_file = "rttymacros.txt"
         else:
             macro_file = "ssbmacros.txt"