not1mm 24.10.13__tar.gz → 24.10.14__tar.gz

{not1mm-24.10.13 → not1mm-24.10.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.10.13
+Version: 24.10.14
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -231,6 +231,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-10-14] Add ESM to CQ WPX.
 - [24-10-13] Added ESM to Weekly RTTY, K1USN and CWT.
 - [24-10-11] added ESM to CQWW SSB and RTTY.
 - [24-10-10] Add ESM to CQ WW CW to test it out.

{not1mm-24.10.13 → not1mm-24.10.14}/README.md

@@ -200,6 +200,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-10-14] Add ESM to CQ WPX.
 - [24-10-13] Added ESM to Weekly RTTY, K1USN and CWT.
 - [24-10-11] added ESM to CQWW SSB and RTTY.
 - [24-10-10] Add ESM to CQ WW CW to test it out.

{not1mm-24.10.13 → not1mm-24.10.14}/not1mm/data/cwmacros.txt

@@ -1,18 +1,18 @@
-S|F1|MyCall|{MYCALL}
-S|F2|Exch|{SNT} {SENTNR}
-S|F3|My NR|{SENTNR}
+S|F1|CQ|cq test {MYCALL} {MYCALL} test
+S|F2|HisCall|{HISCALL}
+S|F3|Exch|{SNT} {EXCH}
 S|F4|empty| 
-S|F5|AGN|agn
+S|F5|MyCall|{MYCALL}
 S|F6|?|?
 S|F7|Roger|rr
 S|F8|73|73
-S|F9|..|ee
+S|F9|AGN|agn
 S|F10|Call?|cl?
 S|F11|NR??|NR?
 S|F12|TU|tu
 R|F1|Run CQ|cq test {MYCALL} {MYCALL} test
 R|F2|HisCall|{HISCALL}
-R|F3|Run Exch|{HISCALL} {SNT} {SENTNR}
+R|F3|Run Exch|{SNT} {EXCH}
 R|F4|Run TU|tu {MYCALL} qrz
 R|F5|MyCall|{MYCALL}
 R|F6|MyNR|{SENTNR}

{not1mm-24.10.13 → not1mm-24.10.14}/not1mm/data/rttymacros.txt

@@ -1,18 +1,18 @@
 S|F1|MyCall|{MYCALL}
-S|F2|Exch|{SNT} {EXCH}
-S|F3|My NR|{SENTNR}
+S|F2|HisCall|{HISCALL}
+S|F3|Exch|{SNT} {EXCH}
 S|F4|empty| 
-S|F5|AGN|agn
+S|F5|MyCall|{MYCALL}
 S|F6|?|?
 S|F7|Roger|rr
 S|F8|73|73
-S|F9|..|ee
+S|F9|AGN|agn
 S|F10|Call?|cl?
 S|F11|NR??|NR?
 S|F12|TU|tu
 R|F1|Run CQ|cq test {MYCALL} {MYCALL} test
 R|F2|HisCall|{HISCALL}
-R|F3|Run Exch|{HISCALL} {SNT} {EXCH}
+R|F3|Run Exch|{SNT} {EXCH}
 R|F4|Run TU|tu {MYCALL} qrz
 R|F5|MyCall|{MYCALL}
 R|F6|MyNR|{SENTNR}
@@ -21,4 +21,4 @@ R|F8|Roger|rr
 R|F9|AGN|agn
 R|F10|Call?|cl?
 R|F11|NR?|NR?
-R|F12|Ack Call?|{HISCALL} rr tu
+R|F12|Ack Call?|{HISCALL} rr tu

not1mm-24.10.14/not1mm/lib/version.py

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

{not1mm-24.10.13 → not1mm-24.10.14}/not1mm/plugins/cq_wpx_cw.py

@@ -429,3 +429,104 @@ def recalculate_mults(self):
         else:
             contact["IsMultiplier1"] = 0
         self.database.change_contact(contact)
