not1mm 24.10.23__tar.gz → 24.10.24__tar.gz

{not1mm-24.10.23 → not1mm-24.10.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.10.23
+Version: 24.10.24
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -232,10 +232,11 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-10-24] Forgot to convert the VFO dockwidget along with the rest. CQ WW CW, Dupes now score 0.
 - [24-10-23] Remove duplicate marked calls in the bandmap.
 - [24-10-22] Added ESM to RAC Canada Day. Added French REF.
 - [24-10-21] Scaled back the hits returned from the check window from 25 to 20. Seems less resource hungry now.
-- [24-10-20-1] ReWrote how the widgets interact. I porbably broke a thing or two. Let me know. 
+- [24-10-20-1] ReWrote how the widgets interact. I probably broke a thing or two. Let me know.
 - [24-10-20] Add ESM to ARRL DX.
 - [24-10-19-1] Rewrite part of CAT control.
 - [24-10-19] Change ESM button states when the run state is toggled. Add ESM to ARRL Field Day and Winter Field Day.
@@ -547,7 +548,7 @@ You can fill. You can fill. Everyone look at your keys.
 
 ### Changing station information
 
-Station information can be changed any time by going to
+Station information can be changed any time by going toawandahl
 `File` > `Station Settings` and editing the information.
 
 ## Selecting a contest (It's REQUIRED Russ)

{not1mm-24.10.23 → not1mm-24.10.24}/README.md

@@ -201,10 +201,11 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-10-24] Forgot to convert the VFO dockwidget along with the rest. CQ WW CW, Dupes now score 0.
 - [24-10-23] Remove duplicate marked calls in the bandmap.
 - [24-10-22] Added ESM to RAC Canada Day. Added French REF.
 - [24-10-21] Scaled back the hits returned from the check window from 25 to 20. Seems less resource hungry now.
-- [24-10-20-1] ReWrote how the widgets interact. I porbably broke a thing or two. Let me know. 
+- [24-10-20-1] ReWrote how the widgets interact. I probably broke a thing or two. Let me know.
 - [24-10-20] Add ESM to ARRL DX.
 - [24-10-19-1] Rewrite part of CAT control.
 - [24-10-19] Change ESM button states when the run state is toggled. Add ESM to ARRL Field Day and Winter Field Day.
@@ -516,7 +517,7 @@ You can fill. You can fill. Everyone look at your keys.
 
 ### Changing station information
 
-Station information can be changed any time by going to
+Station information can be changed any time by going toawandahl
 `File` > `Station Settings` and editing the information.
 
 ## Selecting a contest (It's REQUIRED Russ)

{not1mm-24.10.23 → not1mm-24.10.24}/not1mm/__main__.py

@@ -746,6 +746,8 @@ class MainWindow(QtWidgets.QMainWindow):
                 return
             if msg.get("cmd", "") == "TUNE":
                 # b'{"cmd": "TUNE", "freq": 7.0235, "spot": "MM0DGI"}'
+                if self.vfo_window:
+                    self.vfo_window.msg_from_main(msg)
                 vfo = msg.get("freq")
                 vfo = float(vfo) * 1000000
                 self.radio_state["vfoa"] = int(vfo)
@@ -880,6 +882,8 @@ class MainWindow(QtWidgets.QMainWindow):
             self.bandmap_window.msg_from_main(cmd)
         if self.check_window:
             self.check_window.msg_from_main(cmd)
+        if self.vfo_window:
+            self.vfo_window.msg_from_main(cmd)
 
         if setdarkmode:
             darkPalette = QPalette()

not1mm-24.10.24/not1mm/lib/version.py

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

{not1mm-24.10.23 → not1mm-24.10.24}/not1mm/plugins/cq_ww_cw.py

@@ -45,6 +45,7 @@ from PyQt6 import QtWidgets
 
 from not1mm.lib.plugin_common import gen_adif, get_points
 from not1mm.lib.version import __version__
+from not1mm.lib.ham_utility import get_logged_band
 
 logger = logging.getLogger(__name__)
 
@@ -150,6 +151,14 @@ def prefill(self):
 
 def points(self):
     """Calc point"""
+    # @awandahl Retrieve callsign and band information
+    call = self.contact.get("Call", "")
+    band = float(get_logged_band(str(int(self.contact.get("Freq", 0.0) * 1000))))
+
+    # @awandahl Check if the contact is a duplicate on the current band
+    dupe_check = self.database.check_dupe_on_band(call, band)
+    if dupe_check.get("isdupe", 0) > 0:
+        return 0  # @awandahl Return zero points for duplicates
     result = self.cty_lookup(self.station.get("Call", ""))
     if result:
         for item in result.items():

{not1mm-24.10.23 → not1mm-24.10.24}/not1mm/vfo.py

@@ -14,8 +14,7 @@ Purpose: Provide onscreen widget that interacts with DIY VFO knob and remote rig
 
 import logging
 import os
-import platform
-from json import loads, JSONDecodeError
+from json import loads
 
 import serial
 from PyQt6 import QtCore, QtWidgets, uic
@@ -25,7 +24,6 @@ from PyQt6.QtGui import QColorConstants, QPalette, QColor
 
 import not1mm.fsutils as fsutils
 from not1mm.lib.cat_interface import CAT
-from not1mm.lib.multicast import Multicast
 
 logger = logging.getLogger(__name__)
 
