not1mm 24.10.14__tar.gz → 24.10.15.1__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.10.14
+Version: 24.10.15.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -213,7 +213,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - ARRL Sweepstakes CW, SSB
 - ARRL VHF January, June, September
 - CQ 160 CW, SSB
-- CQ WPX CW, RTTY, SSB
+- .CQ WPX CW, RTTY, SSB
 - .CQ World Wide CW, RTTY, SSB
 - .CWOps CWT
 - Helvetia
@@ -222,7 +222,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - ICWC MST
 - Japan International DX CW, SSB
 - .K1USN Slow Speed Test
-- NAQP CW, SSB
+- .NAQP CW, RTTY, SSB
 - Phone Weekly Test
 - RAC Canada Day
 - Stew Perry Topband
@@ -231,6 +231,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-10-15-1] Fix callsigns with a slash failing check during ESM.
+- [24-10-15] Add NAQP RTTY, Added ESM to NAQP.
 - [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.

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

@@ -182,7 +182,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - ARRL Sweepstakes CW, SSB
 - ARRL VHF January, June, September
 - CQ 160 CW, SSB
-- CQ WPX CW, RTTY, SSB
+- .CQ WPX CW, RTTY, SSB
 - .CQ World Wide CW, RTTY, SSB
 - .CWOps CWT
 - Helvetia
@@ -191,7 +191,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - ICWC MST
 - Japan International DX CW, SSB
 - .K1USN Slow Speed Test
-- NAQP CW, SSB
+- .NAQP CW, RTTY, SSB
 - Phone Weekly Test
 - RAC Canada Day
 - Stew Perry Topband
@@ -200,6 +200,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-10-15-1] Fix callsigns with a slash failing check during ESM.
+- [24-10-15] Add NAQP RTTY, Added ESM to NAQP.
 - [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.

{not1mm-24.10.14 → not1mm-24.10.15.1}/not1mm/data/new_contest.ui

@@ -352,6 +352,11 @@
        <string>NAQP CW</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>NAQP RTTY</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>NAQP SSB</string>

not1mm-24.10.15.1/not1mm/lib/version.py

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

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

@@ -480,7 +480,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
             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():
+            elif (
+                len(self.callsign.text()) > 2
+                and self.callsign.text().replace("/", "").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"])
@@ -507,7 +510,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                     self.process_function_key(button)
     else:
         if self.current_widget == "callsign":
-            if len(self.callsign.text()) > 2 and self.callsign.text().isalnum():
+            if (
+                len(self.callsign.text()) > 2
+                and self.callsign.text().replace("/", "").isalnum()
+            ):
                 self.make_button_green(self.esm_dict["MYCALL"])
                 buttons_to_send.append(self.esm_dict["MYCALL"])
 

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

@@ -557,7 +557,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
             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():
+            elif (
+                len(self.callsign.text()) > 2
+                and self.callsign.text().replace("/", "").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"])
@@ -586,7 +589,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
             self.fldigi_util.send_string(sendstring)
     else:
         if self.current_widget == "callsign":
-            if len(self.callsign.text()) > 2 and self.callsign.text().isalnum():
+            if (
+                len(self.callsign.text()) > 2
+                and self.callsign.text().replace("/", "").isalnum()
+            ):
                 self.make_button_green(self.esm_dict["MYCALL"])
                 buttons_to_send.append(self.esm_dict["MYCALL"])
 

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

@@ -443,7 +443,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
             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():
+            elif (
+                len(self.callsign.text()) > 2
+                and self.callsign.text().replace("/", "").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"])
@@ -470,7 +473,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                     self.process_function_key(button)
     else:
         if self.current_widget == "callsign":
-            if len(self.callsign.text()) > 2 and self.callsign.text().isalnum():
+            if (
+                len(self.callsign.text()) > 2
+                and self.callsign.text().replace("/", "").isalnum()
+            ):
                 self.make_button_green(self.esm_dict["MYCALL"])
                 buttons_to_send.append(self.esm_dict["MYCALL"])
 

{not1mm-24.10.14 → not1mm-24.10.15.1}/not1mm/plugins/cq_ww_cw.py

@@ -431,7 +431,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
             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():
+            elif (
+                len(self.callsign.text()) > 2
+                and self.callsign.text().replace("/", "").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"])
@@ -458,7 +461,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                     self.process_function_key(button)
     else:
         if self.current_widget == "callsign":
-            if len(self.callsign.text()) > 2 and self.callsign.text().isalnum():
+            if (
+                len(self.callsign.text()) > 2
+                and self.callsign.text().replace("/", "").isalnum()
+            ):
                 self.make_button_green(self.esm_dict["MYCALL"])
                 buttons_to_send.append(self.esm_dict["MYCALL"])
 

{not1mm-24.10.14 → not1mm-24.10.15.1}/not1mm/plugins/cq_ww_rtty.py

@@ -546,7 +546,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
             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():
+            elif (
+                len(self.callsign.text()) > 2
+                and self.callsign.text().replace("/", "").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"])
@@ -575,7 +578,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
             self.fldigi_util.send_string(sendstring)
     else:
         if self.current_widget == "callsign":
-            if len(self.callsign.text()) > 2 and self.callsign.text().isalnum():
+            if (
+                len(self.callsign.text()) > 2
+                and self.callsign.text().replace("/", "").isalnum()
+            ):
                 self.make_button_green(self.esm_dict["MYCALL"])
                 buttons_to_send.append(self.esm_dict["MYCALL"])
 

{not1mm-24.10.14 → not1mm-24.10.15.1}/not1mm/plugins/cq_ww_ssb.py

@@ -429,7 +429,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
             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():
+            elif (
+                len(self.callsign.text()) > 2
+                and self.callsign.text().replace("/", "").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"])
@@ -456,7 +459,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                     self.process_function_key(button)
     else:
         if self.current_widget == "callsign":
-            if len(self.callsign.text()) > 2 and self.callsign.text().isalnum():
+            if (
+                len(self.callsign.text()) > 2
+                and self.callsign.text().replace("/", "").isalnum()
+            ):
                 self.make_button_green(self.esm_dict["MYCALL"])
                 buttons_to_send.append(self.esm_dict["MYCALL"])
 

{not1mm-24.10.14 → not1mm-24.10.15.1}/not1mm/plugins/cwt.py

@@ -441,7 +441,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
             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():
+            elif (
+                len(self.callsign.text()) > 2
+                and self.callsign.text().replace("/", "").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"])
@@ -467,7 +470,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                     self.process_function_key(button)
     else:
         if self.current_widget == "callsign":
-            if len(self.callsign.text()) > 2 and self.callsign.text().isalnum():
+            if (
+                len(self.callsign.text()) > 2
+                and self.callsign.text().replace("/", "").isalnum()
+            ):
                 self.make_button_green(self.esm_dict["MYCALL"])
                 buttons_to_send.append(self.esm_dict["MYCALL"])
 

{not1mm-24.10.14 → not1mm-24.10.15.1}/not1mm/plugins/k1usn_sst.py

@@ -416,7 +416,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
             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():
+            elif (
+                len(self.callsign.text()) > 2
+                and self.callsign.text().replace("/", "").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"])
@@ -442,7 +445,10 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                     self.process_function_key(button)
     else:
         if self.current_widget == "callsign":
-            if len(self.callsign.text()) > 2 and self.callsign.text().isalnum():
+            if (
+                len(self.callsign.text()) > 2
+                and self.callsign.text().replace("/", "").isalnum()
+            ):
                 self.make_button_green(self.esm_dict["MYCALL"])
                 buttons_to_send.append(self.esm_dict["MYCALL"])
 

{not1mm-24.10.14 → not1mm-24.10.15.1}/not1mm/plugins/naqp_cw.py

@@ -13,12 +13,12 @@
 # Single Op Assisted (QRP/Low)
 # Single Op Overlay: Youth
 # Multi-Two (Low)
-#  	Max operating hours:	Single Op: 10 hours
-# Multi-Two: 12 hours
-#  	Max power:	LP: 100 watts
-# QRP: 5 watts
-#  	Exchange:	NA: Name + (state/DC/province/country)
-# non-NA: Name
+# Max operating hours:  Single Op:  10 hours
+#                       Multi-Two:  12 hours
+# Max power:	LP: 100 watts
+# QRP:          5 watts
+# Exchange:	    NA: Name + (state/DC/province/country)
+#               non-NA: Name
 #  	Work stations:	Once per band
 #  	QSO Points:	NA station: 1 point per QSO
 # non-NA station: 1 point per QSO with an NA station
@@ -391,3 +391,135 @@ def recalculate_mults(self):
         cmd["cmd"] = "UPDATELOG"
         cmd["station"] = platform.node()
         self.multicast_interface.send_as_json(cmd)
+
+
+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().replace("/", "").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_1" or self.current_widget == "other_2":
+            continent = self.contact.get("Continent")
+            print(
+                f"{self.current_widget=} {self.other_1.text().isalpha()=} {self.other_2.text().isalpha()=} {continent=}"
+            )
+            if self.other_1.text() == "" or (
+                self.other_2.text() == "" and continent == "NA"
+            ):
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+            elif (
+                self.other_1.text().isalpha()
+                and self.other_2.text().isalpha()
+                and continent == "NA"
+            ):
+                self.make_button_green(self.esm_dict["QRZ"])
+                buttons_to_send.append(self.esm_dict["QRZ"])
+                buttons_to_send.append("LOGIT")
+            elif self.other_1.text().isalpha() and continent != "NA":
+                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().replace("/", "").isalnum()
+            ):
+                self.make_button_green(self.esm_dict["MYCALL"])
+                buttons_to_send.append(self.esm_dict["MYCALL"])
+
+        elif self.current_widget == "other_1" or self.current_widget == "other_2":
+            continent = self.contact.get("Continent")
+            if self.other_1.text() == "" or (
+                self.other_2.text() == "" and continent == "NA"
+            ):
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+            elif (
+                self.other_1.text().isalpha()
+                and self.other_2.text().isalpha()
+                and continent == "NA"
+            ):
+                self.make_button_green(self.esm_dict["EXCH"])
+                buttons_to_send.append(self.esm_dict["EXCH"])
+                buttons_to_send.append("LOGIT")
+            elif self.other_1.text().isalpha() and continent != "NA":
+                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)