not1mm 24.11.25__py3-none-any.whl → 24.11.26.1__py3-none-any.whl

not1mm/__main__.py

@@ -1731,7 +1731,6 @@ class MainWindow(QtWidgets.QMainWindow):
         """
 
         self.show_message_box(
-            "[Esc]\tClears the input fields of any text.\n"
             "[CTRL-Esc]\tStops cwdaemon from sending Morse.\n"
             "[PgUp]\tIncreases the cw sending speed.\n"
             "[PgDown]\tDecreases the cw sending speed.\n"
@@ -1751,6 +1750,7 @@ class MainWindow(QtWidgets.QMainWindow):
             "[CTRL-S]\tSpot Callsign to the cluster.\n"
             "[CTRL-SHIFT-K] Open CW text input field.\n"
             "[CTRL-=]\tLog the contact without sending the ESM macros.\n"
+            "[CTRL-W]\tClears the input fields of any text.\n"
         )
 
     def filepicker(self, action: str) -> str:
@@ -2087,14 +2087,14 @@ class MainWindow(QtWidgets.QMainWindow):
                     self.bandmap_window.msg_from_main(cmd)
             return
         if (
-            event.key() == Qt.Key.Key_Escape
-            and modifier != Qt.KeyboardModifier.ControlModifier
+            event.key() == Qt.Key.Key_W
+            and modifier == Qt.KeyboardModifier.ControlModifier
         ):  # pylint: disable=no-member
             self.clearinputs()
             return
         if (
             event.key() == Qt.Key.Key_Escape
-            and modifier == Qt.KeyboardModifier.ControlModifier
+            and modifier != Qt.KeyboardModifier.ControlModifier
         ):
             if self.cw is not None:
                 if self.cw.servertype == 1:
@@ -3543,6 +3543,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.opon_dialog.close()
         logger.debug("New Op: %s", self.current_op)
         self.make_op_dir()
+        self.set_window_title()
 
     def make_op_dir(self) -> None:
         """

not1mm/lib/cat_interface.py

@@ -284,8 +284,11 @@ class CAT:
         if self.rigctrlsocket:
             try:
                 self.online = True
-                self.rigctrlsocket.send(b"f\n")
-                return self.__get_serial_string().strip()
+                self.rigctrlsocket.send(b"|f\n")
+                report = self.__get_serial_string().strip()
+                if "get_freq:|" in report and "RPRT 0" in report:
+                    seg_rpt = report.split("|")
+                    return seg_rpt[1].split(" ")[1]
             except socket.error as exception:
                 self.online = False
                 logger.debug(f"{exception=}")
@@ -334,12 +337,12 @@ class CAT:
         if self.rigctrlsocket:
             try:
                 self.online = True
-                self.rigctrlsocket.send(b"m\n")
-                mode = self.__get_serial_string()
-                mode = mode.strip().split()[0]
-                if mode == "RPRT":
-                    return ""
-                return mode
+                self.rigctrlsocket.send(b"|m\n")
+                # get_mode:|Mode: CW|Passband: 500|RPRT 0
+                report = self.__get_serial_string().strip()
+                if "getmode:|" in report and "RPRT 0" in report:
+                    seg_rpt = report.split("|")
+                    return seg_rpt[1].split(" ")[1]
             except IndexError as exception:
                 logger.debug("%s", f"{exception}")
             except socket.error as exception:
@@ -383,11 +386,13 @@ class CAT:
         if self.rigctrlsocket:
             try:
                 self.online = True
-                self.rigctrlsocket.send(b"m\n")
-                mode = self.__get_serial_string()
-                mode = mode.strip().split()[1]
-                # logger.debug("%s", mode)
-                return mode
+                self.rigctrlsocket.send(b"|m\n")
+                # get_mode:|Mode: CW|Passband: 500|RPRT 0
+                report = self.__get_serial_string().strip()
+                if "getmode:|" in report and "RPRT 0" in report:
+                    seg_rpt = report.split("|")
+                    return seg_rpt[2].split(" ")[1]
+
             except IndexError as exception:
                 logger.debug("%s", f"{exception}")
             except socket.error as exception:
@@ -426,8 +431,12 @@ class CAT:
         if self.rigctrlsocket:
             try:
                 self.online = True
-                self.rigctrlsocket.send(b"l RFPOWER\n")
-                return int(float(self.__get_serial_string().strip()) * 100)
+                self.rigctrlsocket.send(b"|l RFPOWER\n")
+                # get_level: RFPOWER|0.000000|RPRT 0
+                report = self.__get_serial_string().strip()
+                if "get_level: RFPOWER|" in report and "RPRT 0" in report:
+                    seg_rpt = report.split("|")
+                    return int(float(seg_rpt[1]) * 100)
             except socket.error as exception:
                 self.online = False
                 logger.debug("getpower_rigctld: %s", f"{exception}")

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.11.25"
+__version__ = "24.11.26.1"

