not1mm 24.9.28.1__tar.gz → 24.9.29__tar.gz

{not1mm-24.9.28.1 → not1mm-24.9.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.28.1
+Version: 24.9.29
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -196,32 +196,21 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - 10 10 Summer Phone
 - 10 10 Winter Phone
 - ARRL 10M
-- ARRL DX CW
-- ARRL DX SSB
+- ARRL DX CW, SSB
 - ARRL Field Day
-- ARRL Sweepstakes CW
-- ARRL Sweepstakes SSB
-- ARRL VHF January
-- ARRL VHF June
-- ARRL VHF September
-- CQ 160 CW
-- CQ 160 SSB
-- CQ WPX CW
-- CQ WPX SSB
-- CQ World Wide CW
-- CQ World Wide RTTY
-- CQ World Wide SSB
+- ARRL Sweepstakes CW, SSB
+- ARRL VHF January, June, September
+- CQ 160 CW, SSB
+- CQ WPX CW, SSB
+- CQ World Wide CW, RTTY, SSB
 - CWOps CWT
 - Helvetia
-- IARU Fieldday R1 CW
-- IARU Fieldday R1 SSB
+- IARU Fieldday R1 CW, SSB
 - IARU HF
 - ICWC MST
-- Japan International DX CW
-- Japan International DX SSB
+- Japan International DX CW, SSB
 - K1USN Slow Speed Test
-- NAQP CW
-- NAQP SSB
+- NAQP CW, SSB
 - Phone Weekly Test
 - RAC Canada Day
 - Stew Perry Topband
@@ -230,6 +219,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-29] Corrected Cabrillo generation for CQWWRTTY.
+- [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.

{not1mm-24.9.28.1 → not1mm-24.9.29}/README.md

@@ -165,32 +165,21 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - 10 10 Summer Phone
 - 10 10 Winter Phone
 - ARRL 10M
-- ARRL DX CW
-- ARRL DX SSB
+- ARRL DX CW, SSB
 - ARRL Field Day
-- ARRL Sweepstakes CW
-- ARRL Sweepstakes SSB
-- ARRL VHF January
-- ARRL VHF June
-- ARRL VHF September
-- CQ 160 CW
-- CQ 160 SSB
-- CQ WPX CW
-- CQ WPX SSB
-- CQ World Wide CW
-- CQ World Wide RTTY
-- CQ World Wide SSB
+- ARRL Sweepstakes CW, SSB
+- ARRL VHF January, June, September
+- CQ 160 CW, SSB
+- CQ WPX CW, SSB
+- CQ World Wide CW, RTTY, SSB
 - CWOps CWT
 - Helvetia
-- IARU Fieldday R1 CW
-- IARU Fieldday R1 SSB
+- IARU Fieldday R1 CW, SSB
 - IARU HF
 - ICWC MST
-- Japan International DX CW
-- Japan International DX SSB
+- Japan International DX CW, SSB
 - K1USN Slow Speed Test
-- NAQP CW
-- NAQP SSB
+- NAQP CW, SSB
 - Phone Weekly Test
 - RAC Canada Day
 - Stew Perry Topband
@@ -199,6 +188,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-29] Corrected Cabrillo generation for CQWWRTTY.
+- [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.

{not1mm-24.9.28.1 → not1mm-24.9.29}/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.29/not1mm/lib/version.py

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

{not1mm-24.9.28.1 → not1mm-24.9.29}/not1mm/plugins/cq_ww_rtty.py

@@ -365,8 +365,23 @@ 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"
+                exchange1 = contact.get('Exchange1', '')
+                if exchange1 == '':
+                    exchange1 = "DX"
                 frequency = str(int(contact.get("Freq", "0"))).rjust(5)
 
                 loggeddate = the_date_and_time[:10]
@@ -379,7 +394,7 @@ def cabrillo(self):
                     f"{contact.get('Call', '').ljust(13)} "
                     f"{str(contact.get('RCV', '')).ljust(3)} "
                     f"{str(contact.get('ZN', '')).zfill(2)}",
-                    f"{str(contact.get('Exchange1', '')).ljust(2)}",
+                    f"{str(exchange1).ljust(2)}",
                     end="\r\n",
                     file=file_descriptor,
                 )

{not1mm-24.9.28.1 → not1mm-24.9.29}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.28.1
+Version: 24.9.29
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -196,32 +196,21 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - 10 10 Summer Phone
 - 10 10 Winter Phone
 - ARRL 10M
-- ARRL DX CW
-- ARRL DX SSB
+- ARRL DX CW, SSB
 - ARRL Field Day
-- ARRL Sweepstakes CW
-- ARRL Sweepstakes SSB
-- ARRL VHF January
-- ARRL VHF June
-- ARRL VHF September
-- CQ 160 CW
-- CQ 160 SSB
-- CQ WPX CW
-- CQ WPX SSB
-- CQ World Wide CW
-- CQ World Wide RTTY
-- CQ World Wide SSB
+- ARRL Sweepstakes CW, SSB
+- ARRL VHF January, June, September
+- CQ 160 CW, SSB
+- CQ WPX CW, SSB
+- CQ World Wide CW, RTTY, SSB
 - CWOps CWT
 - Helvetia
-- IARU Fieldday R1 CW
-- IARU Fieldday R1 SSB
+- IARU Fieldday R1 CW, SSB
 - IARU HF
 - ICWC MST
-- Japan International DX CW
-- Japan International DX SSB
+- Japan International DX CW, SSB
 - K1USN Slow Speed Test
-- NAQP CW
-- NAQP SSB
+- NAQP CW, SSB
 - Phone Weekly Test
 - RAC Canada Day
 - Stew Perry Topband
@@ -230,6 +219,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-29] Corrected Cabrillo generation for CQWWRTTY.
+- [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.

{not1mm-24.9.28.1 → not1mm-24.9.29}/pyproject.toml

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

not1mm-24.9.28.1/not1mm/lib/version.py

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