Add RTC to ARRL 10M, Tweaked cabrillo file output.

mbridak · Dec 8, 2024 · 6d4c66b · 6d4c66b
1 parent 27a76b4
commit 6d4c66b
Show file tree

Hide file tree

Showing 48 changed files with 194 additions and 49 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+- [24-12-8-2] Add RTC to ARRL 10M, Tweaked cabrillo file output.
 - [24-12-8-1] Changed cabrillo names for Weekly RTTY, CW Ops CWT and K1USN SST.
 - [24-12-8] Fix: Weekly RTTY mults. Add RTC to Weekly RTTY.
 - [24-12-6] Add RTC to K1USN.

diff --git a/README.md b/README.md
@@ -208,6 +208,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-12-8-2] Add RTC to ARRL 10M, Tweaked cabrillo file output.
 - [24-12-8-1] Changed cabrillo names for Weekly RTTY, CW Ops CWT and K1USN SST.
 - [24-12-8] Fix: Weekly RTTY mults. Add RTC to Weekly RTTY.
 - [24-12-6] Add RTC to K1USN.

diff --git a/not1mm/__main__.py b/not1mm/__main__.py
@@ -2634,7 +2634,7 @@ def save_settings(self) -> None:
         self.station["SAntH2"] = self.settings_dialog.ASL.text()
         self.station["ARRLSection"] = self.settings_dialog.ARRLSection.text().upper()
         self.station["RoverQTH"] = self.settings_dialog.RoverQTH.text()
-        self.station["Club"] = self.settings_dialog.Club.text().title()
+        self.station["Club"] = self.settings_dialog.Club.text()
         self.station["Email"] = self.settings_dialog.Email.text()
         self.database.add_station(self.station)
         self.settings_dialog.close()

diff --git a/not1mm/lib/plugin_common.py b/not1mm/lib/plugin_common.py
@@ -23,6 +23,8 @@ def online_score_xml(self):
     assisted = self.contest_settings.get("AssistedCategory", "")
     bands = self.contest_settings.get("BandCategory", "")
     modes = self.contest_settings.get("ModeCategory", "")
+    if modes in ["SSB+CW", "SSB+CW+DIGITAL"]:
+        modes = "MIXED"
     xmiter = self.contest_settings.get("TransmitterCategory", "")
     ops = self.contest_settings.get("OperatorCategory", "")
     overlay = self.contest_settings.get("OverlayCategory", "")
@@ -35,7 +37,7 @@ def online_score_xml(self):
         f'<call>{self.station.get("Call", "")}</call>'
         # <ops>NR9Q</ops>
         f'<class power="{power}" assisted = "{assisted}" transmitter="{xmiter}" ops="{ops}" bands="{bands}" mode="{modes}" overlay="{overlay}"></class>'
-        f"<club>{self.station.get('Club', '').upper()}</club>"
+        f"<club>{self.station.get('Club', '')}</club>"
         "<soft>Not1MM</soft>"
         f"<version>{__version__}</version>"
         "<qth>"

diff --git a/not1mm/lib/version.py b/not1mm/lib/version.py
@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.12.8.1"
+__version__ = "24.12.8.2"
diff --git a/not1mm/plugins/10_10_fall_cw.py b/not1mm/plugins/10_10_fall_cw.py
@@ -238,8 +238,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/10_10_spring_cw.py b/not1mm/plugins/10_10_spring_cw.py
@@ -237,8 +237,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/10_10_summer_phone.py b/not1mm/plugins/10_10_summer_phone.py
@@ -241,8 +241,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/10_10_winter_phone.py b/not1mm/plugins/10_10_winter_phone.py
@@ -239,8 +239,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/arrl_10m.py b/not1mm/plugins/arrl_10m.py
@@ -52,7 +52,7 @@
 from pathlib import Path
 from PyQt6 import QtWidgets
 
-from not1mm.lib.plugin_common import gen_adif, get_points
+from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
 from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
@@ -174,7 +174,7 @@ def points(self):
     return 0
 
 
-def show_mults(self):
+def show_mults(self, rtc=None):
     """Return display string for mults"""
     # CountryPrefix, integer
 
@@ -212,6 +212,9 @@ def show_mults(self):
     if result:
         dx = result.get("mult_count", 0)
 
+    if rtc is not None:
+        return dx, us_ve_mx + mm
+
     return us_ve_mx + mm + dx
 
 
@@ -285,7 +288,7 @@ def cabrillo(self, file_encoding):
             )
             if self.station.get("Club", ""):
                 output_cabrillo_line(
-                    f"CLUB: {self.station.get('Club', '').upper()}",
+                    f"CLUB: {self.station.get('Club', '')}",
                     "\r\n",
                     file_descriptor,
                     file_encoding,
@@ -320,8 +323,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,
@@ -551,3 +557,15 @@ def check_call_history(self):
         self.history_info.setText(f"{result.get('UserText','')}")
         if self.other_2.text() == "":
             self.other_2.setText(f"{result.get('State', '')}")
+
+
+def get_mults(self):
+    """"""
+    mults = {}
+    mults["country"], mults["state"] = show_mults(self, rtc=True)
+    return mults
+
+
+def just_points(self):
+    """"""
+    return get_points(self)
diff --git a/not1mm/plugins/arrl_160m.py b/not1mm/plugins/arrl_160m.py
@@ -331,8 +331,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/arrl_dx_cw.py b/not1mm/plugins/arrl_dx_cw.py
@@ -264,8 +264,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/arrl_dx_ssb.py b/not1mm/plugins/arrl_dx_ssb.py
@@ -264,8 +264,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/arrl_field_day.py b/not1mm/plugins/arrl_field_day.py
@@ -221,8 +221,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/arrl_ss_cw.py b/not1mm/plugins/arrl_ss_cw.py
@@ -266,8 +266,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/arrl_ss_phone.py b/not1mm/plugins/arrl_ss_phone.py
@@ -247,8 +247,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/arrl_vhf_jan.py b/not1mm/plugins/arrl_vhf_jan.py
@@ -297,8 +297,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/arrl_vhf_jun.py b/not1mm/plugins/arrl_vhf_jun.py
@@ -265,8 +265,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/arrl_vhf_sep.py b/not1mm/plugins/arrl_vhf_sep.py
@@ -265,8 +265,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/canada_day.py b/not1mm/plugins/canada_day.py
@@ -288,8 +288,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/cq_160_cw.py b/not1mm/plugins/cq_160_cw.py
@@ -276,8 +276,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/cq_160_ssb.py b/not1mm/plugins/cq_160_ssb.py
@@ -276,8 +276,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/cq_wpx_cw.py b/not1mm/plugins/cq_wpx_cw.py
@@ -309,8 +309,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/cq_wpx_rtty.py b/not1mm/plugins/cq_wpx_rtty.py
@@ -308,8 +308,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/cq_wpx_ssb.py b/not1mm/plugins/cq_wpx_ssb.py
@@ -272,8 +272,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/cq_ww_cw.py b/not1mm/plugins/cq_ww_cw.py
@@ -306,8 +306,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/cq_ww_rtty.py b/not1mm/plugins/cq_ww_rtty.py
@@ -296,8 +296,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,

diff --git a/not1mm/plugins/cq_ww_ssb.py b/not1mm/plugins/cq_ww_ssb.py
@@ -283,8 +283,11 @@ def cabrillo(self, file_encoding):
                 file_descriptor,
                 file_encoding,
             )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
             output_cabrillo_line(
-                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                f"CATEGORY-MODE: {mode}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,