not1mm 25.4.10__tar.gz → 25.4.11.3__tar.gz

{not1mm-25.4.10 → not1mm-25.4.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.4.10
+Version: 25.4.11.3
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -242,6 +242,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - RandomGram
 - RAC Canada Day
 - REF CW, SSB
+- SAC CW, SSB
 - SPDX
 - Stew Perry Topband
 - UK/EI DX
@@ -250,6 +251,11 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-4-11-3] Fixed issue with winkeyer not sending multiple macros in ESM mode.
+- [25-4-11-2] Fixed a crash.
+- [25-4-11-1] Add clear buffer to winkeyer interface to stop sending.
+- [25-4-11] Add Scandinavian Activity Contest
+- [25-4-10-1] Add ARI 40/80 contest. Add Auto CQ visual indicator. Add CTRL-R to toggle Run state.
 - [25-4-10] Add Auto CQ visual indicator.
 - [25-4-9] Added UKEI DX
 - [25-4-8] Remove focus from statistics table widget.
@@ -778,6 +784,7 @@ is this has happened, since the gridsquare will replace the word "Regional".
 | [SPACE] | When in the callsign field, will move the input to the first field needed for the exchange. |
 | [Enter] | Submits the fields to the log. Unless ESM is enabled. |
 | [F1-F12] | Send (CW/RTTY/Voice) macros. |
+| [CTRL-R] | Toggle between Run and S&P modes. |
 | [CTRL-S] | Spot Callsign to the cluster. |
 | [CTRL-M] | Mark Callsign to the bandmap window to work later. |
 | [CTRL-G] | Tune to a spot matching partial text in the callsign entry field (CAT Required). |

{not1mm-25.4.10 → not1mm-25.4.11.3}/README.md

@@ -210,6 +210,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - RandomGram
 - RAC Canada Day
 - REF CW, SSB
+- SAC CW, SSB
 - SPDX
 - Stew Perry Topband
 - UK/EI DX
@@ -218,6 +219,11 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-4-11-3] Fixed issue with winkeyer not sending multiple macros in ESM mode.
+- [25-4-11-2] Fixed a crash.
+- [25-4-11-1] Add clear buffer to winkeyer interface to stop sending.
+- [25-4-11] Add Scandinavian Activity Contest
+- [25-4-10-1] Add ARI 40/80 contest. Add Auto CQ visual indicator. Add CTRL-R to toggle Run state.
 - [25-4-10] Add Auto CQ visual indicator.
 - [25-4-9] Added UKEI DX
 - [25-4-8] Remove focus from statistics table widget.
@@ -746,6 +752,7 @@ is this has happened, since the gridsquare will replace the word "Regional".
 | [SPACE] | When in the callsign field, will move the input to the first field needed for the exchange. |
 | [Enter] | Submits the fields to the log. Unless ESM is enabled. |
 | [F1-F12] | Send (CW/RTTY/Voice) macros. |
+| [CTRL-R] | Toggle between Run and S&P modes. |
 | [CTRL-S] | Spot Callsign to the cluster. |
 | [CTRL-M] | Mark Callsign to the bandmap window to work later. |
 | [CTRL-G] | Tune to a spot matching partial text in the callsign entry field (CAT Required). |

{not1mm-25.4.10 → not1mm-25.4.11.3}/not1mm/__main__.py

@@ -1853,6 +1853,7 @@ class MainWindow(QtWidgets.QMainWindow):
             "[CTRL-SHIFT-K] Open CW text input field.\n"
             "[CTRL-=]\tLog the contact without sending the ESM macros.\n"
             "[CTRL-W]\tClears the input fields of any text.\n"
+            "[CTRL-R]\tToggle the Run state.\n"
         )
 
     def filepicker(self, action: str) -> str:
@@ -2110,6 +2111,9 @@ class MainWindow(QtWidgets.QMainWindow):
             if self.cw.servertype == 1:
                 self.cw.sendcw("\x1b4")
                 return
+            if self.cw.servertype == 2:
+                self.cw.winkeyer_stop()
+                return
         if self.rig_control:
             if self.rig_control.online:
                 if self.pref.get("cwtype") == 3 and self.rig_control is not None:
@@ -2212,6 +2216,20 @@ class MainWindow(QtWidgets.QMainWindow):
                 if self.bandmap_window:
                     self.bandmap_window.msg_from_main(cmd)
             return
+        if (
+            event.key() == Qt.Key.Key_R
+            and modifier == Qt.KeyboardModifier.ControlModifier
+        ):  # pylint: disable=no-member
+            self.toggle_run_sp()
+            return
+        if (
+            event.key() == Qt.Key.Key_T
+            and modifier == Qt.KeyboardModifier.ControlModifier
+        ):  # pylint: disable=no-member
+            if hasattr(self.contest, "add_test_data"):
+                self.contest.add_test_data(self)
+            return
+
         if (
             event.key() == Qt.Key.Key_W
             and modifier == Qt.KeyboardModifier.ControlModifier
@@ -2223,16 +2241,6 @@ class MainWindow(QtWidgets.QMainWindow):
             and modifier != Qt.KeyboardModifier.ControlModifier
         ):
             self.stop_cw()
