not1mm 24.11.6__tar.gz → 24.11.10__tar.gz

{not1mm-24.11.6 → not1mm-24.11.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.11.6
+Version: 24.11.10
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -236,6 +236,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-11-10] ReJiggered CAT/flrig interface to hopefull make it more workable.
 - [24-11-6] Added Call history to ARRL VHF, CQ160, CQWW, StewPerry, Weekly RTTY
 - [24-11-5] Fix crash with bad qrz credentials.
 - [24-11-3-1] Fixed CWT ESM, Add Call History to CWT, Helvetia, WFD, NAQP, K1USN. Add ESM Helvetia.

{not1mm-24.11.6 → not1mm-24.11.10}/README.md

@@ -205,6 +205,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-11-10] ReJiggered CAT/flrig interface to hopefull make it more workable.
 - [24-11-6] Added Call history to ARRL VHF, CQ160, CQWW, StewPerry, Weekly RTTY
 - [24-11-5] Fix crash with bad qrz credentials.
 - [24-11-3-1] Fixed CWT ESM, Add Call History to CWT, Helvetia, WFD, NAQP, K1USN. Add ESM Helvetia.

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/__main__.py

@@ -1107,11 +1107,16 @@ class MainWindow(QtWidgets.QMainWindow):
         -------
         Nothing
         """
+
         if mode in ["CW", "SSB", "RTTY"]:
             freq = fakefreq(str(band), mode)
             self.change_freq(freq)
             vfo = float(freq)
             vfo = int(vfo * 1000)
+            if mode == "CW":
+                mode = self.rig_control.last_cw_mode
+            if mode == "RTTY":
+                mode = self.rig_control.last_data_mode
             self.change_mode(mode, intended_freq=vfo)
 
     def quit_app(self) -> None:
@@ -3315,10 +3320,9 @@ class MainWindow(QtWidgets.QMainWindow):
         -------
         None
         """
-
         if mode in ("CW", "CW-U", "CW-L", "CWR"):
             if self.rig_control and self.rig_control.online:
-                self.rig_control.set_mode("CW")
+                self.rig_control.set_mode(self.rig_control.last_cw_mode)
                 if self.pref.get("cwtype") == 3 and self.rig_control is not None:
                     if self.rig_control.interface == "flrig":
                         self.cwspeed_spinbox_changed()
@@ -3332,9 +3336,18 @@ class MainWindow(QtWidgets.QMainWindow):
             self.clearinputs()
             self.read_cw_macros()
             return
-        if mode == "RTTY":
+        if mode in (
+            "DIGI-U",
+            "DIGI-L",
+            "RTTY",
+            "RTTY-R",
+            "LSB-D",
+            "USB-D",
+            "AM-D",
+            "FM-D",
+        ):
             if self.rig_control and self.rig_control.online:
-                self.rig_control.set_mode("RTTY")
+                self.rig_control.set_mode(self.rig_control.last_data_mode)
             else:
                 self.radio_state["mode"] = "RTTY"
             self.setmode("RTTY")
@@ -3548,6 +3561,7 @@ class MainWindow(QtWidgets.QMainWindow):
         Passing in a dictionary object with the
         vfo freq, mode, bandwidth, and online state of the radio.
         """
+        logger.debug(f"{the_dict=}")
         self.set_radio_icon(0)
         info_dirty = False
         vfo = the_dict.get("vfoa", "")
@@ -3645,7 +3659,7 @@ class MainWindow(QtWidgets.QMainWindow):
         -------
         None
         """
-        if self.radio_state.get("mode") == "CW":
+        if self.radio_state.get("mode") in ("CW", "CW-L", "CW-R", "CWR"):
             macro_file = "cwmacros.txt"
         elif self.radio_state.get("mode") in (
             "RTTY",
@@ -3659,6 +3673,7 @@ class MainWindow(QtWidgets.QMainWindow):
             "RTTYR",
             "PKTLSB",
             "PKTUSB",
+            "FSK",
         ):
             macro_file = "rttymacros.txt"
         else:
