not1mm 24.9.9__tar.gz → 24.9.10__tar.gz

{not1mm-24.9.9 → not1mm-24.9.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.9
+Version: 24.9.10
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -171,7 +171,7 @@ when the program craps the bed. I'm only one guy, so if you see a bug let me kno
 
 I've recently added portions of code to watch for WSTJ-X and fldigi QSOs. I've added
 the Weekly RTTY Test, So RTTY could be tested. Also added FT8/4 and RTTY to ARRL Field
-Day. Praying that it works. I'll add more details later.
+Day and ARRL VHF. Praying that it works. I'll add more details later.
 
 ### Other not so supported contests
 
@@ -229,9 +229,10 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [24-9-9] Add IARU R1 Fieldday CW and SSB
+- [24-9-10] Add WSJT FT8/4 and fldigi support to ARRL VHF.
+- [24-9-9] Add IARU R1 Fieldday CW and SSB.
 - [24-9-8] Correct n1mm contact packet info.
-- [24-9-6] Added the Weekly RTTY
+- [24-9-6] Added the Weekly RTTY.
 - [24-9-5] Added FlDigi support for Field Day.
 - [24-9-3] Added WSJT-X FT8 mode contacts to ARRL Field Day.
 

{not1mm-24.9.9 → not1mm-24.9.10}/README.md

@@ -140,7 +140,7 @@ when the program craps the bed. I'm only one guy, so if you see a bug let me kno
 
 I've recently added portions of code to watch for WSTJ-X and fldigi QSOs. I've added
 the Weekly RTTY Test, So RTTY could be tested. Also added FT8/4 and RTTY to ARRL Field
-Day. Praying that it works. I'll add more details later.
+Day and ARRL VHF. Praying that it works. I'll add more details later.
 
 ### Other not so supported contests
 
@@ -198,9 +198,10 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [24-9-9] Add IARU R1 Fieldday CW and SSB
+- [24-9-10] Add WSJT FT8/4 and fldigi support to ARRL VHF.
+- [24-9-9] Add IARU R1 Fieldday CW and SSB.
 - [24-9-8] Correct n1mm contact packet info.
-- [24-9-6] Added the Weekly RTTY
+- [24-9-6] Added the Weekly RTTY.
 - [24-9-5] Added FlDigi support for Field Day.
 - [24-9-3] Added WSJT-X FT8 mode contacts to ARRL Field Day.
 

{not1mm-24.9.9 → not1mm-24.9.10}/not1mm/__main__.py

@@ -1936,7 +1936,15 @@ class MainWindow(QtWidgets.QMainWindow):
             " "
         )[:19]
         self.contact["Call"] = self.callsign.text()
-        if self.contact.get("Mode") not in ("FT8", "FT4", "RTTY"):
+        if self.contact.get("Mode") not in (
+            "FT8",
+            "FT4",
+            "RTTY",
+            "PSK31",
+            "FSK441",
+            "MSK144",
+            "JT65",
+        ):
             self.contact["Freq"] = round(
                 float(self.radio_state.get("vfoa", 0.0)) / 1000, 2
             )

{not1mm-24.9.9 → not1mm-24.9.10}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.9.9"
+__version__ = "24.9.10"

{not1mm-24.9.9 → not1mm-24.9.10}/not1mm/plugins/arrl_vhf_jan.py

@@ -43,11 +43,13 @@ 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
 from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+ALTEREGO = None
 EXCHANGE_HINT = "4-character grid square"
 
 name = "ARRL VHF JAN"
