not1mm 24.9.29__py3-none-any.whl → 24.10.2__py3-none-any.whl

not1mm/__main__.py

@@ -175,10 +175,10 @@ class MainWindow(QtWidgets.QMainWindow):
     lookup_service = None
     fldigi_util = None
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
+    def __init__(self, splash):
+        super().__init__()
         logger.info("MainWindow: __init__")
-
+        self.splash = splash
         self.dock_loc = {
             "Top": Qt.DockWidgetArea.TopDockWidgetArea,
             "Right": Qt.DockWidgetArea.RightDockWidgetArea,
@@ -519,6 +519,8 @@ class MainWindow(QtWidgets.QMainWindow):
             QtGui.QIcon(str(fsutils.APP_DATA_PATH / "k6gte.not1mm-32.png"))
         )
 
+        self.show_splash_msg("Loading CTY file.")
+
         try:
             with open(
                 fsutils.APP_DATA_PATH / "cty.json", "rt", encoding="utf-8"
@@ -527,11 +529,15 @@ class MainWindow(QtWidgets.QMainWindow):
         except (IOError, JSONDecodeError, TypeError):
             logging.CRITICAL("There was an error parsing the BigCity file.")
 
+        self.show_splash_msg("Starting LookUp Service.")
+
         self.lookup_service = LookupService()
         self.lookup_service.hide()
 
+        self.show_splash_msg("Reading preferences.")
         self.readpreferences()
 
+        self.show_splash_msg("Starting voice thread.")
         self.voice_process = Voice()
         self.voice_process.moveToThread(self.voice_thread)
         self.voice_thread.started.connect(self.voice_process.run)
@@ -560,7 +566,9 @@ class MainWindow(QtWidgets.QMainWindow):
         self.make_op_dir()
 
         self.clearinputs()
+        self.show_splash_msg("Loading contest.")
         self.load_contest()
+        self.show_splash_msg("Reading macros.")
         self.read_cw_macros()
 
         # Featureset for wayland
@@ -569,6 +577,7 @@ class MainWindow(QtWidgets.QMainWindow):
             | QtWidgets.QDockWidget.DockWidgetFeature.DockWidgetMovable
         )
 
+        self.show_splash_msg("Starting FlDigi watcher.")
         self.fldigi_watcher = FlDigiWatcher()
         self.fldigi_watcher.moveToThread(self.fldigi_thread)
         self.fldigi_thread.started.connect(self.fldigi_watcher.run)
@@ -576,6 +585,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.fldigi_watcher.poll_callback.connect(self.fldigi_qso)
         self.fldigi_thread.start()
 
+        self.show_splash_msg("Setting up LogWindow.")
         self.log_window = LogWindow()
         self.log_window.setObjectName("log-window")
         if os.environ.get("WAYLAND_DISPLAY"):
@@ -583,6 +593,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.addDockWidget(Qt.DockWidgetArea.TopDockWidgetArea, self.log_window)
         self.log_window.hide()
 
+        self.show_splash_msg("Setting up BandMapWindow.")
         self.bandmap_window = BandMapWindow()
         self.bandmap_window.setObjectName("bandmap-window")
         if os.environ.get("WAYLAND_DISPLAY"):
@@ -590,6 +601,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.addDockWidget(Qt.DockWidgetArea.LeftDockWidgetArea, self.bandmap_window)
         self.bandmap_window.hide()
 
+        self.show_splash_msg("Setting up CheckWindow.")
         self.check_window = CheckWindow()
         self.check_window.setObjectName("check-window")
         if os.environ.get("WAYLAND_DISPLAY"):
@@ -597,6 +609,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.check_window)
         self.check_window.hide()
 
+        self.show_splash_msg("Setting up VFOWindow.")
         self.vfo_window = VfoWindow()
         self.vfo_window.setObjectName("vfo-window")
         if os.environ.get("WAYLAND_DISPLAY"):
@@ -604,6 +617,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.addDockWidget(Qt.DockWidgetArea.RightDockWidgetArea, self.vfo_window)
         self.vfo_window.hide()
 
+        self.show_splash_msg("Restoring window states.")
         self.settings = QSettings("K6GTE", "not1mm")
         if self.settings.value("windowState") is not None:
             self.restoreState(self.settings.value("windowState"))
@@ -635,6 +649,15 @@ class MainWindow(QtWidgets.QMainWindow):
                     "You can udate to the current version by using:\npip install -U not1mm"
                 )
 