+
+
+def process_esm(self, new_focused_widget=None, with_enter=False):
+    """ESM State Machine"""
+
+    # self.pref["run_state"]
+
+    # -----===== Assigned F-Keys =====-----
+    # self.esm_dict["CQ"]
+    # self.esm_dict["EXCH"]
+    # self.esm_dict["QRZ"]
+    # self.esm_dict["AGN"]
+    # self.esm_dict["HISCALL"]
+    # self.esm_dict["MYCALL"]
+    # self.esm_dict["QSOB4"]
+
+    # ----==== text fields ====----
+    # self.callsign
+    # self.sent
+    # self.receive
+    # self.other_1
+    # self.other_2
+
+    if new_focused_widget is not None:
+        self.current_widget = self.inputs_dict.get(new_focused_widget)
+
+    # print(f"checking esm {self.current_widget=} {with_enter=} {self.pref.get("run_state")=}")
+
+    for a_button in [
+        self.F1,
+        self.F2,
+        self.F3,
+        self.F4,
+        self.F5,
+        self.F6,
+        self.F7,
+        self.F8,
+        self.F9,
+        self.F10,
+        self.F11,
+        self.F12,
+    ]:
+        self.restore_button_color(a_button)
+
+    buttons_to_send = []
+
+    if self.pref.get("run_state"):
+        if self.current_widget == "callsign":
+            if len(self.callsign.text()) < 3:
+                self.make_button_green(self.esm_dict["CQ"])
+                buttons_to_send.append(self.esm_dict["CQ"])
+            elif len(self.callsign.text()) > 2 and self.callsign.text().isalnum():
+                self.make_button_green(self.esm_dict["HISCALL"])
+                self.make_button_green(self.esm_dict["EXCH"])
+                buttons_to_send.append(self.esm_dict["HISCALL"])
+                buttons_to_send.append(self.esm_dict["EXCH"])
+
+        elif self.current_widget == "other_2":
+            if self.other_2.text() == "":
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+            elif self.other_2.text().isnumeric():
+                self.make_button_green(self.esm_dict["QRZ"])
+                buttons_to_send.append(self.esm_dict["QRZ"])
+                buttons_to_send.append("LOGIT")
+            else:
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+
+        if with_enter is True and bool(len(buttons_to_send)):
+            for button in buttons_to_send:
+                if button:
+                    if button == "LOGIT":
+                        self.save_contact()
+                        continue
+                    self.process_function_key(button)
+    else:
+        if self.current_widget == "callsign":
+            if len(self.callsign.text()) > 2 and self.callsign.text().isalnum():
+                self.make_button_green(self.esm_dict["MYCALL"])
+                buttons_to_send.append(self.esm_dict["MYCALL"])
+
+        elif self.current_widget == "other_2":
+            if self.other_2.text() == "":
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+            elif self.other_2.text().isnumeric():
+                self.make_button_green(self.esm_dict["EXCH"])
+                buttons_to_send.append(self.esm_dict["EXCH"])
+                buttons_to_send.append("LOGIT")
+            else:
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+
+        if with_enter is True and bool(len(buttons_to_send)):
+            for button in buttons_to_send:
+                if button:
+                    if button == "LOGIT":
+                        self.save_contact()
+                        continue
+                    self.process_function_key(button)

{not1mm-24.10.13 → not1mm-24.10.14}/not1mm/plugins/cq_wpx_rtty.py

@@ -429,6 +429,7 @@ def recalculate_mults(self):
             contact["IsMultiplier1"] = 0
         self.database.change_contact(contact)
 
+
 def set_self(the_outie):
     """..."""
     globals()["ALTEREGO"] = the_outie
@@ -505,3 +506,108 @@ def ft8_handler(the_packet: dict):
         ALTEREGO.other_1.setText(f'{the_packet.get("STX", "")}'.strip())
         ALTEREGO.other_2.setText(f'{the_packet.get("SRX", "")}'.strip())
         ALTEREGO.save_contact()