@@ -45,22 +43,12 @@ class VfoWindow(QDockWidget):
         super().__init__()
         uic.loadUi(fsutils.APP_DATA_PATH / "vfo.ui", self)
         self.setWindowTitle("VFO Window")
-
         self.rig_control = None
         self.timer = QTimer()
         self.timer.timeout.connect(self.getwaiting)
         self.load_pref()
         self.lcdNumber.display(0)
         self.pico = None
-        self._udpwatch = None
-
-        self.multicast_interface = Multicast(
-            self.pref.get("multicast_group", "239.1.1.1"),
-            self.pref.get("multicast_port", 2239),
-            self.pref.get("interface_ip", "0.0.0.0"),
-        )
-        self.multicast_interface.ready_read_connect(self.watch_udp)
-
         self.setup_serial()
         self.poll_rig_timer = QtCore.QTimer()
         self.poll_rig_timer.timeout.connect(self.poll_radio)
@@ -216,44 +204,26 @@ class VfoWindow(QDockWidget):
                 )
             self.lcdNumber.setStyleSheet("QLCDNumber { color: red; }")
 
-    def watch_udp(self) -> None:
+    def msg_from_main(self, msg_dict) -> None:
         """
         Watch for a 'HALT' UPD packet from not1mm.
         Exit app if found.
         """
-        while self.multicast_interface.server_udp.hasPendingDatagrams():
-            datagram = self.multicast_interface.getpacket()
+        if msg_dict.get("cmd", "") == "TUNE":
+            # b'{"cmd": "TUNE", "freq": 7.0235, "spot": "MM0DGI"}'
+            vfo = msg_dict.get("freq")
+            vfo = float(vfo) * 1000000
+            changefreq = f"F {int(vfo)}\r"
             try:
-                debug_info = f"{datagram}"
-                logger.debug(debug_info)
-                json_data = loads(datagram)
-            except UnicodeDecodeError as err:
-                the_error = f"Not Unicode: {err}\n{datagram}"
-                logger.debug(the_error)
-                continue
-            except JSONDecodeError as err:
-                the_error = f"Not JSON: {err}\n{datagram}"
-                logger.debug(the_error)
-                continue
-            if json_data.get("station", "") != platform.node():
-                continue
-            logger.debug(f"{json_data=}")
-
-            if json_data.get("cmd", "") == "TUNE":
-                # b'{"cmd": "TUNE", "freq": 7.0235, "spot": "MM0DGI"}'
-                vfo = json_data.get("freq")
-                vfo = float(vfo) * 1000000
-                changefreq = f"F {int(vfo)}\r"
-                try:
-                    if self.pico:
-                        self.pico.write(changefreq.encode())
-                except OSError:
-                    logger.critical("Unable to write to serial device.")
-                except AttributeError:
-                    logger.critical("Unable to write to serial device.")
-                continue
-            if json_data.get("cmd", "") == "DARKMODE":
-                self.setDarkMode(json_data.get("state", False))
+                if self.pico:
+                    self.pico.write(changefreq.encode())
+            except OSError:
+                logger.critical("Unable to write to serial device.")
+            except AttributeError:
+                logger.critical("Unable to write to serial device.")
+            return
+        if msg_dict.get("cmd", "") == "DARKMODE":
+            self.setDarkMode(msg_dict.get("state", False))
 
     def showNumber(self, the_number) -> None:
         """Display vfo value with dots"""

{not1mm-24.10.23 → not1mm-24.10.24}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.10.23
+Version: 24.10.24
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -232,10 +232,11 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-10-24] Forgot to convert the VFO dockwidget along with the rest. CQ WW CW, Dupes now score 0.
 - [24-10-23] Remove duplicate marked calls in the bandmap.
 - [24-10-22] Added ESM to RAC Canada Day. Added French REF.
 - [24-10-21] Scaled back the hits returned from the check window from 25 to 20. Seems less resource hungry now.
-- [24-10-20-1] ReWrote how the widgets interact. I porbably broke a thing or two. Let me know. 
+- [24-10-20-1] ReWrote how the widgets interact. I probably broke a thing or two. Let me know.
 - [24-10-20] Add ESM to ARRL DX.
 - [24-10-19-1] Rewrite part of CAT control.
 - [24-10-19] Change ESM button states when the run state is toggled. Add ESM to ARRL Field Day and Winter Field Day.
@@ -547,7 +548,7 @@ You can fill. You can fill. Everyone look at your keys.
 
 ### Changing station information
 
-Station information can be changed any time by going to
+Station information can be changed any time by going toawandahl
 `File` > `Station Settings` and editing the information.
 
 ## Selecting a contest (It's REQUIRED Russ)

{not1mm-24.10.23 → not1mm-24.10.24}/not1mm.egg-info/SOURCES.txt

@@ -70,6 +70,7 @@ not1mm/data/phonetics/b.wav
 not1mm/data/phonetics/c.wav
 not1mm/data/phonetics/contest.wav
 not1mm/data/phonetics/cq.wav
+not1mm/data/phonetics/cq2.wav
 not1mm/data/phonetics/d.wav
 not1mm/data/phonetics/e.wav
 not1mm/data/phonetics/f.wav

{not1mm-24.10.23 → not1mm-24.10.24}/pyproject.toml

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

not1mm-24.10.23/not1mm/lib/version.py

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