not1mm 24.9.29__tar.gz → 24.10.1__tar.gz

{not1mm-24.9.29 → not1mm-24.10.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.29
+Version: 24.10.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -219,29 +219,7 @@ 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-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.
 

{not1mm-24.9.29 → not1mm-24.10.1}/README.md

@@ -188,29 +188,7 @@ 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-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.
 

{not1mm-24.9.29 → not1mm-24.10.1}/not1mm/__main__.py

@@ -1306,6 +1306,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:

{not1mm-24.9.29 → not1mm-24.10.1}/not1mm/lib/version.py

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

{not1mm-24.9.29 → not1mm-24.10.1}/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-24.9.29 → not1mm-24.10.1}/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-24.9.29 → not1mm-24.10.1}/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 → not1mm-24.10.1}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.29
+Version: 24.10.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -219,29 +219,7 @@ 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-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.
 

{not1mm-24.9.29 → not1mm-24.10.1}/pyproject.toml

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