not1mm 25.2.22__py3-none-any.whl → 25.3.1__py3-none-any.whl

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

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

{not1mm-25.2.22.dist-info → not1mm-25.3.1.dist-info}/METADATA

@@ -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.dist-info → not1mm-25.3.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=4Jv9ksSCUlh92_wpUW3eGRPAYwv5jN_7WzE_ayW_33A,147950
+not1mm/__main__.py,sha256=tg3pyejQnZILEIPLvjEjMWHsLmNDtOgEMVwk_G-hGgI,148362
 not1mm/bandmap.py,sha256=vaOeqv_gW0-K0P3xA9JYcuiFILiKw601tjHQCwuoV-s,31260
 not1mm/checkwindow.py,sha256=VFAcKYTcoWhmIf91chwY6tyao9FQMWPiUkgDDkkWaog,9670
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
@@ -116,7 +116,7 @@ not1mm/lib/plugin_common.py,sha256=M5reDYM-v5IjAa2yTROvZTeTDkXYHb3U52W9mc9GxwA,1
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=mXffn8Xaj5KATPQinNBR0V5DbHWQPsRfh24_axWGYuk,15254
 not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
-not1mm/lib/version.py,sha256=YyHhlv86HqZt-y6-w0bTg49_FZBc1moC-gosWfGb0HA,48
+not1mm/lib/version.py,sha256=OvlBILyYnJGDq4IZybylK34pDF1TpFCot_87JqSHCug,47
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=5QUyGMvGBC-HxcY_z9QbfuxSg3f7p6C9K4qhTxgZE7k,14719
 not1mm/plugins/10_10_spring_cw.py,sha256=XjYFM263WYyG6nVQzPObW4YC7Z9L93rixSOcVsxPvH4,14722
@@ -167,9 +167,9 @@ not1mm/plugins/ref_ssb.py,sha256=Z_XmMpYKcI5dZh4TQqvQDcz-cLpMzpDEKBnb5iHeBLQ,215
 not1mm/plugins/stew_perry_topband.py,sha256=D1hekmMbx-i4BhaP2uzOK3OzaVVMMdgcN3RmfweNqHo,15341
 not1mm/plugins/weekly_rtty.py,sha256=rdlIrsxBeuj-RQc5OStVNF7sGCtBK5t6inN5Z7DI4tw,20066
 not1mm/plugins/winter_field_day.py,sha256=JK4r1vfxs7aADR7ZYbjZniz3f5s3_ipSQDZ0GRNWC7I,15222
-not1mm-25.2.22.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-25.2.22.dist-info/METADATA,sha256=SRA1jtgHVpebHddRFUlRAP8Vdbg70-TS3glCQIFqCA4,36125
-not1mm-25.2.22.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-not1mm-25.2.22.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-25.2.22.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-25.2.22.dist-info/RECORD,,
+not1mm-25.3.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-25.3.1.dist-info/METADATA,sha256=aPf3ypwLgLUfVkeQLt_71AFfp-rPAjCqKhVDyOW4Y1s,36366
+not1mm-25.3.1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+not1mm-25.3.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-25.3.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-25.3.1.dist-info/RECORD,,

{not1mm-25.2.22.dist-info → not1mm-25.3.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any