not1mm 24.9.28.2__py3-none-any.whl → 24.10.1__py3-none-any.whl

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/lib/version.py

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

not1mm/plugins/cq_ww_rtty.py

@@ -379,6 +379,9 @@ def cabrillo(self):
                         "PKTUSB",
                     ):
                     themode = "RY"
+                exchange1 = contact.get('Exchange1', '')
+                if exchange1 == '':
+                    exchange1 = "DX"
                 frequency = str(int(contact.get("Freq", "0"))).rjust(5)
 
                 loggeddate = the_date_and_time[:10]
@@ -391,7 +394,7 @@ def cabrillo(self):
                     f"{contact.get('Call', '').ljust(13)} "
                     f"{str(contact.get('RCV', '')).ljust(3)} "
                     f"{str(contact.get('ZN', '')).zfill(2)}",
-                    f"{str(contact.get('Exchange1', '')).ljust(2)}",
+                    f"{str(exchange1).ljust(2)}",
                     end="\r\n",
                     file=file_descriptor,
                 )

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.28.2.dist-info → not1mm-24.10.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.28.2
+Version: 24.10.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -196,32 +196,21 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - 10 10 Summer Phone
 - 10 10 Winter Phone
 - ARRL 10M
-- ARRL DX CW
-- ARRL DX SSB
+- ARRL DX CW, SSB
 - ARRL Field Day
-- ARRL Sweepstakes CW
-- ARRL Sweepstakes SSB
-- ARRL VHF January
-- ARRL VHF June
-- ARRL VHF September
-- CQ 160 CW
-- CQ 160 SSB
-- CQ WPX CW
-- CQ WPX SSB
-- CQ World Wide CW
-- CQ World Wide RTTY
-- CQ World Wide SSB
+- ARRL Sweepstakes CW, SSB
+- ARRL VHF January, June, September
+- CQ 160 CW, SSB
+- CQ WPX CW, SSB
+- CQ World Wide CW, RTTY, SSB
 - CWOps CWT
 - Helvetia
-- IARU Fieldday R1 CW
-- IARU Fieldday R1 SSB
+- IARU Fieldday R1 CW, SSB
 - IARU HF
 - ICWC MST
-- Japan International DX CW
-- Japan International DX SSB
+- Japan International DX CW, SSB
 - K1USN Slow Speed Test
-- NAQP CW
-- NAQP SSB
+- NAQP CW, SSB
 - Phone Weekly Test
 - RAC Canada Day
 - Stew Perry Topband
@@ -230,28 +219,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
-- [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.28.2.dist-info → not1mm-24.10.1.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=88hPgSkZx61iYWfOFkfBflWsE_AcLOm3Wd1KMup4abU,130276
 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
@@ -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=JoQ3r9zY8ZwbmQB7QirxofNNSOuaqXZwzy4bZJ22VU8,50
+not1mm/lib/version.py,sha256=9gp4Ngkzl3dx14Khxs97HcvxUfF4KNXRD59UPZmDp0I,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
@@ -137,15 +137,15 @@ not1mm/plugins/cq_160_ssb.py,sha256=zIwSMAjHSt6W2edrDzVbyTf860JowHoFkU9BKO8Enag,
 not1mm/plugins/cq_wpx_cw.py,sha256=9aNzAR-KhznIwUlxUFjAi_hbiw_6RrCMwUBk9I2f6Hs,14037
 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=W65FsKCKnot1yxc7OPbJ4Al-ELmkz8Z4km04KPKZyDA,16661
+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 +156,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.28.2.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.9.28.2.dist-info/METADATA,sha256=KR58cXMUdoVUlbhk3JowvDpPZNzu6kscnkfXwOwOvMk,31843
-not1mm-24.9.28.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-not1mm-24.9.28.2.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.9.28.2.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.9.28.2.dist-info/RECORD,,
+not1mm-24.10.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.10.1.dist-info/METADATA,sha256=C1yfdCg9vuySn9SsuXZFP0LN_u0oTRUuXJUPmKqS9lM,30407
+not1mm-24.10.1.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+not1mm-24.10.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.10.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.10.1.dist-info/RECORD,,