not1mm 24.10.23__py3-none-any.whl → 24.10.24__py3-none-any.whl

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/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.10.23"
+__version__ = "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/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.dist-info → not1mm-24.10.24.dist-info}/METADATA

@@ -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.dist-info → not1mm-24.10.24.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=J0Jgm4Q0tXthiRw3VLfROKQSdK66olZNUJmr963ExQ8,135049
+not1mm/__main__.py,sha256=DaYuqX83hURHwL4fzQ40M8IcjUkiXd0Pi2h7Je077ks,135215
 not1mm/bandmap.py,sha256=uCaM07IWyC22LFO3R1_ViaW7SBXjIaoJ-ypglJIKddg,30670
 not1mm/checkwindow.py,sha256=F6hNCbVSLG2PPY2afgmwlBWeqr1Uj4-n__AivDLVQ_0,9670
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
@@ -7,7 +7,7 @@ not1mm/logwindow.py,sha256=TvpzQTNB92hISlUO3iWBqtlPmlebdhOkAArx0DNGcOs,43966
 not1mm/lookupservice.py,sha256=4c36x_1G3Sy69gQfJ6El7vHLIKTjLGH67ziPPoeYweM,2648
 not1mm/radio.py,sha256=eu1kBjmttREFZ5tAJpNuQSMrmWeKw4Tb-sjgjChUYUs,4693
 not1mm/test.py,sha256=atZoDXL9DArK4dS8gBCDmlMt5AHuiVZmFOQIp62hDHg,314
-not1mm/vfo.py,sha256=IvmUQYMIPzLJw_BHQGis4J_IEW-vlBtdfxZLXPh7OzI,12335
+not1mm/vfo.py,sha256=ggPyWtxMbdSE5RwdK0nDRwDNqOxdpb_pvnzZdbzZVQE,11136
 not1mm/voice_keying.py,sha256=sA3gw5_k7kShTg2qhG7HkKDM5M6KheJVRkAc_C7mxDk,3006
 not1mm/data/JetBrainsMono-ExtraLight.ttf,sha256=g5Hn7BPounWMGDj1a8zZcyKMz03HSqW__pUluRR7Evg,274144
 not1mm/data/MASTER.SCP,sha256=FWKs4Xw3w7FNUt2npA6VzsLME7NAbHRugxaL6TnsvzU,364234
@@ -61,6 +61,7 @@ not1mm/data/phonetics/b.wav,sha256=vOcw0gCYws-1AaGXu8pqnb3TPfnnj6_b7c5vV7_4kUY,4
 not1mm/data/phonetics/c.wav,sha256=To-OPpsUuwYz7Ix_Sxzbx0JE_dVDY81M2kpcu9rewhA,46746
 not1mm/data/phonetics/contest.wav,sha256=8JXCFI-10dAwtQg63hmOIdQxh__601rw4TXZTJoP0ew,62558
 not1mm/data/phonetics/cq.wav,sha256=ooIgH1EsFBZWK-7MuKG9iUEFXa5WUQ0PQiOVqyMwWss,92498
+not1mm/data/phonetics/cq2.wav,sha256=TjOFqV1Dg25DZBV-JLnIMFKNXtHzAvidyfzi0soIq_U,333480
 not1mm/data/phonetics/d.wav,sha256=YWYt1kCh2AhH3WIbnbrqpychwh9pFpXDxeaFF00cCt4,52524
 not1mm/data/phonetics/e.wav,sha256=p2zrwjmHTmkQre8AkgUhrDcFPcRqOTu_ux7wPsK6oN4,45700
 not1mm/data/phonetics/f.wav,sha256=j0dU4zl8mTVdfleR-nHbn1Vphi7O79GCtuXraVjAvD8,53438
@@ -114,7 +115,7 @@ not1mm/lib/plugin_common.py,sha256=TbFUbftjELFt4QRdsjSHbqnXSngZOlSwlCTClqosDXA,9
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=7_JFDSKPOd35Gwzqhrbed4EfrlYUm7AEnz2xBRioc-g,13280
 not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
-not1mm/lib/version.py,sha256=h6Nrz1mjz1KQh8T9_5DX4Md1qunZZtYneo3kbFgDpOk,49
+not1mm/lib/version.py,sha256=1ItBCw4c7VEOtdvWAg-RL8jUzGElo6UcBV2_QhhMw8E,49
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=IttjX1yy4nDdACGsiYlPteFG8eVseX_WtoFio6bqHE8,10953
 not1mm/plugins/10_10_spring_cw.py,sha256=ThCptdM3dX4ywhoy2JRcOEyHSqcJolFaT7O_PYzM1Mg,10958
@@ -137,7 +138,7 @@ not1mm/plugins/cq_160_ssb.py,sha256=zIwSMAjHSt6W2edrDzVbyTf860JowHoFkU9BKO8Enag,
 not1mm/plugins/cq_wpx_cw.py,sha256=ZFbcXI8vykXsgMI51YtjM0eQaDOiL0fLG7oAUR1Hfuc,17589
 not1mm/plugins/cq_wpx_rtty.py,sha256=6zucmuH4Ky5BpgIPVgLxhFv-_HbQdRc5VweutrbACH8,20408
 not1mm/plugins/cq_wpx_ssb.py,sha256=g4pxNyWX18Ig_IDMbJo1u1T9kImw1feSAgjDZuLRbdY,16239
-not1mm/plugins/cq_ww_cw.py,sha256=iN_nARIH70EzNIR2z0rPR7xYNXvVSkDkw5O68k4kxEk,15941
+not1mm/plugins/cq_ww_cw.py,sha256=ioFk94WokRzQFiSUbFXYx17jsQl8S0N9bfi__ykFgqA,16408
 not1mm/plugins/cq_ww_rtty.py,sha256=B3q0hhmYJ3R50PJoyJ6d5GgATfIjM3Cm8m3OPMVLlhY,20702
 not1mm/plugins/cq_ww_ssb.py,sha256=tr3XPe0O6-aV_6-QnmWPFJu8S_QtZ68bsbb3l6PBOes,16086
 not1mm/plugins/cwt.py,sha256=Jlhu19dpIlcAUFIP4Lrjz1raMok0yLyYg9cq7EQylys,16472
@@ -159,9 +160,9 @@ not1mm/plugins/ref_ssb.py,sha256=qzhojE-rL7NaMkb6V2XYwZTlx_GDPw3FXlDivGM4oBk,200
 not1mm/plugins/stew_perry_topband.py,sha256=CKBQbYl4ETxhXJd2dma4fg_C5pag_s7Nf61SCztZtqE,10668
 not1mm/plugins/weekly_rtty.py,sha256=ipgY-KlKlEHafnBg-_AFk9KhiXkGTvb4ENoezIeD7jU,18185
 not1mm/plugins/winter_field_day.py,sha256=nPuPxdK1FimPsHk-uz_3MA4cBqBp6WcwApk7PZwWeWg,13579
-not1mm-24.10.23.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.10.23.dist-info/METADATA,sha256=bh-Ds6Nil_yzbJ_sqiD5-TJNIHC9MDrXCC0jlMzEQcM,35037
-not1mm-24.10.23.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-not1mm-24.10.23.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.10.23.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.10.23.dist-info/RECORD,,
+not1mm-24.10.24.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.10.24.dist-info/METADATA,sha256=qCTa_iK2MWDAnEE-cDH99vSfIkIKiiWIheprhpoQfyg,35144
+not1mm-24.10.24.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+not1mm-24.10.24.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.10.24.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.10.24.dist-info/RECORD,,