+    def show_splash_msg(self, msg: str) -> None:
+        """Show text message in the splash window."""
+        self.splash.showMessage(
+            msg,
+            alignment=Qt.AlignmentFlag.AlignBottom | Qt.AlignmentFlag.AlignCenter,
+            color=QColor(255, 255, 0),
+        )
+        QCoreApplication.processEvents()
+
     def fldigi_qso(self, result: str):
         """
         gets called when there is a new fldigi qso logged.
@@ -1306,6 +1329,15 @@ class MainWindow(QtWidgets.QMainWindow):
                             band = getband(str(self.radio_state.get("vfoa", "0.0")))
                             self.set_band_indicator(band)
                             self.set_window_title()
+                        if self.contest_settings.get("ModeCategory", "") == "RTTY":
+                            self.setmode("RTTY")
+                            self.radio_state["mode"] = "RTTY"
+                            if self.rig_control:
+                                if self.rig_control.online:
+                                    self.rig_control.set_mode("RTTY")
+                            band = getband(str(self.radio_state.get("vfoa", "0.0")))
+                            self.set_band_indicator(band)
+                            self.set_window_title()
                         if self.contest_settings.get("ModeCategory", "") == "SSB":
                             self.setmode("SSB")
                             if int(self.radio_state.get("vfoa", 0)) > 10000000:
@@ -3592,7 +3624,7 @@ app = QtWidgets.QApplication(sys.argv)
 pixmap = QPixmap(f"{os.fspath(fsutils.APP_DATA_PATH)}/splash.png")
 splash = QSplashScreen(pixmap)
 splash.show()
-app.processEvents()
+# app.processEvents()
 splash.showMessage(
     "Starting Up",
     alignment=Qt.AlignmentFlag.AlignBottom | Qt.AlignmentFlag.AlignCenter,
@@ -3602,10 +3634,10 @@ QCoreApplication.processEvents()
 
 families = load_fonts_from_dir(os.fspath(fsutils.APP_DATA_PATH))
 logger.info(f"font families {families}")
-window = MainWindow()
+window = MainWindow(splash)
 window.callsign.setFocus()
-window.show()
 splash.finish(window)
+window.show()
 
 if __name__ == "__main__":
     run()

not1mm/data/new_contest.ui

@@ -277,6 +277,11 @@
        <string>CQ WPX CW</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>CQ WPX RTTY</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>CQ WPX SSB</string>

not1mm/lib/cwinterface.py

@@ -55,7 +55,7 @@ class CW:
                 self._sendcw_xmlrpc(texttosend)
             if self.servertype == 1:
                 self._sendcw_udp(texttosend)
-            if self.servertype == 3 and self.cw is not None:
+            if self.servertype == 3:
                 self._sendcwcat(texttosend)
 
     def _sendcw_xmlrpc(self, texttosend):

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.9.29"
+__version__ = "24.10.2"

not1mm/plugins/cq_wpx_rtty.py

@@ -0,0 +1,507 @@
+"""CQ WPX RTTY plugin"""
+
+# pylint: disable=invalid-name, c-extension-no-member, unused-import
+
+# CQ WW RTTY WPX Contest
+#  	Status:	Active
+#  	Geographic Focus:	Worldwide
+#  	Participation:	Worldwide
+#  	Awards:	Worldwide
+#  	Mode:	RTTY
+#  	Bands:	80, 40, 20, 15, 10m
+#  	Classes:	Single Op All Band (QRP/Low/High)
+# Single Op Single Band (QRP/Low/High)
+# Single Op Overlays (Tribander/Rookie/Classic/Youth)
+# Multi-One (Low/High)
+# Multi-Two
+# Multi-Multi
+# Multi-Distributed
+#  	Max operating hours:	Single Op: 30 hours, offtimes of at least 60 minutes
+# Multi-Op: 48 hours
+#  	Max power:	HP: 1500 watts
+# LP: 100 watts
+# QRP: 5 watts
+#  	Exchange:	RST + Serial No.
+#  	Work stations:	Once per band
+#  	QSO Points:	1 point per QSO with same country on 20/15/10m
+# 2 points per QSO with same country on 80/40m
+# 2 points per QSO with different countries on same continent on 20/15/10m
+# 4 points per QSO with different countries on same continent on 80/40m
+# 3 points per QSO with different continent on 20/15/10m
+# 6 points per QSO with different continent on 80/40m
+#  	Multipliers:	Each prefix once
+#  	Score Calculation:	Total score = total QSO points x total mults
+#  	E-mail logs to:	(none)
+#  	Upload log at:	https://www.cqwpxrtty.com/logcheck/
+#  	Mail logs to:	(none)
+#  	Find rules at:	https://www.cqwpxrtty.com/rules.htm
+#  	Cabrillo name:	CQ-WPX-RTTY
+
+
+import datetime
+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 = "#"
+
+name = "CQ WPX RTTY"
+cabrillo_name = "CQ-WPX-RTTY"
+mode = "RTTY"  # CW SSB BOTH RTTY
+# columns = [0, 1, 2, 3, 4, 5, 6, 9, 11, 15]
+columns = [
+    "YYYY-MM-DD HH:MM:SS",
+    "Call",
+    "Freq",
+    "Snt",
+    "Rcv",
+    "SentNr",
+    "RcvNr",
+    "WPX",
+    "M1",
+    "PTS",
+]
+
+advance_on_space = [True, True, True, True, True]
+
+# 1 once per contest, 2 work each band, 3 each band/mode, 4 no dupe checking
+dupe_type = 2
+
+
+def init_contest(self):
+    """setup plugin"""
+    set_tab_next(self)
+    set_tab_prev(self)
+    interface(self)
+    self.next_field = self.other_2
+
+
+def interface(self):
+    """Setup user interface"""
+    self.field1.show()
+    self.field2.show()
+    self.field3.show()
+    self.field4.show()
+    self.snt_label.setText("SNT")
+    self.field1.setAccessibleName("RST Sent")
+    self.other_label.setText("SentNR")
+    self.field3.setAccessibleName("Sent Number")
+    self.exch_label.setText("RcvNR")
+    self.field4.setAccessibleName("Received Number")
+
+
+def reset_label(self):  # pylint: disable=unused-argument
+    """reset label after field cleared"""
+
+
+def set_tab_next(self):
+    """Set TAB Advances"""
+    self.tab_next = {
+        self.callsign: self.field1.findChild(QtWidgets.QLineEdit),
+        self.field1.findChild(QtWidgets.QLineEdit): self.field2.findChild(
+            QtWidgets.QLineEdit
+        ),
+        self.field2.findChild(QtWidgets.QLineEdit): self.field3.findChild(
+            QtWidgets.QLineEdit
+        ),
+        self.field3.findChild(QtWidgets.QLineEdit): self.field4.findChild(
+            QtWidgets.QLineEdit
+        ),
+        self.field4.findChild(QtWidgets.QLineEdit): self.callsign,
+    }
+
+
+def set_tab_prev(self):
+    """Set TAB Advances"""
+    self.tab_prev = {
+        self.callsign: self.field4.findChild(QtWidgets.QLineEdit),
+        self.field1.findChild(QtWidgets.QLineEdit): self.callsign,
+        self.field2.findChild(QtWidgets.QLineEdit): self.field1.findChild(
+            QtWidgets.QLineEdit
+        ),
+        self.field3.findChild(QtWidgets.QLineEdit): self.field2.findChild(
+            QtWidgets.QLineEdit
+        ),
+        self.field4.findChild(QtWidgets.QLineEdit): self.field3.findChild(
+            QtWidgets.QLineEdit
+        ),
+    }
+
+
+def set_contact_vars(self):
+    """Contest Specific"""
+    self.contact["SNT"] = self.sent.text()
+    self.contact["RCV"] = self.receive.text()
+    self.contact["SentNr"] = self.other_1.text()
+    self.contact["NR"] = self.other_2.text()
+    if self.contact.get("WPXPrefix", ""):
+        result = self.database.fetch_wpx_exists(self.contact.get("WPXPrefix", ""))
+        if result.get("wpx_count", ""):
+            self.contact["IsMultiplier1"] = 0
+        else:
+            self.contact["IsMultiplier1"] = 1
+
+
+def predupe(self):  # pylint: disable=unused-argument
+    """called after callsign entered"""
+
+
+def prefill(self):
+    """Fill SentNR"""
+    result = self.database.get_serial()
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
+    if serial_nr == "None":
+        serial_nr = "001"
+    field = self.field3.findChild(QtWidgets.QLineEdit)
+    if len(field.text()) == 0:
+        field.setText(serial_nr)
+
+
+def points(self):
+    """Calc point
+    Contact points:
+    - Different-country contacts within any continent (not just North America) get 2 or 4 points
+    - Same-country contacts get 2 points on the low bands
+    """
+    result = self.cty_lookup(self.station.get("Call", ""))
+    if result:
+        for item in result.items():
+            my_country = item[1].get("entity", "")
+            my_continent = item[1].get("continent", "")
+    result = self.cty_lookup(self.contact.get("Call", ""))
+    band = int(int(float(self.contact.get("Freq", 0))) / 1000)
+    if result:
+        for item in result.items():
+            their_country = item[1].get("entity", "")
+            their_continent = item[1].get("continent", "")
+
+            # Different Continent
+            if my_continent != their_continent:
+                if band in [28, 21, 14]:
+                    return 3
+                return 6
+
+            # Both in same country
+            if my_country.upper() == their_country.upper():
+                return 1
+
+            # Below Same Continent Different Country
+
+            if band in [28, 21, 14]:
+                return 2
+            return 4
+
+    # Something wrong
+    return 0
+
+
+def show_mults(self):
+    """Return display string for mults"""
+    result = self.database.fetch_wpx_count()
+    if result:
+        return int(result.get("wpx_count", 0))
+    return 0
+
+
+def show_qso(self):
+    """Return qso count"""
+    result = self.database.fetch_qso_count()
+    if result:
+        return int(result.get("qsos", 0))
+    return 0
+
+
+def calc_score(self):
+    """Return calculated score"""
+    result = self.database.fetch_points()
+    if result is not None:
+        score = result.get("Points", "0")
+        if score is None:
+            score = "0"
+        contest_points = int(score)
+        result = self.database.fetch_wpx_count()
+        mults = int(result.get("wpx_count", 0))
+        return contest_points * mults
+    return 0
+
+
+def adif(self):
+    """Call the generate ADIF function"""
+    gen_adif(self, cabrillo_name, "CQ-WPX-RTTY")
+
+
+def cabrillo(self):
+    """Generates Cabrillo file. Maybe."""
+    # https://www.cqwpx.com/cabrillo.htm
+    logger.debug("******Cabrillo*****")
+    logger.debug("Station: %s", f"{self.station}")
+    logger.debug("Contest: %s", f"{self.contest_settings}")
+    now = datetime.datetime.now()
+    date_time = now.strftime("%Y-%m-%d_%H-%M-%S")
+    filename = (
+        str(Path.home())
+        + "/"
+        + f"{self.station.get('Call', '').upper()}_{cabrillo_name}_{date_time}.log"
+    )
+    logger.debug("%s", filename)
+    log = self.database.fetch_all_contacts_asc()
+    try:
+        with open(filename, "w", encoding="ascii") as file_descriptor:
+            print("START-OF-LOG: 3.0", end="\r\n", file=file_descriptor)
+            print(
+                f"CREATED-BY: Not1MM v{__version__}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"CONTEST: {cabrillo_name}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            if self.station.get("Club", ""):
+                print(
+                    f"CLUB: {self.station.get('Club', '').upper()}",
+                    end="\r\n",
+                    file=file_descriptor,
+                )
+            print(
+                f"CALLSIGN: {self.station.get('Call','')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"LOCATION: {self.station.get('ARRLSection', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            # print(
+            #     f"ARRL-SECTION: {self.pref.get('section', '')}",
+            #     end="\r\n",
+            #     file=file_descriptor,
+            # )
+            print(
+                f"CATEGORY-OPERATOR: {self.contest_settings.get('OperatorCategory','')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"CATEGORY-ASSISTED: {self.contest_settings.get('AssistedCategory','')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"CATEGORY-BAND: {self.contest_settings.get('BandCategory','')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"CATEGORY-MODE: {self.contest_settings.get('ModeCategory','')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"CATEGORY-TRANSMITTER: {self.contest_settings.get('TransmitterCategory','')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            if self.contest_settings.get("OverlayCategory", "") != "N/A":
+                print(
+                    f"CATEGORY-OVERLAY: {self.contest_settings.get('OverlayCategory','')}",
+                    end="\r\n",
+                    file=file_descriptor,
+                )
+            print(
+                f"GRID-LOCATOR: {self.station.get('GridSquare','')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            # print(
+            #     f"CATEGORY: {None}",
+            #     end="\r\n",
+            #     file=file_descriptor,
+            # )
+            print(
+                f"CATEGORY-POWER: {self.contest_settings.get('PowerCategory','')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+
+            print(
+                f"CLAIMED-SCORE: {calc_score(self)}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            ops = f"@{self.station.get('Call','')}"
+            list_of_ops = self.database.get_ops()
+            for op in list_of_ops:
+                ops += f", {op.get('Operator', '')}"
+            print(
+                f"OPERATORS: {ops}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"NAME: {self.station.get('Name', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"ADDRESS: {self.station.get('Street1', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"ADDRESS-CITY: {self.station.get('City', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"ADDRESS-STATE-PROVINCE: {self.station.get('State', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"ADDRESS-POSTALCODE: {self.station.get('Zip', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"ADDRESS-COUNTRY: {self.station.get('Country', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            print(
+                f"EMAIL: {self.station.get('Email', '')}",
+                end="\r\n",
+                file=file_descriptor,
+            )
+            for contact in log:
+                the_date_and_time = contact.get("TS", "")
+                themode = contact.get("Mode", "")
+                if themode == "LSB" or themode == "USB":
+                    themode = "PH"
+                frequency = str(int(contact.get("Freq", "0"))).rjust(5)
+
+                loggeddate = the_date_and_time[:10]
+                loggedtime = the_date_and_time[11:13] + the_date_and_time[14:16]
+                print(
+                    f"QSO: {frequency} {themode} {loggeddate} {loggedtime} "
+                    f"{contact.get('StationPrefix', '').ljust(13)} "
+                    f"{str(contact.get('SNT', '')).ljust(3)} "
+                    f"{str(contact.get('SentNr', '')).ljust(6)} "
+                    f"{contact.get('Call', '').ljust(13)} "
+                    f"{str(contact.get('RCV', '')).ljust(3)} "
+                    f"{str(contact.get('NR', '')).ljust(6)}",
+                    end="\r\n",
+                    file=file_descriptor,
+                )
+            print("END-OF-LOG:", end="\r\n", file=file_descriptor)
+        self.show_message_box(f"Cabrillo saved to: {filename}")
+    except IOError as exception:
+        logger.critical("cabrillo: IO error: %s, writing to %s", exception, filename)
+        self.show_message_box(f"Error saving Cabrillo: {exception} {filename}")
+        return
+
+
+def recalculate_mults(self):
+    """Recalculates multipliers after change in logged qso."""
+    all_contacts = self.database.fetch_all_contacts_asc()
+    for contact in all_contacts:
+        self.contact = contact
+        contact["Points"] = points(self)
+        time_stamp = contact.get("TS", "")
+        wpx = contact.get("WPXPrefix", "")
+        result = self.database.fetch_wpx_exists_before_me(wpx, time_stamp)
+        wpx_count = result.get("wpx_count", 1)
+        if wpx_count == 0:
+            contact["IsMultiplier1"] = 1
+        else:
+            contact["IsMultiplier1"] = 0
+        self.database.change_contact(contact)
+
+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=}")
+
+    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()
+        ALTEREGO.contact["Exchange1"] = f"{the_packet.get("STATE", "")}".strip()
+        ALTEREGO.contact["ZN"] = the_packet.get("CQZ", "")
+        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.other_1.setText(f"{the_packet.get("STX", "")}".strip())
+        ALTEREGO.other_2.setText(f"{the_packet.get("SRX", "")}".strip())
+        ALTEREGO.save_contact()

not1mm/plugins/cwt.py

@@ -150,7 +150,7 @@ def predupe(self):
         logger.debug("%s", f"{result}")
         if result:
             value = result.get("NR", "").upper()
-            if len(value.split(" ")) == 2:
+            if len(value.split()) == 2:
                 parsed_name, suffix = value.split()
                 self.other_1.setText(str(parsed_name))
                 self.other_2.setText(str(suffix))

not1mm/plugins/icwc_mst.py

@@ -138,9 +138,9 @@ def predupe(self):  # pylint: disable=unused-argument
 def prefill(self):
     """Fill SentNR"""
     result = self.database.get_serial()
-    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
+    serial_nr = str(result.get("serial_nr", "1"))
     if serial_nr == "None":
-        serial_nr = "001"
+        serial_nr = "1"
     field = self.sent
     if len(field.text()) == 0:
         field.setText(serial_nr)

not1mm/radio.py

@@ -35,6 +35,7 @@ class Radio(QObject):
     host = None
     port = None
     modes = ""
+    last_data_mode = "RTTY"
 
     def __init__(self, interface: str, host: str, port: int) -> None:
         super().__init__()
@@ -65,6 +66,7 @@ class Radio(QObject):
                 mode = self.cat.get_mode()
                 if mode:
                     self.mode = mode
+                    self.store_last_data_mode(mode)
                     self.online = True
                 bw = self.cat.get_bw()
                 if bw:
@@ -83,6 +85,26 @@ class Radio(QObject):
                     ...
             QThread.msleep(100)
 
+    def store_last_data_mode(self, the_mode: str = ""):
+        """if the last mode is a data mode, save it."""
+        # QMX ['CW-U', 'CW-L', 'DIGI-U', 'DIGI-L']
+        # 7300 ['LSB', 'USB', 'AM', 'FM', 'CW', 'CW-R', 'RTTY', 'RTTY-R', 'LSB-D', 'USB-D', 'AM-D', 'FM-D']
+        datamodes = [
+            "RTTY",
+            "RTTY-R",
+            "LSB-D",
+            "USB-D",
+            "AM-D",
+            "FM-D",
+            "DIGI-U",
+            "DIGI-L",
+            "RTTYR",
+            "PKTLSB",
+            "PKTUSB",
+        ]
+        if the_mode in datamodes:
+            self.last_data_mode = the_mode
+
     def sendcw(self, texttosend):
         """..."""
         logger.debug(f"Send CW: {texttosend}")
@@ -125,8 +147,13 @@ class Radio(QObject):
             ...
 
     def get_modes(self):
+        """get list of modes"""
         return self.modes
 
+    def get_last_data_mode(self):
+        """gets last used data mode."""
+        return self.last_data_mode
+
     def ptt_on(self):
         if self.cat:
             self.cat.ptt_on()

{not1mm-24.9.29.dist-info → not1mm-24.10.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.29
+Version: 24.10.2
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -201,7 +201,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - ARRL Sweepstakes CW, SSB
 - ARRL VHF January, June, September
 - CQ 160 CW, SSB
-- CQ WPX CW, SSB
+- CQ WPX CW, RTTY, SSB
 - CQ World Wide CW, RTTY, SSB
 - CWOps CWT
 - Helvetia
@@ -219,29 +219,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [24-9-29] Corrected Cabrillo generation for CQWWRTTY.
-- [24-9-28-2] Fix Cabrillo and ADIF export for cqwwrtty.
-- [24-9-28-1] Add RTTY-R, LSB-D, USB-D, AM-D, FM-D, DIGI-U, DIGI-L, RTTYR, PKTLSB, PKTUSB to list of modes that will load in the RTTY/DG Macros.
-- [24-9-28] Fixed crash with CAT None, Display tweek. Refactored a couple conditionals.
-- [24-9-25-1] Added WARC and 4M bands.
-- [24-9-25] Fix QRZ lookup crash on non-existant call.
-- [24-9-24] Correct crash in CWT.
-- [24-9-23] Improved serial interface to rigctld. Send RTTY macros to fldigi when radio modes are RTTY, USB-D, LSB-D, PKTLSB, PKTUSB, DIGI-U, DIGI-L.
-- [24-9-22] Merged in changes for CQ WW RTTY
-- [24-9-15] Fixing an ARRL VHF Cabrillo format error.
-- [24-9-14] BugFix. Starting lookups fail init if no settings.
-- [24-9-12] Fixed WSJT-X MFSK submodes FT4 Q65.
-- [24-9-11-2] Removed all the sketchy threaded call lookups. They're now implimented as a multicast service.
-- [24-9-11-1] Fixed high clock cycle usage from the FlDigiWatcher class.
-- [24-9-11] Fixed the HamQTH call lookups.
-- [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.
-- [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.
+- [24-10-2] Add WPX RTTY.
+- [24-10-1] Merged PR removing leading zeros from serial numbers. Merged PR correcting the parsing of lookups for previous name and state in the CWT.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 
@@ -316,16 +295,18 @@ source .profile
 
 ```bash
 sudo dnf upgrade --refresh
-sudo dnf install python3-pip portaudio
-pip install not1mm
+sudo dnf install python3-pip pipx portaudio
+pipx install not1mm
+pipx ensurepath
 ```
 
 #### Fedora 40
 
 ```bash
 sudo dnf upgrade --refresh
-sudo dnf install python3-pip python3-pyqt6 portaudio
-pip install not1mm
+sudo dnf install python3-pip pipx python3-pyqt6 portaudio
+pipx install not1mm
+pipx ensurepath
 ```
 
 </details>
@@ -620,7 +601,12 @@ appear. Those without will not.
 
 ## Logging WSJT-X FT8/FT4/ETC and FLDIGI RTTY contacts
 
-**Digital modes only working for ARRL Field Day, ARRL VHF, and Weekly RTTY**
+**Digital modes only working for:**
+
+- ARRL Field Day
+- ARRL VHF
+- Weekly RTTY
+- CQ WW DX RTTY
 
 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.
@@ -629,6 +615,10 @@ not1mm polls for fldigi QSOs via it's XMLRPC interface. It does this in a rather
 way. It just keeps asking what was the last QSO and compares it to the previous response.
 If it's different, it's new. I've added the Weekly RTTY Test so this can be tested.
 
+The F1-F12 function keys be sent to fldigi via XMLRPC. Fldigi will be placed into TX
+mode, the message will be sent and a ^r will be tacked onto the end to place it back into
+RX mode.
+
 Unlike WSJT, fldigi needs to be setup for this to work. The XMLRPC interface needs to be
 active. And in fldigi's config dialog go to CONTESTS -> General -> CONTEST and select
 Generic Contest. Make sure the Text Capture Order field says CALL EXCHANGE.
@@ -646,7 +636,7 @@ field.
 
 To edit the macros, choose `File` > `Edit Macros`. This will open your systems
 registered text editor with current macros loaded. When your done just save the
-file and close the editor. The file loaded to edit, CW or SSB, will be
+file and close the editor. The file loaded to edit, CW, SSB or RTTY, will be
 determined by your current operating mode.
 
 After editing and saving the macro file. You can force the logger to reload the
@@ -729,7 +719,7 @@ is this has happened, since the gridsquare will replace the word "Regional".
 | [Shift-Tab] | Move cursor left One field. |
 | [SPACE] | When in the callsign field, will move the input to the first field needed for the exchange. |
 | [Enter] | Submits the fields to the log. |
-| [F1-F12] | Send (CW or Voice) macros. |
+| [F1-F12] | Send (CW/RTTY/Voice) macros. |
 | [CTRL-S] | Spot Callsign to the cluster. |
 | [CTRL-M] | Mark Callsign to the bandmap window to work later. |
 | [CTRL-G] | Tune to a spot matching partial text in the callsign entry field (CAT Required). |

{not1mm-24.9.29.dist-info → not1mm-24.10.2.dist-info}/RECORD

@@ -1,11 +1,11 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=d_h2z7gmEdDwZ1nX1nyxPQvCMqmnKRyPF4PJ34J6CY4,129707
+not1mm/__main__.py,sha256=yw-_P3yDCTpvj2WuXqbBvOht4SMpA8DJGwwmldg1Kf8,131265
 not1mm/bandmap.py,sha256=1b5tXCfGTnpqqn6hPNt7zRA8SmuwSXzSwNHZXhCRt70,31434
 not1mm/checkwindow.py,sha256=aI-nr8OF90IWV7R_XRdmitvBJ9M85evCs72HoU3Jnvc,10374
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
 not1mm/logwindow.py,sha256=pwhiwolmGnW01LF4sjlu3ywLsgfxL6KuGuKuYKYmgeY,44403
 not1mm/lookupservice.py,sha256=jsFg5tsB9cVnahLP-hI3CMwbjlEpMx944O8RLWntAy4,3342
-not1mm/radio.py,sha256=3X38i3jzZG9D1QN7p4pYZpMzRz6xyuWuN8rxLK3UNik,3662
+not1mm/radio.py,sha256=WM5hRTKUSH6D1Hxk240kYVlSuMaVp7dgVn_GAkck8_g,4498
 not1mm/test.py,sha256=HI1lUcKncR-5QXpBuepliRc4HYSSOcwZJWXrP6yjXb8,2453
 not1mm/vfo.py,sha256=IvmUQYMIPzLJw_BHQGis4J_IEW-vlBtdfxZLXPh7OzI,12335
 not1mm/voice_keying.py,sha256=sA3gw5_k7kShTg2qhG7HkKDM5M6KheJVRkAc_C7mxDk,3006
@@ -31,7 +31,7 @@ not1mm/data/k6gte.not1mm-64.png,sha256=6ku45Gq1g5ezh04F07osoKRtanb3e4kbx5XdIEh3N
 not1mm/data/logwindow.ui,sha256=f7vULj96tHIQuR1nJMyvPHHcmVgzkhv9D1isyojsnFU,1458
 not1mm/data/logwindowx.ui,sha256=CwpI-h7cI1yqyldH9quKftsdHL5lTyL9ABOcf80nfqc,1632
 not1mm/data/main.ui,sha256=IOrAJfJDhG30bWi08pLBGzDKjBvjKfPNI9-GNpvu0vI,61886
-not1mm/data/new_contest.ui,sha256=jR_bQMvsKgqD3az9iNS2fvPSs3WTf_phs5JXp1Ra8nA,23008
+not1mm/data/new_contest.ui,sha256=oIe15jiIN50wc5THeJLIO3KYZWXUyqRt9n_ShD0qO7Y,23116
 not1mm/data/not1mm.html,sha256=c9-mfjMwDt4f5pySUruz2gREW33CQ2_rCddM2z5CZQo,23273
 not1mm/data/opon.ui,sha256=QDicqAk2lORG2UWsHa6jHlsGn6uzrrI2R4HSAocpPes,2258
 not1mm/data/pickcontest.ui,sha256=4hPBszCglObThx_eIWtmK9CEcbr7WBjbB1rKZdI-o3I,1707
@@ -95,7 +95,7 @@ not1mm/data/phonetics/z.wav,sha256=arafCi7fwmBLdVDI-PRyaL4U-03PIQDhffwY5noJ_2c,5
 not1mm/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/lib/about.py,sha256=sWycfGcruN3SaEe4JmaJ61K6D8Itq0WxpUYT-lEcmYM,416
 not1mm/lib/cat_interface.py,sha256=FfLldMH4FayArOcwoZBQT3vTU2RoiG7dmaT922Z8i2Y,21459
-not1mm/lib/cwinterface.py,sha256=FrVB-MfK7CYU2QNjAK7ERrruKTL_NkHpBPIFNNaTvp4,3645
+not1mm/lib/cwinterface.py,sha256=3H_Ur5qtZCg6AA-CBURdnS3IUcvs3YAcwYLO0S8SUBg,3621
 not1mm/lib/database.py,sha256=nUVG5H2Dy98PGp6Qdr3xU7zM8-8-IiyqRkXZWlWzIe8,44446
 not1mm/lib/edit_contact.py,sha256=Ki9bGPpqyQQBB1cU8VIBDCal3lbXeQ6qxhzklmhE2_w,353
 not1mm/lib/edit_macro.py,sha256=raKWBwsHInj5EUKmvyLQ6gqc3ZFDlstsD3xqoM4PC8E,517
@@ -114,7 +114,7 @@ not1mm/lib/plugin_common.py,sha256=TbFUbftjELFt4QRdsjSHbqnXSngZOlSwlCTClqosDXA,9
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=0Su8BQM4haVhc_P74q8UhzRZxtgWhM40UmVtQdMJQeM,10022
 not1mm/lib/super_check_partial.py,sha256=p5l3u2ZOCBtlWgbvskC50FpuoaIpR07tfC6zTdRWbh4,2334
-not1mm/lib/version.py,sha256=ZPNrAgbRlG8-HZmvqmi3sszmYq_VGWR5V3rNltvB47M,48
+not1mm/lib/version.py,sha256=oVIPDmFc6GlXPQNej28LeA_6UeX3YcWigdy6XmGWvx0,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=IttjX1yy4nDdACGsiYlPteFG8eVseX_WtoFio6bqHE8,10953
 not1mm/plugins/10_10_spring_cw.py,sha256=ThCptdM3dX4ywhoy2JRcOEyHSqcJolFaT7O_PYzM1Mg,10958
@@ -135,17 +135,18 @@ not1mm/plugins/canada_day.py,sha256=OVpcCl1Chse_zLHf6PayTrgawWM4W-pmrTw40Al-o9s,
 not1mm/plugins/cq_160_cw.py,sha256=5s6rIZdJEnmWe1SI06BEyz7p5vP0N2n9mI4l_mZ0icw,14139
 not1mm/plugins/cq_160_ssb.py,sha256=zIwSMAjHSt6W2edrDzVbyTf860JowHoFkU9BKO8Enag,14182
 not1mm/plugins/cq_wpx_cw.py,sha256=9aNzAR-KhznIwUlxUFjAi_hbiw_6RrCMwUBk9I2f6Hs,14037
+not1mm/plugins/cq_wpx_rtty.py,sha256=d0YsC_RDNEhp0mFGxtm7Ao7tI8wEeJJOACYAXdSWiWw,16473
 not1mm/plugins/cq_wpx_ssb.py,sha256=-hGRovqHR9rfOUnG4LPOoABTb4heH8VAX6rYdJbCqsw,12687
 not1mm/plugins/cq_ww_cw.py,sha256=m4Xkqb_qFyXWEgkxqbanvtiCTvI8NNPKNXzHgFZzhnE,12340
 not1mm/plugins/cq_ww_rtty.py,sha256=N0togQbMSpRyRpGoYvnlGC3mpduR82g-D39Swtp5wjI,16772
 not1mm/plugins/cq_ww_ssb.py,sha256=hZwG88-hPLmwIGXHX_S_ty8Nhn1kIuPjSuTRpCWoN9g,12631
-not1mm/plugins/cwt.py,sha256=k5yX_2Ma_arVxzDP2E9mwA08LUVFLOk8vUpHwHt2aGA,12777
+not1mm/plugins/cwt.py,sha256=KvvkEfQrYSra0y8qE4yThvZNLrZcslt0IqYEomDpf-M,12774
 not1mm/plugins/general_logging.py,sha256=n-2es7erqK1ptwq_wwIKIwktptKN7ra2eWjAQlpXUac,3479
 not1mm/plugins/helvetia.py,sha256=6aOO4uiLzFFgHA-A3xz6IRdCJpqPOAm0egKxP5Y_Ie0,15432
 not1mm/plugins/iaru_fieldday_r1_cw.py,sha256=B_kh8d8LkC0va_iIiIzImOKAT8724yf9ceF-2eQdx1w,13301
 not1mm/plugins/iaru_fieldday_r1_ssb.py,sha256=5hIL60cfGBzVlb70XFtI3OeGZT2966LoryTgKK6kDEc,13306
 not1mm/plugins/iaru_hf.py,sha256=-ROUo2gBkw3xB89t8bd-4f7_1hROw2VXZXVHLFdB62s,11541
-not1mm/plugins/icwc_mst.py,sha256=BaUP2kzrT2D27un_WLGT4HCTTi1e7CNYC4NHcC_9r74,11842
+not1mm/plugins/icwc_mst.py,sha256=v8L5NX2QmTM7x8Po1mb4yfN-dGVIuqky5MIT-OjfaVY,11831
 not1mm/plugins/jidx_cw.py,sha256=9oV4hDxMiGXa9wuYUNYOCsr-mz8LYB-4WMHBN8u2dFk,12153
 not1mm/plugins/jidx_ph.py,sha256=T-V7-77SIwu-Jl55VIrbVFZlsBoc97mXtgbdde0GaiQ,11183
 not1mm/plugins/k1usn_sst.py,sha256=2Nu7SRiQeUG3mL9CLKReRLh8vKsNbWcizMgv9MTLkrg,11671
@@ -156,9 +157,9 @@ not1mm/plugins/ref_cw.py,sha256=aWjHHkqIKutjRUtzh09y5haFfnZK9poRQDWRQMDRxxU,1632
 not1mm/plugins/stew_perry_topband.py,sha256=CKBQbYl4ETxhXJd2dma4fg_C5pag_s7Nf61SCztZtqE,10668
 not1mm/plugins/weekly_rtty.py,sha256=DQcy3SY0Zn56EdlYGf3NxrRhTnkNa5IqRQPRQdKDSPs,14255
 not1mm/plugins/winter_field_day.py,sha256=4rcfRtobwjHO6BNL3WOTHzBmyyeuX79BNGBG8PfjrI8,10238
-not1mm-24.9.29.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.9.29.dist-info/METADATA,sha256=WiIawgfdxqGoUNJBk7CK6a9y9Ygv7qi-FQE3IHrjDAo,31756
-not1mm-24.9.29.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-not1mm-24.9.29.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.9.29.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.9.29.dist-info/RECORD,,
+not1mm-24.10.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.10.2.dist-info/METADATA,sha256=u5KI88xY0PCI00BaZts4w6c4NvnLOmW_i4CZraKr8fY,30694
+not1mm-24.10.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+not1mm-24.10.2.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.10.2.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.10.2.dist-info/RECORD,,