@@ -58,6 +60,7 @@ columns = [
     "YYYY-MM-DD HH:MM:SS",
     "Call",
     "Freq",
+    "Mode",
     "SentNr",
     "RcvNr",
     "PTS",
@@ -376,9 +379,21 @@ def cabrillo(self):
             for contact in log:
                 the_date_and_time = contact.get("TS", "")
                 themode = contact.get("Mode", "")
-                if themode == "LSB" or themode == "USB":
+                if themode in ("LSB", "USB", "FM", "AM"):
                     themode = "PH"
-                frequency = str(int(contact.get("Freq", "0"))).rjust(5)
+                if themode in (
+                    "FT8",
+                    "FT4",
+                    "RTTY",
+                    "PSK31",
+                    "FSK441",
+                    "MSK144",
+                    "JT65",
+                ):
+                    themode = "DG"
+                freq = int(contact.get("Freq", "0")) / 1000
+
+                frequency = str(int(freq)).rjust(4)
 
                 loggeddate = the_date_and_time[:10]
                 loggedtime = the_date_and_time[11:13] + the_date_and_time[14:16]
@@ -403,3 +418,91 @@ def cabrillo(self):
 
 def recalculate_mults(self):
     """Recalculates multipliers after change in logged qso."""
+
+
+def set_self(the_outie):
+    """..."""
+    globals()["ALTEREGO"] = the_outie
+
+
+def ft8_handler(the_packet: dict):
+    """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
+    {
+        'FREQ': '7.029500',
+        'CALL': 'DL2DSL',
+        'MODE': 'RTTY',
+        'NAME': 'BOB',
+        'QSO_DATE': '20240904',
+        'QSO_DATE_OFF': '20240904',
+        'TIME_OFF': '212825',
+        'TIME_ON': '212800',
+        'RST_RCVD': '599',
+        'RST_SENT': '599',
+        'BAND': '40M',
+        'COUNTRY': 'FED. REP. OF GERMANY',
+        'CQZ': '14',
+        'STX': '000',
+        'STX_STRING': '1D ORG',
+        'CLASS': '1D',
+        'ARRL_SECT': 'DX',
+        'TX_PWR': '0',
+        'OPERATOR': 'K6GTE',
+        'STATION_CALLSIGN': 'K6GTE',
+        'MY_GRIDSQUARE': 'DM13AT',
+        'MY_CITY': 'ANAHEIM, CA',
+        'MY_STATE': 'CA'
+    }
+
+    """
+    logger.debug(f"{the_packet=}")
+    print(f"{the_packet=}\n")
+    print(f"{ALTEREGO.contact=}\n")
+    if ALTEREGO is not None:
+        ALTEREGO.callsign.setText(the_packet.get("CALL"))
+        ALTEREGO.contact["Call"] = the_packet.get("CALL", "")
+        ALTEREGO.contact["SNT"] = ALTEREGO.sent.text()
+        ALTEREGO.contact["RCV"] = ALTEREGO.receive.text()
+        my_grid = the_packet.get("MY_GRIDSQUARE", "")
+        if my_grid:
+            if len(my_grid) > 4:
+                my_grid = my_grid[:4]
+        their_grid = the_packet.get("GRIDSQUARE", "")
+        if their_grid:
+            if len(their_grid) > 4:
+                their_grid = their_grid[:4]
+        ALTEREGO.contact["NR"] = their_grid
+        # ALTEREGO.contact["Sect"] = the_packet.get("ARRL_SECT", "ERR")
+        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=}")
+        print(f"{ALTEREGO.contact=}\n")
+        ALTEREGO.other_1.setText(my_grid)
+        ALTEREGO.other_2.setText(their_grid)
+        ALTEREGO.save_contact()

{not1mm-24.9.9 → not1mm-24.9.10}/not1mm/plugins/arrl_vhf_jun.py

@@ -11,11 +11,13 @@ 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
 from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+ALTEREGO = None
 EXCHANGE_HINT = "4-character grid square"
 
 name = "ARRL VHF JUN"
