not1mm 25.2.26__tar.gz → 25.3.2__tar.gz

{not1mm-25.2.26 → not1mm-25.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: not1mm
-Version: 25.2.26
+Version: 25.3.2
 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-2] Added call history support to ARRL DX, just in time for it to be over.
+- [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.
@@ -680,6 +682,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.26 → not1mm-25.3.2}/README.md

@@ -209,6 +209,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-3-2] Added call history support to ARRL DX, just in time for it to be over.
+- [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.
@@ -649,6 +651,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.26 → not1mm-25.3.2}/not1mm/__main__.py

@@ -2773,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:

{not1mm-25.2.26 → not1mm-25.3.2}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.2.26"
+__version__ = "25.3.2"

{not1mm-25.2.26 → not1mm-25.3.2}/not1mm/plugins/arrl_dx_cw.py

@@ -533,3 +533,25 @@ def just_points(self):
             score = "0"
         return int(score)
     return 0
+
+
+def populate_history_info_line(self):
+    result = self.database.fetch_call_history(self.callsign.text())
+    if result:
+        self.history_info.setText(
+            f"{result.get('Call', '')}, {result.get('Name', '')}, {result.get('State', '')}, {result.get('Power', '')}, {result.get('UserText','...')}"
+        )
+    else:
+        self.history_info.setText("")
+
+
+def check_call_history(self):
+    """"""
+    result = self.database.fetch_call_history(self.callsign.text())
+    if result:
+        self.history_info.setText(f"{result.get('UserText','')}")
+        if self.other_2.text() == "":
+            if result.get("State", ""):
+                self.other_2.setText(f"{result.get('State', '')}")
+            if result.get("Power", ""):
+                self.other_2.setText(f"{result.get('Power', '')}")

{not1mm-25.2.26 → not1mm-25.3.2}/not1mm/plugins/arrl_dx_ssb.py

@@ -532,3 +532,28 @@ def just_points(self):
             score = "0"
         return int(score)
     return 0
+
+
+#!!Order!!,Call,Name,State,Power,UserText,
+
+
+def populate_history_info_line(self):
+    result = self.database.fetch_call_history(self.callsign.text())
+    if result:
+        self.history_info.setText(
+            f"{result.get('Call', '')}, {result.get('Name', '')}, {result.get('State', '')}, {result.get('Power', '')}, {result.get('UserText','...')}"
+        )
+    else:
+        self.history_info.setText("")
+
+
+def check_call_history(self):
+    """"""
+    result = self.database.fetch_call_history(self.callsign.text())
+    if result:
+        self.history_info.setText(f"{result.get('UserText','')}")
+        if self.other_2.text() == "":
+            if result.get("State", ""):
+                self.other_2.setText(f"{result.get('State', '')}")
+            if result.get("Power", ""):
+                self.other_2.setText(f"{result.get('Power', '')}")

{not1mm-25.2.26 → not1mm-25.3.2}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: not1mm
-Version: 25.2.26
+Version: 25.3.2
 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-2] Added call history support to ARRL DX, just in time for it to be over.
+- [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.
@@ -680,6 +682,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.26 → not1mm-25.3.2}/pyproject.toml

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