not1mm 24.9.10__tar.gz → 24.9.10.2__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.10
+Version: 24.9.10.2
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -229,6 +229,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-10-2] Removed mapping of FM to PH in the ARRL VHF Cabrillo logs
+- [24-9-10-1] ft8_watcher now used default WSJT-X Multicast address and port.
 - [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.
@@ -615,8 +617,8 @@ appear. Those without will not.
 
 **FT8/FT4 Currently only working for ARRL Field Day.**
 
-not1mm listens for WSJT-X UDP traffic on the default localhost:2237. No setup is
-needed to be done on not1mm's side. That's good because I'm lazy.
+not1mm listens for WSJT-X UDP traffic on the Multicast address 224.0.0.1:2237.
+No setup is needed to be done on not1mm's side. That's good because I'm lazy.
 
 not1mm polls for fldigi QSOs via it's XMLRPC interface. It does this in a rather stupid
 way. It just keeps asking what was the last QSO and compares it to the previous response.

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

@@ -198,6 +198,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-10-2] Removed mapping of FM to PH in the ARRL VHF Cabrillo logs
+- [24-9-10-1] ft8_watcher now used default WSJT-X Multicast address and port.
 - [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.
@@ -584,8 +586,8 @@ appear. Those without will not.
 
 **FT8/FT4 Currently only working for ARRL Field Day.**
 
-not1mm listens for WSJT-X UDP traffic on the default localhost:2237. No setup is
-needed to be done on not1mm's side. That's good because I'm lazy.
+not1mm listens for WSJT-X UDP traffic on the Multicast address 224.0.0.1:2237.
+No setup is needed to be done on not1mm's side. That's good because I'm lazy.
 
 not1mm polls for fldigi QSOs via it's XMLRPC interface. It does this in a rather stupid
 way. It just keeps asking what was the last QSO and compares it to the previous response.

{not1mm-24.9.10 → not1mm-24.9.10.2}/not1mm/lib/ft8_watcher.py

@@ -23,9 +23,22 @@ class FT8Watcher:
     def __init__(self, *args, **kwargs):
         """Initialize"""
         super().__init__(*args, **kwargs)
-        self.callback = None
+        self.multicast_group = "224.0.0.1"
+        self.multicast_port = 2237
+        self.interface_ip = "0.0.0.0"
         self.udp_socket = QtNetwork.QUdpSocket()
-        self.udp_socket.bind(QtNetwork.QHostAddress.SpecialAddress.LocalHost, 2237)
+        b_result = self.udp_socket.bind(
+            QtNetwork.QHostAddress.SpecialAddress.AnyIPv4,
+            int(self.multicast_port),
+            QtNetwork.QAbstractSocket.BindFlag.ReuseAddressHint,
+        )
+        logger.info(f"multicast bind {b_result}")
+        join_result = self.udp_socket.joinMulticastGroup(
+            QtNetwork.QHostAddress(self.multicast_group)
+        )
+        logger.info(f"joinMulticastGroup result {join_result}")
+
+        self.callback = None
         self.udp_socket.readyRead.connect(self.on_udp_socket_ready_read)
 
     def set_callback(self, callback):

not1mm-24.9.10.2/not1mm/lib/version.py

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

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

@@ -379,7 +379,7 @@ def cabrillo(self):
             for contact in log:
                 the_date_and_time = contact.get("TS", "")
                 themode = contact.get("Mode", "")
-                if themode in ("LSB", "USB", "FM", "AM"):
+                if themode in ("LSB", "USB", "AM"):
                     themode = "PH"
                 if themode in (
                     "FT8",
@@ -476,8 +476,6 @@ def ft8_handler(the_packet: dict):
 
     """
     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", "")
@@ -502,7 +500,6 @@ def ft8_handler(the_packet: dict):
             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.10 → not1mm-24.9.10.2}/not1mm/plugins/arrl_vhf_jun.py

@@ -347,7 +347,7 @@ def cabrillo(self):
             for contact in log:
                 the_date_and_time = contact.get("TS", "")
                 themode = contact.get("Mode", "")
-                if themode in ("LSB", "USB", "FM", "AM"):
+                if themode in ("LSB", "USB", "AM"):
                     themode = "PH"
                 if themode in (
                     "FT8",
@@ -444,8 +444,6 @@ def ft8_handler(the_packet: dict):
 
     """
     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", "")
@@ -470,7 +468,6 @@ def ft8_handler(the_packet: dict):
             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.10 → not1mm-24.9.10.2}/not1mm/plugins/arrl_vhf_sep.py

@@ -347,7 +347,7 @@ def cabrillo(self):
             for contact in log:
                 the_date_and_time = contact.get("TS", "")
                 themode = contact.get("Mode", "")
-                if themode in ("LSB", "USB", "FM", "AM"):
+                if themode in ("LSB", "USB", "AM"):
                     themode = "PH"
                 if themode in (
                     "FT8",
@@ -444,8 +444,6 @@ def ft8_handler(the_packet: dict):
 
     """
     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", "")
@@ -470,7 +468,6 @@ def ft8_handler(the_packet: dict):
             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.10 → not1mm-24.9.10.2}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.10
+Version: 24.9.10.2
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -229,6 +229,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-10-2] Removed mapping of FM to PH in the ARRL VHF Cabrillo logs
+- [24-9-10-1] ft8_watcher now used default WSJT-X Multicast address and port.
 - [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.
@@ -615,8 +617,8 @@ appear. Those without will not.
 
 **FT8/FT4 Currently only working for ARRL Field Day.**
 
-not1mm listens for WSJT-X UDP traffic on the default localhost:2237. No setup is
-needed to be done on not1mm's side. That's good because I'm lazy.
+not1mm listens for WSJT-X UDP traffic on the Multicast address 224.0.0.1:2237.
+No setup is needed to be done on not1mm's side. That's good because I'm lazy.
 
 not1mm polls for fldigi QSOs via it's XMLRPC interface. It does this in a rather stupid
 way. It just keeps asking what was the last QSO and compares it to the previous response.

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

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

not1mm-24.9.10/not1mm/lib/version.py

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