@@ -26,6 +28,7 @@ columns = [
     "YYYY-MM-DD HH:MM:SS",
     "Call",
     "Freq",
+    "Mode",
     "SentNr",
     "RcvNr",
     "PTS",
@@ -344,9 +347,21 @@ def cabrillo(self):
             for contact in log:
                 the_date_and_time = contact.get("TS", "")
                 themode = contact.get("Mode", "")
-                if themode == "LSB" or themode == "USB":
+                if themode in ("LSB", "USB", "FM", "AM"):
                     themode = "PH"
-                frequency = str(int(contact.get("Freq", "0"))).rjust(5)
+                if themode in (
+                    "FT8",
+                    "FT4",
+                    "RTTY",
+                    "PSK31",
+                    "FSK441",
+                    "MSK144",
+                    "JT65",
+                ):
+                    themode = "DG"
+                freq = int(contact.get("Freq", "0")) / 1000
+
+                frequency = str(int(freq)).rjust(4)
 
                 loggeddate = the_date_and_time[:10]
                 loggedtime = the_date_and_time[11:13] + the_date_and_time[14:16]
@@ -371,3 +386,91 @@ def cabrillo(self):
 
 def recalculate_mults(self):
     """Recalculates multipliers after change in logged qso."""
+
+
+def set_self(the_outie):
+    """..."""
+    globals()["ALTEREGO"] = the_outie
+
+
+def ft8_handler(the_packet: dict):
+    """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
+    {
+        'FREQ': '7.029500',
+        'CALL': 'DL2DSL',
+        'MODE': 'RTTY',
+        'NAME': 'BOB',
+        'QSO_DATE': '20240904',
+        'QSO_DATE_OFF': '20240904',
+        'TIME_OFF': '212825',
+        'TIME_ON': '212800',
+        'RST_RCVD': '599',
+        'RST_SENT': '599',
+        'BAND': '40M',
+        'COUNTRY': 'FED. REP. OF GERMANY',
+        'CQZ': '14',
+        'STX': '000',
+        'STX_STRING': '1D ORG',
+        'CLASS': '1D',
+        'ARRL_SECT': 'DX',
+        'TX_PWR': '0',
+        'OPERATOR': 'K6GTE',
+        'STATION_CALLSIGN': 'K6GTE',
+        'MY_GRIDSQUARE': 'DM13AT',
+        'MY_CITY': 'ANAHEIM, CA',
+        'MY_STATE': 'CA'
+    }
+
+    """
+    logger.debug(f"{the_packet=}")
+    print(f"{the_packet=}\n")
+    print(f"{ALTEREGO.contact=}\n")
+    if ALTEREGO is not None:
+        ALTEREGO.callsign.setText(the_packet.get("CALL"))
+        ALTEREGO.contact["Call"] = the_packet.get("CALL", "")
+        ALTEREGO.contact["SNT"] = ALTEREGO.sent.text()
+        ALTEREGO.contact["RCV"] = ALTEREGO.receive.text()
+        my_grid = the_packet.get("MY_GRIDSQUARE", "")
+        if my_grid:
+            if len(my_grid) > 4:
+                my_grid = my_grid[:4]
+        their_grid = the_packet.get("GRIDSQUARE", "")
+        if their_grid:
+            if len(their_grid) > 4:
+                their_grid = their_grid[:4]
+        ALTEREGO.contact["NR"] = their_grid
+        # ALTEREGO.contact["Sect"] = the_packet.get("ARRL_SECT", "ERR")
+        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=}")
+        print(f"{ALTEREGO.contact=}\n")
+        ALTEREGO.other_1.setText(my_grid)
+        ALTEREGO.other_2.setText(their_grid)
+        ALTEREGO.save_contact()

{not1mm-24.9.9 → not1mm-24.9.10}/not1mm/plugins/arrl_vhf_sep.py

@@ -11,11 +11,13 @@ 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
 from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+ALTEREGO = None
 EXCHANGE_HINT = "4-character grid square"
 
 name = "ARRL VHF SEP"
