not1mm 25.1.1__tar.gz → 25.1.15__tar.gz

{not1mm-25.1.1 → not1mm-25.1.15}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: not1mm
-Version: 25.1.1
+Version: 25.1.15
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -240,6 +240,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [25-1-15] Fix bug in ADIF output where mode showed as CW-R and not CW.
+- [25-1-6] Altered RTTY RU UDP ADIF parse.
 - [25-1-1] Added ARRL RTTY RU.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.

{not1mm-25.1.1 → not1mm-25.1.15}/README.md

@@ -209,6 +209,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [25-1-15] Fix bug in ADIF output where mode showed as CW-R and not CW.
+- [25-1-6] Altered RTTY RU UDP ADIF parse.
 - [25-1-1] Added ARRL RTTY RU.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.

{not1mm-25.1.1 → not1mm-25.1.15}/not1mm/lib/plugin_common.py

@@ -89,7 +89,7 @@ def gen_adif(self, cabrillo_name: str, contest_id=""):
                 hisname = contact.get("Name", "")
                 the_date_and_time = contact.get("TS", "")
                 themode = contact.get("Mode", "")
-                if themode == "CWR":
+                if themode in ("CWR", "CW-R"):
                     themode = "CW"
                 if cabrillo_name in ("CQ-WW-RTTY", "WEEKLY-RTTY"):
                     themode = "RTTY"

{not1mm-25.1.1 → not1mm-25.1.15}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.1.1"
+__version__ = "25.1.15"

{not1mm-25.1.1 → not1mm-25.1.15}/not1mm/plugins/arrl_rtty_ru.py

@@ -1,34 +1,32 @@
 """
-Mode:	RTTY
- 	Bands:	80, 40, 20, 15, 10m
- 	Classes:	Single Op (QRP/Low/High)
-Single Op Unlimited (QRP/Low/High)
-Single Op Overlay: (Limited Antennas)
-Multi-Single (Low/High)
-Multi-Two
-Multi-Multi
- 	Max operating hours:	24 hours
- 	Max power:	HP: 1500 watts
-LP: 100 watts
- 	Exchange:	W/VE: RST + (state/province)
-non-W/VE: RST + Serial No.
- 	Work stations:	Once per band
- 	QSO Points:	1 point per QSO
- 	Multipliers:	Each US state+DC (except KH6/KL7) once only
-Each VE province/territory once only
-Each DXCC country (including KH6/KL7) once only
- 	Score Calculation:	Total score = total QSO points x total mults
- 	Submit logs by:	2359Z January 12, 2025
- 	E-mail logs to:	(none)
- 	Upload log at:	https://contest-log-submission.arrl.org/
- 	Mail logs to:	RTTY Roundup
-ARRL
-225 Main St.
-Newington, CT 06111
-USA
- 	Find rules at:	https://www.arrl.org/rtty-roundup
-
-
+Mode:       RTTY
+Bands:      80, 40, 20, 15, 10m
+Classes:	Single Op (QRP/Low/High)
+            Single Op Unlimited (QRP/Low/High)
+            Single Op Overlay: (Limited Antennas)
+            Multi-Single (Low/High)
+            Multi-Two
+            Multi-Multi
+Max operating hours:	24 hours
+Max power:	HP: 1500 watts
+            LP: 100 watts
+Exchange:	W/VE: RST + (state/province)
+            non-W/VE: RST + Serial No.
+Work stations:	Once per band
+QSO Points:	1 point per QSO
+Multipliers:	Each US state+DC (except KH6/KL7) once only
+                Each VE province/territory once only
+                Each DXCC country (including KH6/KL7) once only
+Score Calculation:	Total score = total QSO points x total mults
+Submit logs by:	2359Z January 12, 2025
+E-mail logs to:	(none)
+Upload log at:	https://contest-log-submission.arrl.org/
+Mail logs to:	RTTY Roundup
+                ARRL
+                225 Main St.
+                Newington, CT 06111
+                USA
+Find rules at:	https://www.arrl.org/rtty-roundup
 """
 
 # pylint: disable=invalid-name, unused-argument, unused-variable, c-extension-no-member
@@ -39,6 +37,7 @@ import logging
 from pathlib import Path
 from PyQt6 import QtWidgets
 
+from not1mm.lib.ham_utility import get_logged_band
 from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
 from not1mm.lib.version import __version__
 
@@ -541,3 +540,129 @@ def get_mults(self):
 def just_points(self):
     """"""
     return get_points(self)