@@ -3687,7 +3702,11 @@ class MainWindow(QtWidgets.QMainWindow):
         temp directory this is running from... In theory.
         """
 
-        if self.radio_state.get("mode") == "CW":
+        if self.radio_state.get("mode") in (
+            "CW",
+            "CW-L",
+            "CW-R",
+        ):
             macro_file = "cwmacros.txt"
         elif self.radio_state.get("mode") in (
             "RTTY",

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/lib/cat_interface.py

@@ -97,6 +97,7 @@ class CAT:
             self.__initialize_rigctrld()
         elif self.interface == "fake":
             self.online = True
+            logger.debug("Using Fake Rig")
         return
 
     def __initialize_rigctrld(self):
@@ -223,7 +224,9 @@ class CAT:
         """Poll the radio using flrig"""
         try:
             self.online = True
-            return self.server.rig.get_vfo()
+            vfo_value = self.server.rig.get_vfo()
+            logger.debug(f"{vfo_value=}")
+            return vfo_value
         except (
             ConnectionRefusedError,
             xmlrpc.client.Fault,
@@ -232,7 +235,7 @@ class CAT:
             http.client.ResponseNotReady,
         ) as exception:
             self.online = False
-            logger.debug("getvfo_flrig: %s", f"{exception}")
+            logger.debug(f"{exception=}")
         return ""
 
     def __getvfo_rigctld(self) -> str:
@@ -244,7 +247,7 @@ class CAT:
                 return self.__get_serial_string().strip()
             except socket.error as exception:
                 self.online = False
-                logger.debug("getvfo_rigctld: %s", f"{exception}")
+                logger.debug(f"{exception=}")
                 self.rigctrlsocket = None
             return ""
 
@@ -268,7 +271,9 @@ class CAT:
         # 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()
+            mode_value = self.server.rig.get_mode()
+            logger.debug(f"{mode_value=}")
+            return mode_value
         except (
             ConnectionRefusedError,
             xmlrpc.client.Fault,
@@ -282,7 +287,7 @@ class CAT:
 
     def __getmode_rigctld(self) -> str:
         """Returns mode vai rigctld"""
-        # QMX 'AM CW USB LSB RTTY FM CWR RTTYR'
+        # QMX 'DIGI-U DIGI-L CW-U CW-L' or 'LSB', 'USB', 'CW', 'FM', 'AM', 'FSK'
         # 7300 'AM CW USB LSB RTTY FM CWR RTTYR PKTLSB PKTUSB FM-D AM-D'
         if self.rigctrlsocket:
             try:
@@ -316,6 +321,7 @@ class CAT:
         try:
             self.online = True
             bandwidth = self.server.rig.get_bw()
+            logger.debug(f"{bandwidth=}")
             return bandwidth[0]
         except (
             ConnectionRefusedError,
@@ -438,7 +444,9 @@ class CAT:
         """Returns list of modes supported by the radio"""
         try:
             self.online = True
-            return self.server.rig.get_modes()
+            mode_list = self.server.rig.get_modes()
+            logger.debug(f"{mode_list=}")
+            return mode_list
         except (
             ConnectionRefusedError,
             xmlrpc.client.Fault,
@@ -529,7 +537,10 @@ class CAT:
         """Sets the radios mode"""
         try:
             self.online = True
-            return self.server.rig.set_mode(mode)
+            logger.debug(f"{mode=}")
+            set_mode_result = self.server.rig.set_mode(mode)
+            logger.debug(f"self.server.rig.setmode(mode) = {set_mode_result}")
+            return set_mode_result
         except (
             ConnectionRefusedError,
             xmlrpc.client.Fault,
@@ -538,7 +549,7 @@ class CAT:
             http.client.ResponseNotReady,
         ) as exception:
             self.online = False
-            logger.debug("setmode_flrig: %s", f"{exception}")
+            logger.debug(f"{exception=}")
         return False
 
     def __setmode_rigctld(self, mode: str) -> bool:

not1mm-24.11.10/not1mm/lib/version.py

@@ -0,0 +1,3 @@
+"""It's the version"""
+
+__version__ = "24.11.10"

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/arrl_ss_cw.py

@@ -137,7 +137,6 @@ def prefill(self):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/arrl_vhf_jan.py

@@ -540,7 +540,6 @@ def ft8_handler(the_packet: dict):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/arrl_vhf_jun.py

@@ -508,7 +508,6 @@ def ft8_handler(the_packet: dict):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/arrl_vhf_sep.py

@@ -508,7 +508,6 @@ def ft8_handler(the_packet: dict):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/cq_160_cw.py

@@ -453,7 +453,6 @@ def recalculate_mults(self):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         # if self.other_1.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/cq_160_ssb.py

@@ -453,7 +453,6 @@ def recalculate_mults(self):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         # if self.other_1.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/cq_ww_cw.py

@@ -523,7 +523,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/cq_ww_rtty.py

@@ -642,7 +642,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/cq_ww_ssb.py

