Skip to content

Commit 6d4c66b

Browse files
mbridakmbridak
committed
Add RTC to ARRL 10M, Tweaked cabrillo file output.
1 parent 27a76b4 commit 6d4c66b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+194
-49
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Changelog
22

3+
- [24-12-8-2] Add RTC to ARRL 10M, Tweaked cabrillo file output.
34
- [24-12-8-1] Changed cabrillo names for Weekly RTTY, CW Ops CWT and K1USN SST.
45
- [24-12-8] Fix: Weekly RTTY mults. Add RTC to Weekly RTTY.
56
- [24-12-6] Add RTC to K1USN.

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
208208

209209
## Recent Changes (Polishing the Turd)
210210

211+
- [24-12-8-2] Add RTC to ARRL 10M, Tweaked cabrillo file output.
211212
- [24-12-8-1] Changed cabrillo names for Weekly RTTY, CW Ops CWT and K1USN SST.
212213
- [24-12-8] Fix: Weekly RTTY mults. Add RTC to Weekly RTTY.
213214
- [24-12-6] Add RTC to K1USN.

‎not1mm/__main__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2634,7 +2634,7 @@ def save_settings(self) -> None:
26342634
self.station["SAntH2"] = self.settings_dialog.ASL.text()
26352635
self.station["ARRLSection"] = self.settings_dialog.ARRLSection.text().upper()
26362636
self.station["RoverQTH"] = self.settings_dialog.RoverQTH.text()
2637-
self.station["Club"] = self.settings_dialog.Club.text().title()
2637+
self.station["Club"] = self.settings_dialog.Club.text()
26382638
self.station["Email"] = self.settings_dialog.Email.text()
26392639
self.database.add_station(self.station)
26402640
self.settings_dialog.close()

‎not1mm/lib/plugin_common.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ def online_score_xml(self):
2323
assisted = self.contest_settings.get("AssistedCategory", "")
2424
bands = self.contest_settings.get("BandCategory", "")
2525
modes = self.contest_settings.get("ModeCategory", "")
26+
if modes in ["SSB+CW", "SSB+CW+DIGITAL"]:
27+
modes = "MIXED"
2628
xmiter = self.contest_settings.get("TransmitterCategory", "")
2729
ops = self.contest_settings.get("OperatorCategory", "")
2830
overlay = self.contest_settings.get("OverlayCategory", "")
@@ -35,7 +37,7 @@ def online_score_xml(self):
3537
f'<call>{self.station.get("Call", "")}</call>'
3638
# <ops>NR9Q</ops>
3739
f'<class power="{power}" assisted = "{assisted}" transmitter="{xmiter}" ops="{ops}" bands="{bands}" mode="{modes}" overlay="{overlay}"></class>'
38-
f"<club>{self.station.get('Club', '').upper()}</club>"
40+
f"<club>{self.station.get('Club', '')}</club>"
3941
"<soft>Not1MM</soft>"
4042
f"<version>{__version__}</version>"
4143
"<qth>"

‎not1mm/lib/version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
"""It's the version"""
22

3-
__version__ = "24.12.8.1"
3+
__version__ = "24.12.8.2"

‎not1mm/plugins/10_10_fall_cw.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,11 @@ def cabrillo(self, file_encoding):
238238
file_descriptor,
239239
file_encoding,
240240
)
241+
mode = self.contest_settings.get("ModeCategory", "")
242+
if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
243+
mode = "MIXED"
241244
output_cabrillo_line(
242-
f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
245+
f"CATEGORY-MODE: {mode}",
243246
"\r\n",
244247
file_descriptor,
245248
file_encoding,

‎not1mm/plugins/10_10_spring_cw.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,11 @@ def cabrillo(self, file_encoding):
237237
file_descriptor,
238238
file_encoding,
239239
)
240+
mode = self.contest_settings.get("ModeCategory", "")
241+
if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
242+
mode = "MIXED"
240243
output_cabrillo_line(
241-
f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
244+
f"CATEGORY-MODE: {mode}",
242245
"\r\n",
243246
file_descriptor,
244247
file_encoding,

‎not1mm/plugins/10_10_summer_phone.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,11 @@ def cabrillo(self, file_encoding):
241241
file_descriptor,
242242
file_encoding,
243243
)
244+
mode = self.contest_settings.get("ModeCategory", "")
245+
if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
246+
mode = "MIXED"
244247
output_cabrillo_line(
245-
f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
248+
f"CATEGORY-MODE: {mode}",
246249
"\r\n",
247250
file_descriptor,
248251
file_encoding,

‎not1mm/plugins/10_10_winter_phone.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,11 @@ def cabrillo(self, file_encoding):
239239
file_descriptor,
240240
file_encoding,
241241
)
242+
mode = self.contest_settings.get("ModeCategory", "")
243+
if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
244+
mode = "MIXED"
242245
output_cabrillo_line(
243-
f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
246+
f"CATEGORY-MODE: {mode}",
244247
"\r\n",
245248
file_descriptor,
246249
file_encoding,

‎not1mm/plugins/arrl_10m.py‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
from pathlib import Path
5353
from PyQt6 import QtWidgets
5454

55-
from not1mm.lib.plugin_common import gen_adif, get_points
55+
from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
5656
from not1mm.lib.version import __version__
5757

5858
logger = logging.getLogger(__name__)
@@ -174,7 +174,7 @@ def points(self):
174174
return 0
175175

176176

177-
def show_mults(self):
177+
def show_mults(self, rtc=None):
178178
"""Return display string for mults"""
179179
# CountryPrefix, integer
180180

@@ -212,6 +212,9 @@ def show_mults(self):
212212
if result:
213213
dx = result.get("mult_count", 0)
214214

215+
if rtc is not None:
216+
return dx, us_ve_mx + mm
217+
215218
return us_ve_mx + mm + dx
216219

217220

@@ -285,7 +288,7 @@ def cabrillo(self, file_encoding):
285288
)
286289
if self.station.get("Club", ""):
287290
output_cabrillo_line(
288-
f"CLUB: {self.station.get('Club', '').upper()}",
291+
f"CLUB: {self.station.get('Club', '')}",
289292
"\r\n",
290293
file_descriptor,
291294
file_encoding,
@@ -320,8 +323,11 @@ def cabrillo(self, file_encoding):
320323
file_descriptor,
321324
file_encoding,
322325
)
326+
mode = self.contest_settings.get("ModeCategory", "")
327+
if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
328+
mode = "MIXED"
323329
output_cabrillo_line(
324-
f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
330+
f"CATEGORY-MODE: {mode}",
325331
"\r\n",
326332
file_descriptor,
327333
file_encoding,
@@ -551,3 +557,15 @@ def check_call_history(self):
551557
self.history_info.setText(f"{result.get('UserText','')}")
552558
if self.other_2.text() == "":
553559
self.other_2.setText(f"{result.get('State', '')}")
560+
561+
562+
def get_mults(self):
563+
""""""
564+
mults = {}
565+
mults["country"], mults["state"] = show_mults(self, rtc=True)
566+
return mults
567+
568+
569+
def just_points(self):
570+
""""""
571+
return get_points(self)

0 commit comments

Comments
 (0)