+
+
+def process_esm(self, new_focused_widget=None, with_enter=False):
+    """ESM State Machine"""
+
+    # self.pref["run_state"]
+
+    # -----===== Assigned F-Keys =====-----
+    # self.esm_dict["CQ"]
+    # self.esm_dict["EXCH"]
+    # self.esm_dict["QRZ"]
+    # self.esm_dict["AGN"]
+    # self.esm_dict["HISCALL"]
+    # self.esm_dict["MYCALL"]
+    # self.esm_dict["QSOB4"]
+
+    # ----==== text fields ====----
+    # self.callsign
+    # self.sent
+    # self.receive
+    # self.other_1
+    # self.other_2
+
+    if new_focused_widget is not None:
+        self.current_widget = self.inputs_dict.get(new_focused_widget)
+
+    # print(f"checking esm {self.current_widget=} {with_enter=} {self.pref.get("run_state")=}")
+
+    for a_button in [
+        self.F1,
+        self.F2,
+        self.F3,
+        self.F4,
+        self.F5,
+        self.F6,
+        self.F7,
+        self.F8,
+        self.F9,
+        self.F10,
+        self.F11,
+        self.F12,
+    ]:
+        self.restore_button_color(a_button)
+
+    buttons_to_send = []
+
+    if self.pref.get("run_state"):
+        if self.current_widget == "callsign":
+            if len(self.callsign.text()) < 3:
+                self.make_button_green(self.esm_dict["CQ"])
+                buttons_to_send.append(self.esm_dict["CQ"])
+            elif len(self.callsign.text()) > 2 and self.callsign.text().isalnum():
+                self.make_button_green(self.esm_dict["HISCALL"])
+                self.make_button_green(self.esm_dict["EXCH"])
+                buttons_to_send.append(self.esm_dict["HISCALL"])
+                buttons_to_send.append(self.esm_dict["EXCH"])
+
+        elif self.current_widget in ["other_1", "other_2"]:
+            if self.other_2.text() == "" or self.other_1.text() == "":
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+            elif self.other_1.text().isnumeric() and self.other_2.text().isalpha():
+                self.make_button_green(self.esm_dict["QRZ"])
+                buttons_to_send.append(self.esm_dict["QRZ"])
+                buttons_to_send.append("LOGIT")
+            else:
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+
+        if with_enter is True and bool(len(buttons_to_send)):
+            sendstring = ""
+            for button in buttons_to_send:
+                if button:
+                    if button == "LOGIT":
+                        self.save_contact()
+                        continue
+                    sendstring = f"{sendstring}{self.process_macro(button.toolTip())} "
+            self.fldigi_util.send_string(sendstring)
+    else:
+        if self.current_widget == "callsign":
+            if len(self.callsign.text()) > 2 and self.callsign.text().isalnum():
+                self.make_button_green(self.esm_dict["MYCALL"])
+                buttons_to_send.append(self.esm_dict["MYCALL"])
+
+        elif self.current_widget in ["other_1", "other_2"]:
+            if self.other_2.text() == "" or self.other_1.text() == "":
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+            elif self.other_1.text().isnumeric() and self.other_2.text().isalpha():
+                self.make_button_green(self.esm_dict["EXCH"])
+                buttons_to_send.append(self.esm_dict["EXCH"])
+                buttons_to_send.append("LOGIT")
+            else:
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+
+        if with_enter is True and bool(len(buttons_to_send)):
+            sendstring = ""
+            for button in buttons_to_send:
+                if button:
+                    if button == "LOGIT":
+                        self.save_contact()
+                        continue
+                    sendstring = f"{sendstring}{self.process_macro(button.toolTip())} "
+            self.fldigi_util.send_string(sendstring)

{not1mm-24.10.13 → not1mm-24.10.14}/not1mm/plugins/cq_wpx_ssb.py

