not1mm 24.4.25__tar.gz → 24.4.25.1__tar.gz

{not1mm-24.4.25 → not1mm-24.4.25.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.4.25
+Version: 24.4.25.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -177,6 +177,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-4-25-1] Reduce delta time to poll. Reorder poll_radio callback. Remove unused CAT lib from main.
 - [24-4-25] Limited loop in radio.py, reducing clock cycles used. Moved Log window to the top of the logger.
 - [24-4-24] Placed CAT control into a thread so disconnecting the radio wouldn't lock up the interface.
 - [24-4-17] Trap OSError if no sound device. Stop fsutils/appdata from creating useless .not1mm and .username folder structures on Linux platforms.

{not1mm-24.4.25 → not1mm-24.4.25.1}/README.md

@@ -145,6 +145,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-4-25-1] Reduce delta time to poll. Reorder poll_radio callback. Remove unused CAT lib from main.
 - [24-4-25] Limited loop in radio.py, reducing clock cycles used. Moved Log window to the top of the logger.
 - [24-4-24] Placed CAT control into a thread so disconnecting the radio wouldn't lock up the interface.
 - [24-4-17] Trap OSError if no sound device. Stop fsutils/appdata from creating useless .not1mm and .username folder structures on Linux platforms.

{not1mm-24.4.25 → not1mm-24.4.25.1}/not1mm/__main__.py

@@ -42,7 +42,6 @@ from PyQt6.QtGui import QFontDatabase, QColorConstants
 from PyQt6.QtWidgets import QFileDialog
 
 from not1mm.lib.about import About
-from not1mm.lib.cat_interface import CAT
 from not1mm.lib.cwinterface import CW
 from not1mm.lib.database import DataBase
 from not1mm.lib.edit_macro import EditMacro
@@ -3197,9 +3196,12 @@ class MainWindow(QtWidgets.QMainWindow):
                         destination_file.write_bytes(child.read_bytes())
 
     def poll_radio(self, the_dict):
-        """catch"""
+        """
+        Gets called by thread worker radio.py
+        Passing in a dictionary object with the
+        vfo freq, mode, bandwidth, and online state of the radio.
+        """
         self.set_radio_icon(0)
-        print(f"{the_dict=}")
         info_dirty = False
         vfo = the_dict.get("vfoa", "")
         mode = the_dict.get("mode", "")
@@ -3211,52 +3213,52 @@ class MainWindow(QtWidgets.QMainWindow):
         else:
             self.set_radio_icon(2)
 
-            if mode == "CW":
-                self.setmode(mode)
-            if mode == "LSB" or mode == "USB":
-                self.setmode("SSB")
-            if mode == "RTTY":
-                self.setmode("RTTY")
+        if vfo == "":
+            return
+        if self.radio_state.get("vfoa") != vfo:
+            info_dirty = True
+            self.radio_state["vfoa"] = vfo
+        band = getband(str(vfo))
+        self.radio_state["band"] = band
+        self.contact["Band"] = get_logged_band(str(vfo))
+        self.set_band_indicator(band)
 
-            if vfo == "":
-                return
-            if self.radio_state.get("vfoa") != vfo:
-                info_dirty = True
-                self.radio_state["vfoa"] = vfo
-            band = getband(str(vfo))
-            self.radio_state["band"] = band
-            self.contact["Band"] = get_logged_band(str(vfo))
-            self.set_band_indicator(band)
+        if self.radio_state.get("mode") != mode:
+            info_dirty = True
+            self.radio_state["mode"] = mode
 
-            if self.radio_state.get("mode") != mode:
-                info_dirty = True
-                self.radio_state["mode"] = mode
+        if self.radio_state.get("bw") != bw:
+            info_dirty = True
+            self.radio_state["bw"] = bw
 
-            if self.radio_state.get("bw") != bw:
-                info_dirty = True
-                self.radio_state["bw"] = bw
+        if mode == "CW":
+            self.setmode(mode)
+        if mode == "LSB" or mode == "USB":
+            self.setmode("SSB")
+        if mode == "RTTY":
+            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()
+        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()
 
     def edit_cw_macros(self) -> None:
         """

not1mm-24.4.25.1/not1mm/lib/version.py

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

{not1mm-24.4.25 → not1mm-24.4.25.1}/not1mm/radio.py

@@ -24,7 +24,7 @@ class Radio(QObject):
     vfoa = "14030000"
     mode = "CW"
     bw = "500"
-    delta = 10
+    delta = 1
     poll_time = datetime.datetime.now() + datetime.timedelta(seconds=delta)
     time_to_quit = False
     online = False
@@ -76,11 +76,27 @@ class Radio(QObject):
         if self.cat:
             self.cat.set_vfo(vfo)
         self.vfoa = vfo
+        self.poll_callback.emit(
+            {
+                "vfoa": self.vfoa,
+                "mode": self.mode,
+                "bw": self.bw,
+                "online": self.online,
+            }
+        )
 
     def set_mode(self, mode):
         if self.cat:
             self.cat.set_mode(mode)
         self.mode = mode
+        self.poll_callback.emit(
+            {
+                "vfoa": self.vfoa,
+                "mode": self.mode,
+                "bw": self.bw,
+                "online": self.online,
+            }
+        )
 
     def ptt_on(self):
         if self.cat:

{not1mm-24.4.25 → not1mm-24.4.25.1}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.4.25
+Version: 24.4.25.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -177,6 +177,7 @@ I wish to thank those who've contributed to the project.
 
 ## Recent Changes
 
+- [24-4-25-1] Reduce delta time to poll. Reorder poll_radio callback. Remove unused CAT lib from main.
 - [24-4-25] Limited loop in radio.py, reducing clock cycles used. Moved Log window to the top of the logger.
 - [24-4-24] Placed CAT control into a thread so disconnecting the radio wouldn't lock up the interface.
 - [24-4-17] Trap OSError if no sound device. Stop fsutils/appdata from creating useless .not1mm and .username folder structures on Linux platforms.

{not1mm-24.4.25 → not1mm-24.4.25.1}/pyproject.toml

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

not1mm-24.4.25/not1mm/lib/version.py

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