not1mm 25.2.22__tar.gz → 25.3.1__tar.gz

{not1mm-25.2.22 → not1mm-25.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: not1mm
-Version: 25.2.22
+Version: 25.3.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -240,6 +240,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-3-1] Add {OTHER1} and {OTHER2} macros.
+- [25-2-26] Switch to a Run state if engaging auto_cq.
 - [25-2-22] Add Auto CQ.
 - [25-2-12] Merged PR from @alduhoo Adding RandomGram event.
 - [25-2-6] Trimmed out newer tags from UI files, 'cause stuff be old sometimes.
@@ -679,6 +681,8 @@ You can include a limited set of substitution instructions.
 | {SNT} | Sends 5nn (cw) or 599 (ssb) |
 | {SENTNR} | Sends whats in the SentNR field. |
 | {EXCH} | Sends what's in the Sent Exchange field when contest is defined. |
+| {OTHER1} | Sends whats in the SentNR/Name field without altering it. |
+| {OTHER2} | Sends whats in the Comment field without altering it. |
 | {LOGIT} | Log the contact after macro pressed. |
 | {MARK} | Mark the current call in the bandmap. |
 | {SPOT} | Spot the current call to the cluster. |

{not1mm-25.2.22 → not1mm-25.3.1}/README.md

@@ -209,6 +209,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-3-1] Add {OTHER1} and {OTHER2} macros.
+- [25-2-26] Switch to a Run state if engaging auto_cq.
 - [25-2-22] Add Auto CQ.
 - [25-2-12] Merged PR from @alduhoo Adding RandomGram event.
 - [25-2-6] Trimmed out newer tags from UI files, 'cause stuff be old sometimes.
@@ -648,6 +650,8 @@ You can include a limited set of substitution instructions.
 | {SNT} | Sends 5nn (cw) or 599 (ssb) |
 | {SENTNR} | Sends whats in the SentNR field. |
 | {EXCH} | Sends what's in the Sent Exchange field when contest is defined. |
+| {OTHER1} | Sends whats in the SentNR/Name field without altering it. |
+| {OTHER2} | Sends whats in the Comment field without altering it. |
 | {LOGIT} | Log the contact after macro pressed. |
 | {MARK} | Mark the current call in the bandmap. |
 | {SPOT} | Spot the current call to the cluster. |

{not1mm-25.2.22 → not1mm-25.3.1}/not1mm/__main__.py

@@ -2270,6 +2270,8 @@ class MainWindow(QtWidgets.QMainWindow):
                 return
         if event.key() == Qt.Key.Key_F1:
             if event.modifiers() == Qt.KeyboardModifier.ShiftModifier:
+                self.radioButton_run.setChecked(True)
+                self.run_sp_buttons_clicked()
                 self.auto_cq = True
                 self.auto_cq_time = datetime.datetime.now() + datetime.timedelta(
                     milliseconds=self.auto_cq_delay
@@ -2771,6 +2773,8 @@ class MainWindow(QtWidgets.QMainWindow):
             macro = macro.replace("#", next_serial)
         macro = macro.replace("{MYCALL}", self.station.get("Call", ""))
         macro = macro.replace("{HISCALL}", self.callsign.text())
+        macro = macro.replace("{OTHER1}", self.other_1.text())
+        macro = macro.replace("{OTHER2}", self.other_2.text())
         if self.radio_state.get("mode") == "CW":
             macro = macro.replace("{SNT}", self.sent.text().replace("9", "n"))
         else:
@@ -3713,12 +3717,16 @@ class MainWindow(QtWidgets.QMainWindow):
         Passing in a dictionary object with the
         vfo freq, mode, bandwidth, and online state of the radio.
         """
+        # This section has nothing to do with polling the radio
+        # It's here because it gets called often enough to be useful.
         if self.auto_cq is True:
             if datetime.datetime.now() > self.auto_cq_time:
                 self.auto_cq_time = datetime.datetime.now() + datetime.timedelta(
                     milliseconds=self.auto_cq_delay
                 )
                 self.process_function_key(self.F1)
+
+        # The following pertains to radio polling.
         logger.debug(f"{the_dict=}")
         self.set_radio_icon(0)
         info_dirty = False

{not1mm-25.2.22 → not1mm-25.3.1}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.2.22"
+__version__ = "25.3.1"

{not1mm-25.2.22 → not1mm-25.3.1}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: not1mm
-Version: 25.2.22
+Version: 25.3.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -240,6 +240,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-3-1] Add {OTHER1} and {OTHER2} macros.
+- [25-2-26] Switch to a Run state if engaging auto_cq.
 - [25-2-22] Add Auto CQ.
 - [25-2-12] Merged PR from @alduhoo Adding RandomGram event.
 - [25-2-6] Trimmed out newer tags from UI files, 'cause stuff be old sometimes.
@@ -679,6 +681,8 @@ You can include a limited set of substitution instructions.
 | {SNT} | Sends 5nn (cw) or 599 (ssb) |
 | {SENTNR} | Sends whats in the SentNR field. |
 | {EXCH} | Sends what's in the Sent Exchange field when contest is defined. |
+| {OTHER1} | Sends whats in the SentNR/Name field without altering it. |
+| {OTHER2} | Sends whats in the Comment field without altering it. |
 | {LOGIT} | Log the contact after macro pressed. |
 | {MARK} | Mark the current call in the bandmap. |
 | {SPOT} | Spot the current call to the cluster. |

{not1mm-25.2.22 → not1mm-25.3.1}/pyproject.toml

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