not1mm 24.9.3__tar.gz → 24.9.5__tar.gz

{not1mm-24.9.3 → not1mm-24.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.3
+Version: 24.9.5
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -226,6 +226,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-5] Added FlDigi support for Field Day.
 - [24-9-3] Added WSJT-X FT8 mode contacts to ARRL Field Day.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.

{not1mm-24.9.3 → not1mm-24.9.5}/README.md

@@ -195,6 +195,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-5] Added FlDigi support for Field Day.
 - [24-9-3] Added WSJT-X FT8 mode contacts to ARRL Field Day.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.

{not1mm-24.9.3 → not1mm-24.9.5}/not1mm/__main__.py

@@ -67,6 +67,7 @@ from not1mm.lib.settings import Settings
 from not1mm.lib.version import __version__
 from not1mm.lib.versiontest import VersionTest
 from not1mm.lib.ft8_watcher import FT8Watcher
+from not1mm.lib.fldigi_watcher import FlDigiWatcher
 
 import not1mm.fsutils as fsutils
 from not1mm.logwindow import LogWindow
@@ -163,7 +164,9 @@ class MainWindow(QtWidgets.QMainWindow):
 
     radio_thread = QThread()
     voice_thread = QThread()
+    fldigi_thread = QThread()
 
+    fldigi_watcher = None
     rig_control = None
     log_window = None
     check_window = None
@@ -193,7 +196,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.rightdot.hide()
         self.n1mm = N1MM()
         self.ft8 = FT8Watcher()
-        self.ft8.set_callback(self.ft8_result)
+        self.ft8.set_callback(None)
         self.mscp = SCP(fsutils.APP_DATA_PATH)
         self.next_field = self.other_2
         self.dupe_indicator.hide()
@@ -507,6 +510,13 @@ class MainWindow(QtWidgets.QMainWindow):
             | QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetMovable
         )
 
+        self.fldigi_watcher = FlDigiWatcher()
+        self.fldigi_watcher.moveToThread(self.fldigi_thread)
+        self.fldigi_thread.started.connect(self.fldigi_watcher.run)
+        self.fldigi_thread.finished.connect(self.fldigi_watcher.deleteLater)
+        self.fldigi_watcher.poll_callback.connect(self.fldigi_qso)
+        self.fldigi_thread.start()
+
         self.log_window = LogWindow()
         self.log_window.setObjectName("log-window")
         if os.environ.get("WAYLAND_DISPLAY"):
@@ -566,32 +576,50 @@ class MainWindow(QtWidgets.QMainWindow):
                     "You can udate to the current version by using:\npip install -U not1mm"
                 )
 
-    def ft8_result(self, result: dict):
+    def fldigi_qso(self, result: str):
         """
-        Callback for ft8 watcher
+        gets called when there is a new fldigi qso logged.
 
         {
-            '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',
+            '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',
-            'CONTEST_ID': 'ARRL-FIELD-DAY',
-            'SRX_STRING': '1D UT',
-            'CLASS': '1D',
-            'ARRL_SECT': 'UT'
+            'MY_CITY': 'ANAHEIM, CA',
+            'MY_STATE': 'CA'
         }
 
         """
-        print(f"{result=}")
+
+        datadict = {}
+        splitdata = result.upper().strip().split("<")
+        for data in splitdata:
+            if data:
+                tag = data.split(":")
+                if tag == ["EOR>"]:
+                    break
+                datadict[tag[0]] = tag[1].split(">")[1].strip()
+        logger.debug(f"{datadict=}")
+        if hasattr(self.contest, "ft8_handler"):
+            self.contest.set_self(self)
+            self.contest.ft8_handler(datadict)
 
     def setDarkMode(self, setdarkmode=False) -> None:
         """Forces a darkmode palette."""

not1mm-24.9.5/not1mm/lib/fldigi_watcher.py

@@ -0,0 +1,32 @@
+import xmlrpc.client
+from PyQt6.QtCore import QObject, pyqtSignal, QThread, QEventLoop
+
+
+class FlDigiWatcher(QObject):
+    """fldigi watcher"""
+
+    poll_callback = pyqtSignal(str)
+    time_to_quit = False
+
+    def __init__(self):
+        super().__init__()
+        ...
+
+        self.target = "http://127.0.0.1:7362"
+        self.payload = ""
+        self.response = ""
+
+    def run(self):
+        while not self.time_to_quit:
+            try:
+                server = xmlrpc.client.ServerProxy(self.target)
+                self.response = server.logbook.last_record()
+            except OSError:
+                continue
+            if self.payload != self.response:
+                self.payload = self.response
+                try:
+                    self.poll_callback.emit(self.payload)
+                except QEventLoop:
+                    ...
+            QThread.msleep(100)