@@ -511,7 +511,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/k1usn_sst.py

@@ -496,7 +496,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/naqp_cw.py

@@ -546,7 +546,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/naqp_rtty.py

@@ -653,7 +653,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/naqp_ssb.py

@@ -516,7 +516,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/raem.py

@@ -494,7 +494,6 @@ def recalculate_mults(self):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/stew_perry_topband.py

@@ -369,7 +369,6 @@ def recalculate_mults(self):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/weekly_rtty.py

@@ -577,7 +577,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/plugins/winter_field_day.py

@@ -444,7 +444,6 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
 def check_call_history(self):
     """"""
     result = self.database.fetch_call_history(self.callsign.text())
-    print(f"{result=}")
     if result:
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_1.text() == "":

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm/radio.py

@@ -35,7 +35,16 @@ class Radio(QObject):
     host = None
     port = None
     modes = ""
+    cw_list = ["CW", "CW-L", "CW-U", "CWR"]
+    rtty_list = [
+        "RTTY",
+        "DIGI-L",
+        "PKTLSB",
+        "LSB-D",
+    ]
     last_data_mode = "RTTY"
+    last_cw_mode = "CW"
+    last_ph_mode = "SSB"
 
     def __init__(self, interface: str, host: str, port: int) -> None:
         super().__init__()
@@ -49,6 +58,15 @@ class Radio(QObject):
             self.cat = CAT(self.interface, self.host, self.port)
             self.online = self.cat.online
             self.modes = self.cat.get_mode_list()
+            for pos_cw in self.cw_list:
+                if pos_cw in self.modes:
+                    self.last_cw_mode = pos_cw
+                    break
+            for pos_rtty in self.rtty_list:
+                if pos_rtty in self.modes:
+                    self.last_data_mode = pos_rtty
+                    break
+
         except ConnectionResetError:
             ...
         while not self.time_to_quit:
@@ -97,6 +115,7 @@ class Radio(QObject):
             "USB-D",
             "AM-D",
             "FM-D",
+            "FSK",
             "DIGI-U",
             "DIGI-L",
             "RTTYR",
@@ -106,6 +125,11 @@ class Radio(QObject):
         if the_mode in datamodes:
             self.last_data_mode = the_mode
 
+        cwmodes = ["CW", "CW-L", "CW-U", "CWR"]
+
+        if the_mode in cwmodes:
+            self.last_cw_mode = the_mode
+
     def sendcw(self, texttosend):
         """..."""
         logger.debug(f"Send CW: {texttosend}")

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.11.6
+Version: 24.11.10
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -236,6 +236,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-11-10] ReJiggered CAT/flrig interface to hopefull make it more workable.
 - [24-11-6] Added Call history to ARRL VHF, CQ160, CQWW, StewPerry, Weekly RTTY
 - [24-11-5] Fix crash with bad qrz credentials.
 - [24-11-3-1] Fixed CWT ESM, Add Call History to CWT, Helvetia, WFD, NAQP, K1USN. Add ESM Helvetia.

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm.egg-info/SOURCES.txt

@@ -9,7 +9,6 @@ not1mm/fsutils.py
 not1mm/logwindow.py
 not1mm/lookupservice.py
 not1mm/radio.py
-not1mm/test.py
 not1mm/vfo.py
 not1mm/voice_keying.py
 not1mm.egg-info/PKG-INFO
@@ -119,7 +118,6 @@ not1mm/lib/lookup.py
 not1mm/lib/multicast.py
 not1mm/lib/n1mm.py
 not1mm/lib/new_contest.py
-not1mm/lib/playsound.py
 not1mm/lib/plugin_common.py
 not1mm/lib/select_contest.py
 not1mm/lib/settings.py
@@ -169,5 +167,4 @@ not1mm/plugins/ref_cw.py
 not1mm/plugins/ref_ssb.py
 not1mm/plugins/stew_perry_topband.py
 not1mm/plugins/weekly_rtty.py
-not1mm/plugins/winter_field_day.py
-test/contests.py
+not1mm/plugins/winter_field_day.py

{not1mm-24.11.6 → not1mm-24.11.10}/not1mm.egg-info/top_level.txt

@@ -1,4 +1,3 @@
 dist
 not1mm
 pic
-venv

{not1mm-24.11.6 → not1mm-24.11.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "not1mm" 
-version = "24.11.6"
+version = "24.11.10"
 description = "NOT1MM Logger"
 readme = "README.md"
 requires-python = ">=3.9"