@@ -392,3 +392,104 @@ def recalculate_mults(self):
         else:
             contact["IsMultiplier1"] = 0
         self.database.change_contact(contact)
+
+
+def process_esm(self, new_focused_widget=None, with_enter=False):
+    """ESM State Machine"""
+
+    # self.pref["run_state"]
+
+    # -----===== Assigned F-Keys =====-----
+    # self.esm_dict["CQ"]
+    # self.esm_dict["EXCH"]
+    # self.esm_dict["QRZ"]
+    # self.esm_dict["AGN"]
+    # self.esm_dict["HISCALL"]
+    # self.esm_dict["MYCALL"]
+    # self.esm_dict["QSOB4"]
+
+    # ----==== text fields ====----
+    # self.callsign
+    # self.sent
+    # self.receive
+    # self.other_1
+    # self.other_2
+
+    if new_focused_widget is not None:
+        self.current_widget = self.inputs_dict.get(new_focused_widget)
+
+    # print(f"checking esm {self.current_widget=} {with_enter=} {self.pref.get("run_state")=}")
+
+    for a_button in [
+        self.F1,
+        self.F2,
+        self.F3,
+        self.F4,
+        self.F5,
+        self.F6,
+        self.F7,
+        self.F8,
+        self.F9,
+        self.F10,
+        self.F11,
+        self.F12,
+    ]:
+        self.restore_button_color(a_button)
+
+    buttons_to_send = []
+
+    if self.pref.get("run_state"):
+        if self.current_widget == "callsign":
+            if len(self.callsign.text()) < 3:
+                self.make_button_green(self.esm_dict["CQ"])
+                buttons_to_send.append(self.esm_dict["CQ"])
+            elif len(self.callsign.text()) > 2 and self.callsign.text().isalnum():
+                self.make_button_green(self.esm_dict["HISCALL"])
+                self.make_button_green(self.esm_dict["EXCH"])
+                buttons_to_send.append(self.esm_dict["HISCALL"])
+                buttons_to_send.append(self.esm_dict["EXCH"])
+
+        elif self.current_widget == "other_2":
+            if self.other_2.text() == "":
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+            elif self.other_2.text().isnumeric():
+                self.make_button_green(self.esm_dict["QRZ"])
+                buttons_to_send.append(self.esm_dict["QRZ"])
+                buttons_to_send.append("LOGIT")
+            else:
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+
+        if with_enter is True and bool(len(buttons_to_send)):
+            for button in buttons_to_send:
+                if button:
+                    if button == "LOGIT":
+                        self.save_contact()
+                        continue
+                    self.process_function_key(button)
+    else:
+        if self.current_widget == "callsign":
+            if len(self.callsign.text()) > 2 and self.callsign.text().isalnum():
+                self.make_button_green(self.esm_dict["MYCALL"])
+                buttons_to_send.append(self.esm_dict["MYCALL"])
+
+        elif self.current_widget == "other_2":
+            if self.other_2.text() == "":
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+            elif self.other_2.text().isnumeric():
+                self.make_button_green(self.esm_dict["EXCH"])
+                buttons_to_send.append(self.esm_dict["EXCH"])
+                buttons_to_send.append("LOGIT")
+            else:
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+
+        if with_enter is True and bool(len(buttons_to_send)):
+            for button in buttons_to_send:
+                if button:
+                    if button == "LOGIT":
+                        self.save_contact()
+                        continue
+                    self.process_function_key(button)

{not1mm-24.10.13 → not1mm-24.10.14}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.10.13
+Version: 24.10.14
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -231,6 +231,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-10-14] Add ESM to CQ WPX.
 - [24-10-13] Added ESM to Weekly RTTY, K1USN and CWT.
 - [24-10-11] added ESM to CQWW SSB and RTTY.
 - [24-10-10] Add ESM to CQ WW CW to test it out.

{not1mm-24.10.13 → not1mm-24.10.14}/pyproject.toml

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

not1mm-24.10.13/not1mm/lib/version.py

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