not1mm 24.9.28__tar.gz → 24.9.28.2__tar.gz

{not1mm-24.9.28 → not1mm-24.9.28.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.28
+Version: 24.9.28.2
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -230,6 +230,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-28-2] Fix Cabrillo and ADIF export for cqwwrtty.
+- [24-9-28-1] Add RTTY-R, LSB-D, USB-D, AM-D, FM-D, DIGI-U, DIGI-L, RTTYR, PKTLSB, PKTUSB to list of modes that will load in the RTTY/DG Macros.
 - [24-9-28] Fixed crash with CAT None, Display tweek. Refactored a couple conditionals.
 - [24-9-25-1] Added WARC and 4M bands.
 - [24-9-25] Fix QRZ lookup crash on non-existant call.

{not1mm-24.9.28 → not1mm-24.9.28.2}/README.md

@@ -199,6 +199,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-28-2] Fix Cabrillo and ADIF export for cqwwrtty.
+- [24-9-28-1] Add RTTY-R, LSB-D, USB-D, AM-D, FM-D, DIGI-U, DIGI-L, RTTYR, PKTLSB, PKTUSB to list of modes that will load in the RTTY/DG Macros.
 - [24-9-28] Fixed crash with CAT None, Display tweek. Refactored a couple conditionals.
 - [24-9-25-1] Added WARC and 4M bands.
 - [24-9-25] Fix QRZ lookup crash on non-existant call.

{not1mm-24.9.28 → not1mm-24.9.28.2}/not1mm/__main__.py

@@ -3347,7 +3347,19 @@ class MainWindow(QtWidgets.QMainWindow):
         """
         if self.radio_state.get("mode") == "CW":
             macro_file = "cwmacros.txt"
-        elif self.radio_state.get("mode") == "RTTY":
+        elif self.radio_state.get("mode") in (
+            "RTTY",
+            "RTTY-R",
+            "LSB-D",
+            "USB-D",
+            "AM-D",
+            "FM-D",
+            "DIGI-U",
+            "DIGI-L",
+            "RTTYR",
+            "PKTLSB",
+            "PKTUSB",
+        ):
             macro_file = "rttymacros.txt"
         else:
             macro_file = "ssbmacros.txt"
@@ -3377,7 +3389,19 @@ class MainWindow(QtWidgets.QMainWindow):
 
         if self.radio_state.get("mode") == "CW":
             macro_file = "cwmacros.txt"
-        elif self.radio_state.get("mode") == "RTTY":
+        elif self.radio_state.get("mode") in (
+            "RTTY",
+            "RTTY-R",
+            "LSB-D",
+            "USB-D",
+            "AM-D",
+            "FM-D",
+            "DIGI-U",
+            "DIGI-L",
+            "RTTYR",
+            "PKTLSB",
+            "PKTUSB",
+        ):
             macro_file = "rttymacros.txt"
         else:
             macro_file = "ssbmacros.txt"

{not1mm-24.9.28 → not1mm-24.9.28.2}/not1mm/lib/plugin_common.py

@@ -38,6 +38,8 @@ def gen_adif(self, cabrillo_name: str, contest_id=""):
                 themode = contact.get("Mode", "")
                 if themode == "CWR":
                     themode = "CW"
+                if cabrillo_name in ("CQ-WW-RTTY", "WEEKLY-RTTY"):
+                    themode = "RTTY"
                 frequency = str(Decimal(str(contact.get("Freq", 0))) / 1000)
                 band = get_adif_band(Decimal(str(contact.get("Freq", 0))) / 1000)
                 sentrst = contact.get("SNT", "")

not1mm-24.9.28.2/not1mm/lib/version.py

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

{not1mm-24.9.28 → not1mm-24.9.28.2}/not1mm/plugins/cq_ww_rtty.py

@@ -365,7 +365,19 @@ def cabrillo(self):
                 themode = contact.get("Mode", "")
                 if themode == "LSB" or themode == "USB":
                     themode = "PH"
-                if themode.strip() == "RTTY":
+                if themode.strip() in (
+                        "RTTY",
+                        "RTTY-R",
+                        "LSB-D",
+                        "USB-D",
+                        "AM-D",
+                        "FM-D",
+                        "DIGI-U",
+                        "DIGI-L",
+                        "RTTYR",
+                        "PKTLSB",
+                        "PKTUSB",
+                    ):
                     themode = "RY"
                 frequency = str(int(contact.get("Freq", "0"))).rjust(5)
 

{not1mm-24.9.28 → not1mm-24.9.28.2}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.28
+Version: 24.9.28.2
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -230,6 +230,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-28-2] Fix Cabrillo and ADIF export for cqwwrtty.
+- [24-9-28-1] Add RTTY-R, LSB-D, USB-D, AM-D, FM-D, DIGI-U, DIGI-L, RTTYR, PKTLSB, PKTUSB to list of modes that will load in the RTTY/DG Macros.
 - [24-9-28] Fixed crash with CAT None, Display tweek. Refactored a couple conditionals.
 - [24-9-25-1] Added WARC and 4M bands.
 - [24-9-25] Fix QRZ lookup crash on non-existant call.

{not1mm-24.9.28 → not1mm-24.9.28.2}/pyproject.toml

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

not1mm-24.9.28/not1mm/lib/version.py

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