not1mm 24.11.24.1__tar.gz → 24.11.25__tar.gz

{not1mm-24.11.24.1 → not1mm-24.11.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.11.24.1
+Version: 24.11.25
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -238,6 +238,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-22-15] Fix CQWW points, fix mode showing as RPRT.
 - [24-11-24-1] Add ESM to CQ160, ARRL VHF, ARRL 10M, 10 10 contests.
 - [24-11-24] Added ESM to IARU HF and FieldDay.
 - [24-11-23] Made macros per contest.

{not1mm-24.11.24.1 → not1mm-24.11.25}/README.md

@@ -207,6 +207,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-22-15] Fix CQWW points, fix mode showing as RPRT.
 - [24-11-24-1] Add ESM to CQ160, ARRL VHF, ARRL 10M, 10 10 contests.
 - [24-11-24] Added ESM to IARU HF and FieldDay.
 - [24-11-23] Made macros per contest.

{not1mm-24.11.24.1 → not1mm-24.11.25}/not1mm/lib/cat_interface.py

@@ -337,7 +337,8 @@ class CAT:
                 self.rigctrlsocket.send(b"m\n")
                 mode = self.__get_serial_string()
                 mode = mode.strip().split()[0]
-                # logger.debug("%s", mode)
+                if mode == "RPRT":
+                    return ""
                 return mode
             except IndexError as exception:
                 logger.debug("%s", f"{exception}")

not1mm-24.11.25/not1mm/lib/version.py

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

{not1mm-24.11.24.1 → not1mm-24.11.25}/not1mm/plugins/cq_ww_cw.py

@@ -154,17 +154,26 @@ def points(self):
             mycountry = item[1].get("entity", "")
             mycontinent = item[1].get("continent", "")
     result = self.cty_lookup(self.contact.get("Call", ""))
+
     if result:
         for item in result.items():
             entity = item[1].get("entity", "")
             continent = item[1].get("continent", "")
-            if mycountry.upper() == entity.upper():
-                return 0
-            if mycontinent and continent == "NA":
+
+            # Contacts between stations on different continents count three (3) points.
+            if mycontinent != continent:
+                return 3
+
+            # Exception: Contacts between stations in different countries within the North American boundaries count two (2) points.
+            if (mycontinent == "NA" and continent == "NA") and mycountry != entity:
                 return 2
-            if mycontinent == continent:
+
+            # Contacts between stations on the same continent but in different countries count one (1) point.
+            if mycountry.upper() != entity.upper():
                 return 1
-            return 3
+
+            # Contacts between stations in the same country have zero (0) QSO point value, but count for zone and country multiplier credit.
+
     return 0
 
 

{not1mm-24.11.24.1 → not1mm-24.11.25}/not1mm/plugins/cq_ww_ssb.py

@@ -149,13 +149,21 @@ def points(self):
         for item in result.items():
             entity = item[1].get("entity", "")
             continent = item[1].get("continent", "")
-            if mycountry.upper() == entity.upper():
-                return 0
-            if mycontinent and continent == "NA":
+
+            # Contacts between stations on different continents count three (3) points.
+            if mycontinent != continent:
+                return 3
+
+            # Exception: Contacts between stations in different countries within the North American boundaries count two (2) points.
+            if (mycontinent == "NA" and continent == "NA") and mycountry != entity:
                 return 2
-            if mycontinent == continent:
+
+            # Contacts between stations on the same continent but in different countries count one (1) point.
+            if mycountry.upper() != entity.upper():
                 return 1
-            return 3
+
+            # Contacts between stations in the same country have zero (0) QSO point value, but count for zone and country multiplier credit.
+
     return 0
 
 

{not1mm-24.11.24.1 → not1mm-24.11.25}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.11.24.1
+Version: 24.11.25
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -238,6 +238,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-22-15] Fix CQWW points, fix mode showing as RPRT.
 - [24-11-24-1] Add ESM to CQ160, ARRL VHF, ARRL 10M, 10 10 contests.
 - [24-11-24] Added ESM to IARU HF and FieldDay.
 - [24-11-23] Made macros per contest.

{not1mm-24.11.24.1 → not1mm-24.11.25}/pyproject.toml

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

not1mm-24.11.24.1/not1mm/lib/version.py

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