not1mm 24.11.25__tar.gz → 24.11.26.1__tar.gz

{not1mm-24.11.25 → not1mm-24.11.26.1}/PKG-INFO

@@ -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 → not1mm-24.11.26.1}/README.md

@@ -207,7 +207,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.
@@ -715,8 +717,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). |
@@ -731,6 +732,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 → not1mm-24.11.26.1}/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-24.11.25 → not1mm-24.11.26.1}/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-24.11.26.1/not1mm/lib/version.py

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

{not1mm-24.11.25 → not1mm-24.11.26.1}/not1mm.egg-info/PKG-INFO

@@ -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 → not1mm-24.11.26.1}/pyproject.toml

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

not1mm-24.11.25/not1mm/lib/version.py

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