{not1mm-24.11.25.dist-info → not1mm-24.11.26.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.11.25
+Version: 24.11.26.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -238,7 +238,9 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
-- [24-22-15] Fix CQWW points, fix mode showing as RPRT.
+- [24-11-26-1] Changed ESC to stop CW, CTRL-W to wipe input fields.
+- [24-11-26] Trying something different with rigctld parsing.
+- [24-11-15] Fix CQWW points, fix mode showing as RPRT.
 - [24-11-24-1] Add ESM to CQ160, ARRL VHF, ARRL 10M, 10 10 contests.
 - [24-11-24] Added ESM to IARU HF and FieldDay.
 - [24-11-23] Made macros per contest.
@@ -746,8 +748,7 @@ is this has happened, since the gridsquare will replace the word "Regional".
 
 | Key | Result |
 | -------------- | --- |
-| [Esc] | Clears the input fields of any text. |
-| [CTRL-Esc] | Stops cwdaemon from sending Morse. |
+| [Esc] | Stops cwdaemon from sending Morse. |
 | [PgUp] | Increases the cw sending speed. |
 | [PgDown] | Decreases the cw sending speed. |
 | [Arrow-Up] | Jump to the next spot above the current VFO cursor in the bandmap window (CAT Required). |
@@ -762,6 +763,7 @@ is this has happened, since the gridsquare will replace the word "Regional".
 | [CTRL-G] | Tune to a spot matching partial text in the callsign entry field (CAT Required). |
 | [CTRL-SHIFT-K] | Open CW text input field. |
 | [CTRL-=] | Log the contact without sending the ESM macros.|
+| [CTRL-W] | Clears the input fields of any text. |
 
 ### The Log Window
 

{not1mm-24.11.25.dist-info → not1mm-24.11.26.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=IKdrA6p-ScJtcuD9s0J4QsYNxqbobTJkIQs6nz4qw3o,142522
+not1mm/__main__.py,sha256=4hFDKkXbu_xdtra4VIMtQGVzp7UbD3nZY6C7HXNyUAM,142552
 not1mm/bandmap.py,sha256=X6mMHXS1kXBbUPZCaKgiVJ6Dz6DE6LEQqtEXfT3telg,30811
 not1mm/checkwindow.py,sha256=VFAcKYTcoWhmIf91chwY6tyao9FQMWPiUkgDDkkWaog,9670
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
@@ -95,7 +95,7 @@ not1mm/data/phonetics/yourcall.wav,sha256=4kheHJmCiRDL2kjhlgXQ8_u_eEMgKxiNGu5UBk
 not1mm/data/phonetics/z.wav,sha256=arafCi7fwmBLdVDI-PRyaL4U-03PIQDhffwY5noJ_2c,51768
 not1mm/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/lib/about.py,sha256=sWycfGcruN3SaEe4JmaJ61K6D8Itq0WxpUYT-lEcmYM,416
-not1mm/lib/cat_interface.py,sha256=6E53PPsqjc22vWqcDG3PfsnP_n9-WyG25Vkb8KC7psY,24497
+not1mm/lib/cat_interface.py,sha256=0R9ZiEZ0u0RzPrw_hrFNIdS4ybUBgAKtD74x2jdCVIU,25094
 not1mm/lib/cwinterface.py,sha256=yQL8Dif9oOIynaRItHgvcmu4mYv1TnTpqCHPtkeb09o,4472
 not1mm/lib/database.py,sha256=nqWp2eJ7JfUTqaQ9AVbx3XjgtlRnYY9ruTQCv2YRreY,48310
 not1mm/lib/edit_contact.py,sha256=Ki9bGPpqyQQBB1cU8VIBDCal3lbXeQ6qxhzklmhE2_w,353
@@ -114,7 +114,7 @@ not1mm/lib/plugin_common.py,sha256=AABdx9DoTT8Znrup7AkfmKGC22hshMsEypiMqV0iKw0,1
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=Xt0WE2ro_kUYdugQ0Pe1SQX07MHrJ0jyQqDqAKKqxuU,13564
 not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
-not1mm/lib/version.py,sha256=Dc_v3mS01fH1TssznBBxO-9xONCDipbQqvRIc0V11a4,49
+not1mm/lib/version.py,sha256=BcaX3Cm7q7UabsuJBtuqFJ5FUf6Qn18XbC6PtCOpVnc,51
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=AsvB2VUd6Qb2_FzZkSBkSd1_qeP8Dt-B-exF1Pzb9tk,14469
 not1mm/plugins/10_10_spring_cw.py,sha256=nA4v0oqlp-ivvKqNPakb19I-wE_ElhvH5bCzDRx00JU,14474
@@ -162,9 +162,9 @@ not1mm/plugins/ref_ssb.py,sha256=G2Gz4kApchmOZQVnBexEokSEvdb-mZWJAfyJ1D6JDGY,204
 not1mm/plugins/stew_perry_topband.py,sha256=Gy_vv6tgkR-3vmvsUVO0pVfHMkUJSxpt7G4secn0RH8,15084
 not1mm/plugins/weekly_rtty.py,sha256=PI0_AtEdZZKGAuKnP-b2EYn9xwCN1Ablk38trbNP3Rc,19603
 not1mm/plugins/winter_field_day.py,sha256=9w3tDL9ZWiENSTERc3vzDbBktvI7pnyNvlH6fDjAi08,14841
-not1mm-24.11.25.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.11.25.dist-info/METADATA,sha256=5vMpo5afhM4SNnF92puhbeGXbZ2SnNIhWF9GonT7Vd4,36670
-not1mm-24.11.25.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-not1mm-24.11.25.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.11.25.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.11.25.dist-info/RECORD,,
+not1mm-24.11.26.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.11.26.1.dist-info/METADATA,sha256=5NBRnqJvdS35tJbbSiaIf_7BGkTD5e10HKA4r4Zfxg8,36800
+not1mm-24.11.26.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+not1mm-24.11.26.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.11.26.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.11.26.1.dist-info/RECORD,,