+
+
+def set_self(the_outie):
+    """..."""
+    globals()["ALTEREGO"] = the_outie
+
+
+def ft8_handler(the_packet: dict):
+    print(f"{the_packet=}")
+    """Process FT8 QSO packets
+    FT8
+    {
+        'CALL': 'KE0OG',
+        'GRIDSQUARE': 'DM10AT',
+        'MODE': 'FT8',
+        'RST_SENT': '',
+        'RST_RCVD': '',
+        'QSO_DATE': '20210329',
+        'TIME_ON': '183213',
+        'QSO_DATE_OFF': '20210329',
+        'TIME_OFF': '183213',
+        'BAND': '20M',
+        'FREQ': '14.074754',
+        'STATION_CALLSIGN': 'K6GTE',
+        'MY_GRIDSQUARE': 'DM13AT',
+        'CONTEST_ID': 'ARRL-FIELD-DAY',
+        'SRX_STRING': '1D UT',
+        'CLASS': '1D',
+        'ARRL_SECT': 'UT'
+    }
+    FlDigi
+    {
+        'CALL': 'K5TUS', 
+        'MODE': 'RTTY', 
+        'FREQ': '14.068415', 
+        'BAND': '20M', 
+        'QSO_DATE': '20250103', 
+        'TIME_ON': '2359', 
+        'QSO_DATE_OFF': '20250103', 
+        'TIME_OFF': '2359', 
+        'NAME': '', 
+        'QTH': '', 
+        'STATE': 'ORG', 
+        'VE_PROV': '', 
+        'COUNTRY': 'USA', 
+        'RST_SENT': '599', 
+        'RST_RCVD': '599', 
+        'TX_PWR': '0', 
+        'CNTY': '', 
+        'DXCC': '', 
+        'CQZ': '5', 
+        'IOTA': '', 
+        'CONT': '', 
+        'ITUZ': '', 
+        'GRIDSQUARE': '', 
+        'QSLRDATE': '', 
+        'QSLSDATE': '', 
+        'EQSLRDATE': '', 
+        'EQSLSDATE': '', 
+        'LOTWRDATE': '', 
+        'LOTWSDATE': '', 
+        'QSL_VIA': '', 
+        'NOTES': '', 
+        'SRX': '', 
+        'STX': '000', 
+        'SRX_STRING': '', 
+        'STX_STRING': 'CA', 
+
+
+        'SRX': '666', 
+        'STX': '000', 
+        'SRX_STRING': '', 
+        'STX_STRING': 'CA',
+
+        'SRX': '004', 'STX': '000', 'SRX_STRING': '', 'STX_STRING': '#',
+
+        'CLASS': '', 
+        'ARRL_SECT': '', 
+        'OPERATOR': 'K6GTE', 
+        'STATION_CALLSIGN': 'K6GTE', 
+        'MY_GRIDSQUARE': 'DM13AT', 
+        'MY_CITY': 'ANAHEIM, CA', 
+        'CHECK': '', 
+        'AGE': '', 
+        'TEN_TEN': '', 
+        'CWSS_PREC': '', 
+        'CWSS_SECTION': '', 
+        'CWSS_SERNO': '', 
+        'CWSS_CHK': ''
+    }
+
+    """
+    logger.debug(f"{the_packet=}")
+    if ALTEREGO is not None:
+        ALTEREGO.callsign.setText(the_packet.get("CALL"))
+        ALTEREGO.contact["Call"] = the_packet.get("CALL", "")
+        ALTEREGO.contact["SNT"] = the_packet.get("RST_SENT", "599")
+        ALTEREGO.contact["RCV"] = the_packet.get("RST_RCVD", "599")
+
+        sent_string = the_packet.get("STX_STRING", "")
+        if sent_string != "":
+            ALTEREGO.contact["SentNr"] = sent_string
+            ALTEREGO.other_1.setText(str(sent_string))
+        else:
+            ALTEREGO.contact["SentNr"] = the_packet.get("STX", "000")
+            ALTEREGO.other_1.setText(str(the_packet.get("STX", "000")))
+
+        rx_string = the_packet.get("STATE", "")
+        if rx_string != "":
+            ALTEREGO.contact["NR"] = rx_string
+            ALTEREGO.other_2.setText(str(rx_string))
+        else:
+            ALTEREGO.contact["NR"] = the_packet.get("SRX", "000")
+            ALTEREGO.other_2.setText(str(the_packet.get("SRX", "000")))
+
+        ALTEREGO.contact["Mode"] = the_packet.get("MODE", "ERR")
+        ALTEREGO.contact["Freq"] = round(float(the_packet.get("FREQ", "0.0")) * 1000, 2)
+        ALTEREGO.contact["QSXFreq"] = round(
+            float(the_packet.get("FREQ", "0.0")) * 1000, 2
+        )
+        ALTEREGO.contact["Band"] = get_logged_band(
+            str(int(float(the_packet.get("FREQ", "0.0")) * 1000000))
+        )
+        logger.debug(f"{ALTEREGO.contact=}")
+
+        ALTEREGO.save_contact()

{not1mm-25.1.1 → not1mm-25.1.15}/not1mm/plugins/winter_field_day.py

@@ -330,6 +330,8 @@ def cabrillo(self, file_encoding):
                 themode = contact.get("Mode", "")
                 if themode == "LSB" or themode == "USB":
                     themode = "PH"
+                if themode == "RTTY":
+                    themode = "DG"
                 frequency = str(int(contact.get("Freq", "0"))).rjust(5)
 
                 loggeddate = the_date_and_time[:10]

{not1mm-25.1.1 → not1mm-25.1.15}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: not1mm
-Version: 25.1.1
+Version: 25.1.15
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -240,6 +240,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [25-1-15] Fix bug in ADIF output where mode showed as CW-R and not CW.
+- [25-1-6] Altered RTTY RU UDP ADIF parse.
 - [25-1-1] Added ARRL RTTY RU.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.

{not1mm-25.1.1 → not1mm-25.1.15}/pyproject.toml

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