{not1mm-24.9.3 → not1mm-24.9.5}/not1mm/lib/ft8_watcher.py

@@ -6,10 +6,14 @@ https://github.com/mbridak/not1mm
 GPL V3
 """
 
+import logging
+
 from PyQt6 import QtNetwork
 
 import struct
 
+logger = logging.getLogger(__name__)
+
 
 class FT8Watcher:
     """Main Window"""
@@ -64,7 +68,7 @@ class FT8Watcher:
         datagram, sender_host, sender_port_number = self.udp_socket.readDatagram(
             self.udp_socket.pendingDatagramSize()
         )
-        # print("%s %s %s", sender_host, sender_port_number, datagram)
+        logger.debug(f"{datagram=}")
 
         if datagram[0:4] != b"\xad\xbc\xcb\xda":
             return  # bail if no wsjt-x magic number

{not1mm-24.9.3 → not1mm-24.9.5}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.9.3"
+__version__ = "24.9.5"

{not1mm-24.9.3 → not1mm-24.9.5}/not1mm/plugins/arrl_field_day.py

@@ -296,9 +296,9 @@ def cabrillo(self):
             for contact in log:
                 the_date_and_time = contact.get("TS", "")
                 themode = contact.get("Mode", "")
-                if themode in ("LSB", "USB"):
+                if themode in ("LSB", "USB", "FM"):
                     themode = "PH"
-                if themode in ("FT8", "FT4"):
+                if themode in ("FT8", "FT4", "RTTY"):
                     themode = "DG"
                 frequency = str(int(contact.get("Freq", "0"))).rjust(5)
 
@@ -333,7 +333,7 @@ def set_self(the_outie):
 
 def ft8_handler(the_packet: dict):
     """Process FT8 QSO packets
-
+    FT8
     {
         'CALL': 'KE0OG',
         'GRIDSQUARE': 'DM10AT',
@@ -353,12 +353,36 @@ def ft8_handler(the_packet: dict):
         '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'
+        }
 
     """
-    print(f"{the_packet=}")
-
+    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"] = ALTEREGO.sent.text()
@@ -373,7 +397,7 @@ def ft8_handler(the_packet: dict):
         ALTEREGO.contact["Band"] = get_logged_band(
             str(int(float(the_packet.get("FREQ", "0.0")) * 1000000))
         )
+        logger.debug(f"{ALTEREGO.contact=}")
         ALTEREGO.other_1.setText(the_packet.get("CLASS", "ERR"))
         ALTEREGO.other_2.setText(the_packet.get("ARRL_SECT", "ERR"))
-        print(f"\n{ALTEREGO.contact=}\n")
         ALTEREGO.save_contact()

not1mm-24.9.5/not1mm/test.py

@@ -0,0 +1,6 @@
+import xmlrpc.client
+
+target = "http://127.0.0.1:8421"
+server = xmlrpc.client.ServerProxy(target)
+adif = "<QSO_DATE:8>20150721<QSO_DATE_OFF:8>20150721<TIME_ON:4>1333<TIME_OFF:6>133436<CALL:5>N3FJP<FREQ:8>3.081500<MODE:0><RST_SENT:0><RST_RCVD:0><TX_PWR:0><NAME:5>Glenn<QTH:7>Bel Air<STATE:2>MD<VE_PROV:0><COUNTRY:13>United States<GRIDSQUARE:6>FM19tm<STX:0><SRX:0><SRX_STRING:0><STX_STRING:0><NOTES:0><IOTA:0><DXCC:0><QSL_VIA:0><QSLRDATE:0><QSLSDATE:0><eor>"
+response = server.log.add_record(adif)

{not1mm-24.9.3 → not1mm-24.9.5}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.3
+Version: 24.9.5
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -226,6 +226,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-5] Added FlDigi support for Field Day.
 - [24-9-3] Added WSJT-X FT8 mode contacts to ARRL Field Day.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.

{not1mm-24.9.3 → not1mm-24.9.5}/not1mm.egg-info/SOURCES.txt

@@ -108,6 +108,7 @@ not1mm/lib/edit_contact.py
 not1mm/lib/edit_macro.py
 not1mm/lib/edit_opon.py
 not1mm/lib/edit_station.py
+not1mm/lib/fldigi_watcher.py
 not1mm/lib/ft8_watcher.py
 not1mm/lib/ham_utility.py
 not1mm/lib/lookup.py

{not1mm-24.9.3 → not1mm-24.9.5}/pyproject.toml

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

not1mm-24.9.3/not1mm/test.py

@@ -1,10 +0,0 @@
-class Somefunc:
-    def __init__(self):
-        """weee"""
-
-    def testfunc():
-        """wooo"""
-
-
-thetest = Somefunc()
-print(f"{hasattr(thetest, "ft8_catcher")}")