@@ -26,6 +28,7 @@ columns = [
     "YYYY-MM-DD HH:MM:SS",
     "Call",
     "Freq",
+    "Mode",
     "SentNr",
     "RcvNr",
     "PTS",
@@ -344,9 +347,21 @@ def cabrillo(self):
             for contact in log:
                 the_date_and_time = contact.get("TS", "")
                 themode = contact.get("Mode", "")
-                if themode == "LSB" or themode == "USB":
+                if themode in ("LSB", "USB", "FM", "AM"):
                     themode = "PH"
-                frequency = str(int(contact.get("Freq", "0"))).rjust(5)
+                if themode in (
+                    "FT8",
+                    "FT4",
+                    "RTTY",
+                    "PSK31",
+                    "FSK441",
+                    "MSK144",
+                    "JT65",
+                ):
+                    themode = "DG"
+                freq = int(contact.get("Freq", "0")) / 1000
+
+                frequency = str(int(freq)).rjust(4)
 
                 loggeddate = the_date_and_time[:10]
                 loggedtime = the_date_and_time[11:13] + the_date_and_time[14:16]
@@ -371,3 +386,91 @@ def cabrillo(self):
 
 def recalculate_mults(self):
     """Recalculates multipliers after change in logged qso."""
+
+
+def set_self(the_outie):
+    """..."""
+    globals()["ALTEREGO"] = the_outie
+
+
+def ft8_handler(the_packet: dict):
+    """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
+    {
+        'FREQ': '7.029500',
+        'CALL': 'DL2DSL',
+        'MODE': 'RTTY',
+        'NAME': 'BOB',
+        'QSO_DATE': '20240904',
+        'QSO_DATE_OFF': '20240904',
+        'TIME_OFF': '212825',
+        'TIME_ON': '212800',
+        'RST_RCVD': '599',
+        'RST_SENT': '599',
+        'BAND': '40M',
+        'COUNTRY': 'FED. REP. OF GERMANY',
+        'CQZ': '14',
+        'STX': '000',
+        'STX_STRING': '1D ORG',
+        'CLASS': '1D',
+        'ARRL_SECT': 'DX',
+        'TX_PWR': '0',
+        'OPERATOR': 'K6GTE',
+        'STATION_CALLSIGN': 'K6GTE',
+        'MY_GRIDSQUARE': 'DM13AT',
+        'MY_CITY': 'ANAHEIM, CA',
+        'MY_STATE': 'CA'
+    }
+
+    """
+    logger.debug(f"{the_packet=}")
+    print(f"{the_packet=}\n")
+    print(f"{ALTEREGO.contact=}\n")
+    if ALTEREGO is not None:
+        ALTEREGO.callsign.setText(the_packet.get("CALL"))
+        ALTEREGO.contact["Call"] = the_packet.get("CALL", "")
+        ALTEREGO.contact["SNT"] = ALTEREGO.sent.text()
+        ALTEREGO.contact["RCV"] = ALTEREGO.receive.text()
+        my_grid = the_packet.get("MY_GRIDSQUARE", "")
+        if my_grid:
+            if len(my_grid) > 4:
+                my_grid = my_grid[:4]
+        their_grid = the_packet.get("GRIDSQUARE", "")
+        if their_grid:
+            if len(their_grid) > 4:
+                their_grid = their_grid[:4]
+        ALTEREGO.contact["NR"] = their_grid
+        # ALTEREGO.contact["Sect"] = the_packet.get("ARRL_SECT", "ERR")
+        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=}")
+        print(f"{ALTEREGO.contact=}\n")
+        ALTEREGO.other_1.setText(my_grid)
+        ALTEREGO.other_2.setText(their_grid)
+        ALTEREGO.save_contact()

{not1mm-24.9.9 → not1mm-24.9.10}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.9
+Version: 24.9.10
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -171,7 +171,7 @@ when the program craps the bed. I'm only one guy, so if you see a bug let me kno
 
 I've recently added portions of code to watch for WSTJ-X and fldigi QSOs. I've added
 the Weekly RTTY Test, So RTTY could be tested. Also added FT8/4 and RTTY to ARRL Field
-Day. Praying that it works. I'll add more details later.
+Day and ARRL VHF. Praying that it works. I'll add more details later.
 
 ### Other not so supported contests
 
@@ -229,9 +229,10 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [24-9-9] Add IARU R1 Fieldday CW and SSB
+- [24-9-10] Add WSJT FT8/4 and fldigi support to ARRL VHF.
+- [24-9-9] Add IARU R1 Fieldday CW and SSB.
 - [24-9-8] Correct n1mm contact packet info.
-- [24-9-6] Added the Weekly RTTY
+- [24-9-6] Added the Weekly RTTY.
 - [24-9-5] Added FlDigi support for Field Day.
 - [24-9-3] Added WSJT-X FT8 mode contacts to ARRL Field Day.
 

{not1mm-24.9.9 → not1mm-24.9.10}/pyproject.toml

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