-            # if self.cw is not None:
-            #     if self.cw.servertype == 1:
-            #         self.cw.sendcw("\x1b4")
-            #         return
-            # if self.rig_control:
-            #     if self.rig_control.online:
-            #         if self.pref.get("cwtype") == 3 and self.rig_control is not None:
-            #             if self.rig_control.interface == "flrig":
-            #                 self.rig_control.cat.set_flrig_cw_send(False)
-            #                 self.rig_control.cat.set_flrig_cw_send(True)
         if event.key() == Qt.Key.Key_Up:
             cmd = {}
             cmd["cmd"] = "PREVSPOT"
@@ -2971,6 +2979,14 @@ class MainWindow(QtWidgets.QMainWindow):
                 return
             self.cw.sendcw(self.process_macro(function_key.toolTip()))
 
+    def toggle_run_sp(self) -> None:
+        """Toggles the radioButton_run and radioButton_sp."""
+        if self.radioButton_run.isChecked():
+            self.radioButton_sp.setChecked(True)
+        else:
+            self.radioButton_run.setChecked(True)
+        self.run_sp_buttons_clicked()
+
     def run_sp_buttons_clicked(self) -> None:
         """
         Handle Run/S&P mode changes.

{not1mm-25.4.10 → not1mm-25.4.11.3}/not1mm/data/new_contest.ui

@@ -212,6 +212,11 @@
        <string>10 10 WINTER PHONE</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>ARI 40 80</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>ARRL 10M</string>
@@ -432,6 +437,16 @@
        <string>REF SSB</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>SAC CW</string>
+      </property>
+     </item>
+     <item>
+      <property name="text">
+       <string>SAC SSB</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>SPDX</string>

{not1mm-25.4.10 → not1mm-25.4.11.3}/not1mm/lib/cwinterface.py

@@ -66,9 +66,9 @@ class CW:
         if texttosend:
             if self.servertype == 2:
                 self._sendcw_xmlrpc(texttosend)
-            if self.servertype == 1:
+            elif self.servertype == 1:
                 self._sendcw_udp(texttosend)
-            if self.servertype == 3:
+            elif self.servertype == 3:
                 self._sendcwcat(texttosend)
 
     def _sendcw_xmlrpc(self, texttosend):
@@ -130,3 +130,21 @@ class CW:
                 logger.info(
                     "http://%s:%s, xmlrpc Connection Refused", self.host, self.port
                 )
+
+    def winkeyer_stop(self):
+        """doc"""
+        if not self.__check_sane_ip(self.host):
+            logger.critical(f"Bad IP: {self.host}")
+            return
+        with ServerProxy(f"http://{self.host}:{self.port}") as proxy:
+            try:
+                if "clearbuffer" in self.winkeyer_functions:
+                    proxy.clearbuffer()
+            except Error as exception:
+                logger.info(
+                    "http://%s:%s, xmlrpc error: %s", self.host, self.port, exception
+                )
+            except ConnectionRefusedError:
+                logger.info(
+                    "http://%s:%s, xmlrpc Connection Refused", self.host, self.port
+                )

not1mm-25.4.11.3/not1mm/lib/version.py

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

not1mm-25.4.11.3/not1mm/plugins/ari_40_80.py

@@ -0,0 +1,482 @@
+"""CQ 160 CW plugin"""
+
+# pylint: disable=invalid-name, c-extension-no-member, unused-import, line-too-long
+
+import datetime
+import logging
+import platform
+
+from pathlib import Path
+
+from PyQt6 import QtWidgets
+
+from not1mm.lib.plugin_common import gen_adif
+from not1mm.lib.version import __version__
+
+logger = logging.getLogger(__name__)
+
+EXCHANGE_HINT = "Automobile Code"
+
+name = "ARI 40 80"
+cabrillo_name = "40-80"
+mode = "BOTH"  # CW SSB BOTH RTTY
+
+columns = [
+    "YYYY-MM-DD HH:MM:SS",
+    "Call",
+    "Freq",
+    "Mode",
+    "Snt",
+    "Rcv",
+    "Exchange1",
+    "PTS",
+]
+
+advance_on_space = [True, True, True, True, True]
+
+# 1 once per contest, 2 work each band, 3 each band/mode, 4 no dupe checking
+dupe_type = 3
+
+
+def init_contest(self):
+    """setup plugin"""
+    set_tab_next(self)
+    set_tab_prev(self)
+    interface(self)
+    self.next_field = self.other_2
+
+
+def interface(self):
+    """Setup user interface"""
+    self.field1.show()
+    self.field2.show()
+    self.field3.hide()
+    self.field4.show()
+    self.snt_label.setText("SNT")
+    self.field1.setAccessibleName("RST Sent")
+    self.exch_label.setText("Automobile Code")
+    self.field4.setAccessibleName("Received Exchange")
+
+
+def reset_label(self):  # pylint: disable=unused-argument
+    """reset label after field cleared"""
+
+
+def set_tab_next(self):
+    """Set TAB Advances"""
+    self.tab_next = {
+        self.callsign: self.sent,
+        self.sent: self.receive,
+        self.receive: self.other_2,
+        self.other_1: self.other_2,
+        self.other_2: self.callsign,
+    }
+
+
+def set_tab_prev(self):
+    """Set TAB Advances"""
+    self.tab_prev = {
+        self.callsign: self.other_2,
+        self.sent: self.callsign,
+        self.receive: self.sent,
+        self.other_1: self.receive,
+        self.other_2: self.receive,
+    }
+
+
+def set_contact_vars(self):
+    """Contest Specific"""
+    self.contact["SNT"] = self.sent.text()
+    self.contact["RCV"] = self.receive.text()
+    self.contact["SentNr"] = self.contest_settings.get("SentExchange", 0)
+    self.contact["Exchange1"] = self.other_2.text()
+    self.contact["IsMultiplier1"] = 0
+
+
+def predupe(self):  # pylint: disable=unused-argument
+    """called after callsign entered"""
+
+
+def prefill(self):
+    """Fill SentNR"""
+
+
+def points(self) -> int:
+    """Calc point"""
+
+    # a . QSOs/HRDs in CW are worth 3 points;
+    # b. QSOs/HRDs in RTTY are worth 2 points;
+    # c. QSOs/HRDs in SSB are worth 1 point.
+
+    if self.contact_is_dupe > 0:
+        return 0
+
+    _mode = self.contact.get("Mode", "")
+    if _mode in "SSB, USB, LSB, FM, AM":
+        return 1
+    if _mode in "RTTY":
+        return 2
+    if _mode in "CW":
+        return 3
+    return 0
+
+
+def show_mults(self):
+    """Return display string for mults"""
+    query = f"select count(DISTINCT(Exchange1 || ':' || Mode || ':' || Band)) as mult_count from dxlog where ContestNR = {self.pref.get('contest', '1')};"
+
+    result = self.database.exec_sql(query)
+    if result:
+        return int(result.get("mult_count", 0))
+    return 0
+
+
+def show_qso(self):
+    """Return qso count"""
+    result = self.database.fetch_qso_count()
+    if result:
+        return int(result.get("qsos", 0))
+    return 0
+
+
+def calc_score(self):
+    """Return calculated score"""
+    result = self.database.fetch_points()
+    if result is not None:
+        score = result.get("Points", "0")
+        if score is None:
+            score = "0"
+        contest_points = int(score)
+        mults = int(show_mults(self))
+        return contest_points * mults
+    return 0
+
+
+def adif(self):
+    """Call the generate ADIF function"""
+    gen_adif(self, cabrillo_name, cabrillo_name)
+
+
+def output_cabrillo_line(line_to_output, ending, file_descriptor, file_encoding):
+    """"""
+    print(
+        line_to_output.encode(file_encoding, errors="ignore").decode(),
+        end=ending,
+        file=file_descriptor,
+    )
+
+
+def cabrillo(self, file_encoding):
+    """Generates Cabrillo file. Maybe."""
+    # https://www.cw160.com/cabrillo.htm
+    logger.debug("******Cabrillo*****")
+    logger.debug("Station: %s", f"{self.station}")
+    logger.debug("Contest: %s", f"{self.contest_settings}")
+    now = datetime.datetime.now()
+    date_time = now.strftime("%Y-%m-%d_%H-%M-%S")
+    filename = (
+        str(Path.home())
+        + "/"
+        + f"{self.station.get('Call', '').upper()}_{cabrillo_name}_{date_time}.log"
+    )
+    logger.debug("%s", filename)
+    log = self.database.fetch_all_contacts_asc()
+    try:
+        with open(filename, "w", encoding=file_encoding, newline="") as file_descriptor:
+            output_cabrillo_line(
+                "START-OF-LOG: 3.0",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CREATED-BY: Not1MM v{__version__}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CONTEST: {cabrillo_name}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            if self.station.get("Club", ""):
+                output_cabrillo_line(
+                    f"CLUB: {self.station.get('Club', '').upper()}",
+                    "\r\n",
+                    file_descriptor,
+                    file_encoding,
+                )
+            output_cabrillo_line(
+                f"CALLSIGN: {self.station.get('Call','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"LOCATION: {self.station.get('ARRLSection', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CATEGORY-OPERATOR: {self.contest_settings.get('OperatorCategory','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CATEGORY-ASSISTED: {self.contest_settings.get('AssistedCategory','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CATEGORY-BAND: {self.contest_settings.get('BandCategory','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            mode = self.contest_settings.get("ModeCategory", "")
+            if mode in ["SSB+CW", "SSB+CW+DIGITAL"]:
+                mode = "MIXED"
+            output_cabrillo_line(
+                f"CATEGORY-MODE: {mode}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CATEGORY-TRANSMITTER: {self.contest_settings.get('TransmitterCategory','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            if self.contest_settings.get("OverlayCategory", "") != "N/A":
+                output_cabrillo_line(
+                    f"CATEGORY-OVERLAY: {self.contest_settings.get('OverlayCategory','')}",
+                    "\r\n",
+                    file_descriptor,
+                    file_encoding,
+                )
+            output_cabrillo_line(
+                f"GRID-LOCATOR: {self.station.get('GridSquare','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"CATEGORY-POWER: {self.contest_settings.get('PowerCategory','')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+
+            output_cabrillo_line(
+                f"CLAIMED-SCORE: {calc_score(self)}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            ops = f"@{self.station.get('Call','')}"
+            list_of_ops = self.database.get_ops()
+            for op in list_of_ops:
+                ops += f", {op.get('Operator', '')}"
+            output_cabrillo_line(
+                f"OPERATORS: {ops}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"NAME: {self.station.get('Name', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"ADDRESS: {self.station.get('Street1', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"ADDRESS-CITY: {self.station.get('City', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"ADDRESS-STATE-PROVINCE: {self.station.get('State', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"ADDRESS-POSTALCODE: {self.station.get('Zip', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"ADDRESS-COUNTRY: {self.station.get('Country', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            output_cabrillo_line(
+                f"EMAIL: {self.station.get('Email', '')}",
+                "\r\n",
+                file_descriptor,
+                file_encoding,
+            )
+            for contact in log:
+                the_date_and_time = contact.get("TS", "")
+                themode = contact.get("Mode", "")
+                if themode == "LSB" or themode == "USB":
+                    themode = "PH"
+                if themode == "RTTY":
+                    themode = "RY"
+                frequency = str(int(contact.get("Freq", "0"))).rjust(5)
+
+                loggeddate = the_date_and_time[:10]
+                loggedtime = the_date_and_time[11:13] + the_date_and_time[14:16]
+                output_cabrillo_line(
+                    f"QSO: {frequency} {themode} {loggeddate} {loggedtime} "
+                    f"{contact.get('StationPrefix', '').ljust(13)} "
+                    f"{str(contact.get('SNT', '')).ljust(3)} "
+                    f"{str(contact.get('SentNr', '')).upper().ljust(6)} "
+                    f"{contact.get('Call', '').ljust(13)} "
+                    f"{str(contact.get('RCV', '')).ljust(3)} "
+                    f"{str(contact.get('Exchange1', '')).upper().ljust(6)}",
+                    "\r\n",
+                    file_descriptor,
+                    file_encoding,
+                )
+            output_cabrillo_line("END-OF-LOG:", "\r\n", file_descriptor, file_encoding)
+        self.show_message_box(f"Cabrillo saved to: {filename}")
+    except IOError as exception:
+        logger.critical("cabrillo: IO error: %s, writing to %s", exception, filename)
+        self.show_message_box(f"Error saving Cabrillo: {exception} {filename}")
+        return
+
+
+def trigger_update(self):
+    """Triggers the log window to update."""
+    cmd = {}
+    cmd["cmd"] = "UPDATELOG"
+    if self.log_window:
+        self.log_window.msg_from_main(cmd)
+
+
+def recalculate_mults(self):
+    """Recalculates multipliers after change in logged qso."""
+
+
+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.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"],
+    ]:
+        if a_button is not None:
+            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:
+                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_2"]:
+            if self.other_2.text() == "":
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+            else:
+                self.make_button_green(self.esm_dict["QRZ"])
+                buttons_to_send.append(self.esm_dict["QRZ"])
+                buttons_to_send.append("LOGIT")
+
+        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:
+                self.make_button_green(self.esm_dict["MYCALL"])
+                buttons_to_send.append(self.esm_dict["MYCALL"])
+
+        elif self.current_widget in ["other_2"]:
+            if self.other_2.text() == "":
+                self.make_button_green(self.esm_dict["AGN"])
+                buttons_to_send.append(self.esm_dict["AGN"])
+            else:
+                self.make_button_green(self.esm_dict["EXCH"])
+                buttons_to_send.append(self.esm_dict["EXCH"])
+                buttons_to_send.append("LOGIT")
+
+        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)
+
+
+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('Sect', '')}")
+    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() == "":
+            self.other_2.setText(f"{result.get('Sect', '')}")