not1mm 25.4.12__py3-none-any.whl → 25.4.14__py3-none-any.whl

not1mm/__main__.py

@@ -3705,6 +3705,11 @@ class MainWindow(QtWidgets.QMainWindow):
             result = self.database.check_dupe_on_band_mode(call, band, mode)
         if self.contest.dupe_type == 4:
             result = {"isdupe": False}
+        if self.contest.dupe_type == 5:
+            result = {"isdupe": False}  # in case contest has no function.
+            if hasattr(self.contest, "check_dupe"):
+                result = self.contest.specific_contest_check_dupe(self, call)
+
         debugline = f"{result}"
         logger.debug("%s", debugline)
         self.contact_is_dupe = result.get("isdupe", False)
@@ -4095,7 +4100,8 @@ class MainWindow(QtWidgets.QMainWindow):
         """
 
         logger.debug("******EDI*****")
-        self.contest.edi(self)
+        if hasattr(self.contest, "edi"):
+            self.contest.edi(self)
 
     def generate_cabrillo(self, file_encoding: str) -> None:
         """

not1mm/data/donors.html

@@ -11,4 +11,5 @@
 <center>Brian KB3ORR</center>
 <center>Connor KD9LSV</center>
 <center>Jeff KE9BPZ</center>
+<center>Tarmo ES1TAR</center>
 </p>

not1mm/data/new_contest.ui

@@ -347,6 +347,11 @@
        <string>EA RTTY</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>ES OPEN</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>HELVETIA</string>

not1mm/lib/database.py

@@ -1217,3 +1217,63 @@ class DataBase:
         except sqlite3.OperationalError as exception:
             logger.debug("%s", exception)
             return ()
+
+    def check_dupe_on_period_1_mode(
+        self, call, band, mode, contest_start_time, contest_time_period_1
+    ) -> dict:
+        """Checks if a call is dupe on band/mode"""
+        try:
+            with sqlite3.connect(self.database) as conn:
+                conn.row_factory = self.row_factory
+                cursor = conn.cursor()
+                cursor.execute(
+                    f"select count(*) as isdupe from dxlog where Call = '{call}' and Mode = '{mode}' and Band = '{band}' and ContestNR = {self.current_contest} AND TS >= '{contest_start_time}' AND TS <= '{contest_time_period_1}';"
+                )
+                return cursor.fetchone()
+        except sqlite3.OperationalError as exception:
+            logger.debug("%s", exception)
+            return {}
+
+    def check_dupe_on_period_2_mode(
+        self,
+        call,
+        band,
+        mode,
+        contest_start_time,
+        contest_time_period_1,
+        contest_time_period_2,
+    ) -> dict:
+        """Checks if a call is dupe on band/mode"""
+        try:
+            with sqlite3.connect(self.database) as conn:
+                conn.row_factory = self.row_factory
+                cursor = conn.cursor()
+                cursor.execute(
+                    f"select count(*) as isdupe from dxlog where Call = '{call}' and Mode = '{mode}' and Band = '{band}' and ContestNR = {self.current_contest} AND TS >= '{contest_time_period_1}' AND TS <= '{contest_time_period_2}';"
+                )
+                return cursor.fetchone()
+        except sqlite3.OperationalError as exception:
+            logger.debug("%s", exception)
+            return {}
+
+    def check_dupe_on_period_3_mode(
+        self,
+        call,
+        band,
+        mode,
+        contest_start_time,
+        contest_time_period_2,
+        contest_time_period_3,
+    ) -> dict:
+        """Checks if a call is dupe on band/mode"""
+        try:
+            with sqlite3.connect(self.database) as conn:
+                conn.row_factory = self.row_factory
+                cursor = conn.cursor()
+                cursor.execute(
+                    f"select count(*) as isdupe from dxlog where Call = '{call}' and Mode = '{mode}' and Band = '{band}' and ContestNR = {self.current_contest} AND TS >= '{contest_time_period_2}' AND TS <= '{contest_time_period_3}';"
+                )
+                return cursor.fetchone()
+        except sqlite3.OperationalError as exception:
+            logger.debug("%s", exception)
+            return {}

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.4.12"
+__version__ = "25.4.14"

not1mm/plugins/es_ll_kv.py

@@ -0,0 +1,568 @@
+""" """
+
+import datetime
+import logging
+import platform
+
+from pathlib import Path
+
+from PyQt6 import QtWidgets
+
+from not1mm.lib.plugin_common import gen_adif, get_points
+
+from not1mm.lib.ham_utility import calculate_wpx_prefix
+from not1mm.lib.version import __version__
+
+logger = logging.getLogger(__name__)
+
+EXCHANGE_HINT = "#"
+
+name = "ES OPEN"
+cabrillo_name = "ES-OPEN"
+mode = "BOTH"  # CW SSB BOTH RTTY
+
+columns = [
+    "YYYY-MM-DD HH:MM:SS",
+    "Call",
+    "Freq",
+    "Mode",
+    "Snt",
+    "Rcv",
+    "SentNr",
+    "RcvNr",
+    "PTS",
+]
+
+advance_on_space = [True, True, True, True, True]
+
+# 5 Contest specific dupe check.
+dupe_type = 5
+
+
+def specific_contest_check_dupe(self, call):
+    """"""
+
+    # constant to split the contest
+    contest_length_in_minutes = 60
+    split_contest_by_minutes = 20
+
+    period_count = int(contest_length_in_minutes / split_contest_by_minutes)
+
+    # think about generic solution by splitting the contest to n different periods
+    start_date_init = self.contest_settings.get("StartDate", "")
+    self.contest_start_date = start_date_init.split(" ")[0]
+    self.contest_start_time = start_date_init.split(" ")[1]
+
+    start_date_init_date = datetime.strptime(start_date_init, "%Y-%m-%d %H:%M:%S")
+
+    # Create time periods dynamically based on period count
+    time_periods = []
+    for i in range(period_count):
+        minutes_to_add = split_contest_by_minutes * (i + 1)
+        time_period = start_date_init_date + datetime.timedelta(minutes=minutes_to_add)
+        time_periods.append(time_period)
+
+    # Assign to variables for backwards compatibility
+    time_period_1 = time_periods[0] if len(time_periods) > 0 else None
+    time_period_2 = time_periods[1] if len(time_periods) > 1 else None
+    time_period_3 = time_periods[2] if len(time_periods) > 2 else None
+
+    # get current time in UTC
+    iso_current_time = datetime.now(datetime.timezone.utc)
+    current_time = iso_current_time.replace(tzinfo=None)
+
+    if current_time < time_period_1:
+        start_date_init = self.contest_start_date + " " + self.contest_start_time
+
+        result = self.database.check_dupe_on_period_1_mode(
+            call,
+            self.contact.get("Band", ""),
+            mode,
+            start_date_init,
+            time_period_1.strftime("%Y-%m-%d %H:%M:%S"),
+        )
+
+    if current_time < time_period_2 and current_time >= time_period_1:
+        start_date_init = self.contest_start_date + " " + self.contest_start_time
+
+        result = self.database.check_dupe_on_period_2_mode(
+            call,
+            self.contact.get("Band", ""),
+            mode,
+            start_date_init,
+            time_period_1.strftime("%Y-%m-%d %H:%M:%S"),
+            time_period_2.strftime("%Y-%m-%d %H:%M:%S"),
+        )
+
+    if current_time < time_period_3 and current_time >= time_period_2:
+        start_date_init = self.contest_start_date + " " + self.contest_start_time
+
+        result = self.database.check_dupe_on_period_3_mode(
+            call,
+            self.contact.get("Band", ""),
+            mode,
+            start_date_init,
+            time_period_2.strftime("%Y-%m-%d %H:%M:%S"),
+            time_period_3.strftime("%Y-%m-%d %H:%M:%S"),
+        )
+    else:
+        result = self.database.check_dupe_on_period_mode(
+            call, self.contact.get("Band", ""), mode, start_date_init
+        )
+    return result
+
+
+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.show()
+    self.field4.show()
+    self.other_label.setText("Sent")
+    self.field3.setAccessibleName("Sent")
+    self.exch_label.setText("SN")
+    self.field4.setAccessibleName("SN")
+
+
+def reset_label(self):
+    """reset label after field cleared"""
+
+
+def set_tab_next(self):
+    """Set TAB Advances"""
+    self.tab_next = {
+        self.callsign: self.other_1,
+        self.sent: self.other_1,
+        self.receive: self.other_1,
+        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.callsign,
+        self.other_1: self.callsign,
+        self.other_2: self.other_1,
+    }
+
+
+def set_contact_vars(self):
+    """Contest Specific"""
+    self.contact["SNT"] = self.sent.text()
+    self.contact["RCV"] = self.receive.text()
+    self.contact["SentNr"] = self.other_1.text().upper()
+    self.contact["NR"] = self.other_2.text().upper()
+
+    self.contact["IsMultiplier1"] = 0
+    self.contact["IsMultiplier2"] = 0
+
+
+def predupe(self):
+    """called after callsign entered"""
+
+
+def prefill(self):
+    """Fill SentNR"""
+    sent_sxchange_setting = self.contest_settings.get("SentExchange", "")
+    if sent_sxchange_setting.strip() == "#":
+        result = self.database.get_serial()
+        serial_nr = str(result.get("serial_nr", "1")).zfill(3)
+        if serial_nr == "None":
+            serial_nr = "001"
+        if len(self.other_1.text()) == 0:
+            self.other_1.setText(serial_nr)
+    else:
+        self.other_1.setText(sent_sxchange_setting)
+
+
+def points(self):
+    """ """
+    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 "CW":
+        return 2
+
+    return 0
+
+
+def show_mults(self, rtc=None):
+    """Return display string for mults"""
+    our_prefix = calculate_wpx_prefix(self.station.get("Call", ""))
+    query = f"SELECT count(DISTINCT(substr(WPXPrefix,3,1) || ':' || Band || ':' || Mode)) as mults from DXLOG where ContestNR = {self.pref.get('contest', '1')} AND CountryPrefix = 'ES' AND WPXPrefix != '{our_prefix}';"
+    result = self.database.exec_sql(query)
+    if result:
+        mult_count = result.get("mults", 0)
+        return mult_count
+    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 = show_mults(self)
+        return contest_points * (mults + 1)
+    return 0
+
+
+def recalculate_mults(self):
+    """Recalculates multipliers after change in logged qso."""
+
+
+def adif(self):
+    """Call the generate ADIF function"""
+    gen_adif(self, cabrillo_name, "ES OPEN")
+
+
+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.cqwpx.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"
+                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', '')).ljust(6)} "
+                    f"{contact.get('Call', '').ljust(13)} "
+                    f"{str(contact.get('RCV', '')).ljust(3)} "
+                    f"{str(contact.get('NR', '')).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 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('Exch1', '')}, {result.get('UserText','...')}"
+#         )
+#     else:
+#         self.history_info.setText("")
+
+
+# def check_call_history(self):
+#     """"""
+#     result = self.database.fetch_call_history(self.callsign.text())
+#     print(f"{result=}")
+#     if result:
+#         self.history_info.setText(f"{result.get('UserText','')}")
+#         if self.other_2.text() == "":
+#             self.other_2.setText(f"{result.get('Exch1', '')}")
+
+
+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 == "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 == "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 get_mults(self):
+    """Get mults for RTC XML"""
+    mults = {}
+    mults["country"], mults["state"] = show_mults(self, rtc=True)
+    return mults
+
+
+def just_points(self):
+    """Get points for RTC XML"""
+    return get_points(self)

not1mm/plugins/jidx_cw.py

@@ -335,14 +335,25 @@ def cabrillo(self, file_encoding):
                 file_encoding,
             )
             output_cabrillo_line(
-                f"ADDRESS: {self.station.get('City', '')}, {self.station.get('State', '')} ",
-                f"{self.station.get('Zip', '')}",
+                f"ADDRESS-CITY: {self.station.get('City', '')}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,
             )
             output_cabrillo_line(
-                f"ADDRESS: {self.station.get('Country', '')}",
+                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,

not1mm/plugins/jidx_ph.py

@@ -304,14 +304,25 @@ def cabrillo(self, file_encoding):
                 file_encoding,
             )
             output_cabrillo_line(
-                f"ADDRESS: {self.station.get('City', '')}, {self.station.get('State', '')} ",
-                f"{self.station.get('Zip', '')}",
+                f"ADDRESS-CITY: {self.station.get('City', '')}",
                 "\r\n",
                 file_descriptor,
                 file_encoding,
             )
             output_cabrillo_line(
-                f"ADDRESS: {self.station.get('Country', '')}",
+                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,

{not1mm-25.4.12.dist-info → not1mm-25.4.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.4.12
+Version: 25.4.14
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -105,6 +105,8 @@ Dynamic: license-file
   - [Sending CW](#sending-cw)
     - [Sending CW Macros](#sending-cw-macros)
     - [Auto CQ](#auto-cq)
+      - [Setting the delay](#setting-the-delay)
+      - [Cancelling the Auto CQ](#cancelling-the-auto-cq)
     - [Sending CW Free Form](#sending-cw-free-form)
     - [Editing macro keys](#editing-macro-keys)
     - [Macro substitutions](#macro-substitutions)
@@ -117,7 +119,7 @@ Dynamic: license-file
     - [The Log Window](#the-log-window)
       - [Editing a contact](#editing-a-contact)
     - [The Bandmap Window](#the-bandmap-window)
-    - [The Check Window](#the-check-window)
+    - [The Check Partial Window](#the-check-partial-window)
     - [The Rate Window](#the-rate-window)
     - [The Remote VFO Window](#the-remote-vfo-window)
   - [Cabrillo](#cabrillo)
@@ -228,6 +230,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - EA Majistad CW
 - EA Majistad SSB
 - EA RTTY
+- ES OPEN HF
 - Helvetia
 - IARU Fieldday R1 CW, SSB
 - IARU HF
@@ -251,14 +254,16 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-4-14] Add ES Open HF Chanmpionship.
+- [25-4-13] Fix crash in JIDX Cabrillo output.
 - [25-4-12] Added an Auto CQ time to fire progress bar.
 - [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-1] Add ARI 40/80 contest. Add CTRL-R to toggle Run state.
 - [25-4-10] Add Auto CQ visual indicator.
-- [25-4-9] Added UKEI DX
+- [25-4-9] Added UKEI DX Contest.
 - [25-4-8] Remove focus from statistics table widget.
 - [25-4-7] Merge in changes from dj1yfk correcting SPDX Cabrillo name.
 - [25-4-5] Add SPDX.
@@ -671,14 +676,22 @@ pressing F1 - F12. See next section on Editing macro keys.
 
 ### Auto CQ
 
-If you press `SHIFT-F1` The Auto CQ mode will be activated and the F1 macro will be resent
-after each Auto CQ Delay interval has passed. An indicator will appear to the upper left of
-the F1 macro key as a visual reminder that your Auto CQ is active.
+If you press `SHIFT-F1` The Auto CQ mode will be activated, you will be placed in a Run state
+and the F1 macro will be resent after each Auto CQ Delay interval has passed.
+An indicator will appear to the upper left of the F1 macro key as a visual reminder that your
+Auto CQ is active. With it to the right, you will see a small progress bar giving you a visual
+indication as to when F1 will fire next.
 
 ![Auto CQ Visual Indicator](https://github.com/mbridak/not1mm/raw/master/pic/auto_cq_indicator.png)
 
+#### Setting the delay
+
 The delay can be changed by going to the `Options` TAB in the Configuration dialog. If you are in
-S&P mode when you enable Auto CQ, you will be automatically switched into RUN mode.
+S&P mode when you enable Auto CQ, you will be automatically switched into RUN mode. To properly set
+the delay you should time how long your F1 macro takes to key, then add how many seconds of pause
+you would like. This is your delay value.
+
+#### Cancelling the Auto CQ
 
 The auto CQ can be cancelled by either typing in the call sign field, or by pressing ESC.
 
@@ -759,6 +772,8 @@ is this has happened, since the gridsquare will replace the word "Regional".
 
 ## Other uses for the call field
 
+**You must press the SPACE bar after entering any of the below.**
+
 - [A Frequency] You can enter a frequency in kilohertz. This will change the band you're logging on. If you have CAT control, this will change the frequency of the radio as well.
 - [CW, SSB, RTTY] You can set the mode logged. If you have CAT control this will also change the mode on the radio.
 - [OPON] Change the operator currently logging.
@@ -775,9 +790,9 @@ is this has happened, since the gridsquare will replace the word "Regional".
 
 | Key | Result |
 | -------------- | --- |
-| [Esc] | Stops cwdaemon from sending Morse. |
-| [PgUp] | Increases the cw sending speed. |
-| [PgDown] | Decreases the cw sending speed. |
+| [Esc] | Stops sending CW. |
+| [PgUp] | Increases the CW sending speed. |
+| [PgDown] | Decreases the CW sending speed. |
 | [Arrow-Up] | Jump to the next spot above the current VFO cursor in the bandmap window (CAT Required). |
 | [Arrow-Down] | Jump to the next spot below the current VFO cursor in the bandmap window (CAT Required). |
 | [TAB] | Move cursor to the right one field. |
@@ -792,6 +807,12 @@ is this has happened, since the gridsquare will replace the word "Regional".
 | [CTRL-SHIFT-K] | Open CW text input field. |
 | [CTRL-=] | Log the contact without sending the ESM macros.|
 | [CTRL-W] | Clears the input fields of any text. |
+| [ALT-B] | Toggles the BandMap window. |
+| [ALT-C] | Toggles the Check Partial window. |
+| [ALT-L] | Toggles the QSO Log window. |
+| [ALT-R] | Toggles the Rate window. |
+| [ALT-S] | Toggles the Statistics window. |
+| [ALT-V] | Toggles the VFO window. |
 
 ### The Log Window
 
@@ -839,9 +860,9 @@ blue rectangle shows the receivers bandwidth if one is reported.
 Clicked on spots now tune the radio and set the callsign field. Previously
 worked calls are displayed in red.
 
-### The Check Window
+### The Check Partial Window
 
-`Window`>`Check Window`
+`Window`>`Check Partial Window`
 
 As you enter a callsign, the Check Window will show probable matches to calls
 either in the MASTER.SCP file, your local log or the recent telnet spots. The
@@ -905,8 +926,12 @@ change.
 
 ## ESM
 
-I caved and started working on ESM or Enter Sends Message. To test it out you can
-go to `FILE -> Configuration Settings`
+ESM or Enter Sends Message. ESM is a feature in which the logging program will automatically
+send the right function key macros based on the information present in the input fields and
+which input field is active when you press the Enter key. You can see a common flow in the
+examples below.
+
+To test it out you can go to `FILE -> Configuration Settings`
 
 ![Config Screen](https://github.com/mbridak/not1mm/raw/master/pic/configuration_options.png)
 

{not1mm-25.4.12.dist-info → not1mm-25.4.14.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=_sobv7fOxQw5gIM1Q2-fLSMn2EXSdOgki0PnZ2xTFGo,153631
+not1mm/__main__.py,sha256=T03w3kUEWO4gy1oiDYG7GnqxhN4P5MH4ZB1u6SWB7pQ,153922
 not1mm/bandmap.py,sha256=-zu5slsuAm2GmeW8g3yvURzsuQxemwIQfw1HEq8xKHM,29920
 not1mm/checkwindow.py,sha256=zEHlw40j6Wr3rvKbCQf2lcezCoiZqaBqEvBjQU5aKW0,7630
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
@@ -23,7 +23,7 @@ not1mm/data/configuration.ui,sha256=mqhEvxD9lQGeoEkUrvbO9uNrOG62z6EIUUMa_b_SG-o,
 not1mm/data/contests.sql,sha256=4hmJCDvrbxnA_Y5S4T5o52TZieeFk6QUwFerwlFePNA,89307
 not1mm/data/cty.json,sha256=bwPhOrOAgvV9JiXUDT9kzCqfNWAhGuJQt489h0SKsCk,4925375
 not1mm/data/cwmacros.txt,sha256=NztufsX6R52gAO7VyJ2AHr7wOh41pJTwHKh5Lcs32ds,468
-not1mm/data/donors.html,sha256=0NEh7eu9Dsfv1Gy0_f6UMp4ZjVjm7OgoQJEQd-4whoU,267
+not1mm/data/donors.html,sha256=qLg2n3NoJ5ZMNZye-nD_lgNjtSqL7952k_Z_bbJM5hA,297
 not1mm/data/editcontact.ui,sha256=TNOsXETYfDaON4wj6AkzCJ-n2SmbNRO2-g2SLl5m8s0,27437
 not1mm/data/editmacro.ui,sha256=Vg-S62ogKYcWlDDlza_JYyZkCQfa8mCfF-cFqpBej-w,2700
 not1mm/data/greendot.png,sha256=El9TomJcGtViRcHOR7kMxGzjzvYs0TSAqOb3tZv0JDA,368
@@ -34,7 +34,7 @@ not1mm/data/k6gte.not1mm-64.png,sha256=6ku45Gq1g5ezh04F07osoKRtanb3e4kbx5XdIEh3N
 not1mm/data/logwindow.ui,sha256=f7vULj96tHIQuR1nJMyvPHHcmVgzkhv9D1isyojsnFU,1458
 not1mm/data/logwindowx.ui,sha256=CwpI-h7cI1yqyldH9quKftsdHL5lTyL9ABOcf80nfqc,1632
 not1mm/data/main.ui,sha256=-JDQXOaxj8_7Wda9KT2rEM4YUjBs31CiT1Rjc_DBobM,64907
-not1mm/data/new_contest.ui,sha256=Q8ZORq_9iRls5AJTroh1HAhEkTCOu02nBv9e9xXMOCU,25119
+not1mm/data/new_contest.ui,sha256=glqsmFGF5gh-JB-zuEVxAWrOR7-Hok5ibvZYCMcDCWE,25223
 not1mm/data/not1mm.html,sha256=c9-mfjMwDt4f5pySUruz2gREW33CQ2_rCddM2z5CZQo,23273
 not1mm/data/opon.ui,sha256=QDicqAk2lORG2UWsHa6jHlsGn6uzrrI2R4HSAocpPes,2258
 not1mm/data/pickcontest.ui,sha256=4hPBszCglObThx_eIWtmK9CEcbr7WBjbB1rKZdI-o3I,1707
@@ -102,7 +102,7 @@ not1mm/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/lib/about.py,sha256=sWycfGcruN3SaEe4JmaJ61K6D8Itq0WxpUYT-lEcmYM,416
 not1mm/lib/cat_interface.py,sha256=BJvy-34ZyiN73kKNQcCzE4w6ll2O6Ue0uz01T_3sf1E,25204
 not1mm/lib/cwinterface.py,sha256=rKUnqljHQC_Iljq4TCmAgSPe49lWbKcfxg58cE8YX5Y,5177
-not1mm/lib/database.py,sha256=-9iAPTXDGVUc3OfnZNZCaWRxg3u-qdJyO5jvSvrJQSk,49203
+not1mm/lib/database.py,sha256=fykyaQaTa_Pwde51f09Odbexy1mlUqObv0fjZ7hf3E0,51693
 not1mm/lib/edit_contact.py,sha256=Ki9bGPpqyQQBB1cU8VIBDCal3lbXeQ6qxhzklmhE2_w,353
 not1mm/lib/edit_macro.py,sha256=raKWBwsHInj5EUKmvyLQ6gqc3ZFDlstsD3xqoM4PC8E,517
 not1mm/lib/edit_opon.py,sha256=j3qJ1aBsQoIOnQ9yiBl3lyeISvKTP0I_rtBYBPAfgeI,359
@@ -118,7 +118,7 @@ not1mm/lib/plugin_common.py,sha256=D1OBjyLmX7zuSPqgTCmHwXzAKA12J_zTQItvyIem-4Y,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=atqnAZN-9H5r7AsrRXx2wU6Jo8y4lw4ILqxIBpKnWYk,48
+not1mm/lib/version.py,sha256=VF2ECEwHJr0MWw2BVQtIHH1HDZfZCrSeIks7YLhW7iU,48
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=oJh3JKqjOpnWElSlZpiQ631UnaOd8qra5s9bl_QoInk,14783
 not1mm/plugins/10_10_spring_cw.py,sha256=p7dSDtbFK0e6Xouw2V6swYn3VFVgHKyx4IfRWyBjMZY,14786
@@ -152,14 +152,15 @@ not1mm/plugins/darc_xmas.py,sha256=p5UNYLdtylsC_sSlxT8NvXXL1oSW0KyUhIN-rJonHgI,1
 not1mm/plugins/ea_majistad_cw.py,sha256=tl9y92Oz4NTch4H-SrBnZND2tHGqWQvtgl3emXfU8og,23352
 not1mm/plugins/ea_majistad_ssb.py,sha256=TwZLHwgybpIgA4ECXzV3bIeP89MLr3vXa4_O99-mgxQ,22946
 not1mm/plugins/ea_rtty.py,sha256=JvszWdtUqC_Sn2sJAlMhMp2AdlLyAIj-6nWT-yFkihw,23229
+not1mm/plugins/es_ll_kv.py,sha256=A0zW59A6DYzPTM6Q_zBGKM3zeDr9DXlS9oaAPdxKt5k,18384
 not1mm/plugins/general_logging.py,sha256=eQuna-LnrWpf93LmHTTo6956GWoGocVfeYnzY5cyTmw,9600
 not1mm/plugins/helvetia.py,sha256=fDKhvjDh5PxxLxmxvqTHzt-u0cMjHOjlF6JWBu3qB20,20079
 not1mm/plugins/iaru_fieldday_r1_cw.py,sha256=1AVyZFi3ri2zqaNJY181Wtyz74fai8QLoi7PoyXpfaY,17218
 not1mm/plugins/iaru_fieldday_r1_ssb.py,sha256=w0j4MY1LeGxOaQfRjxRS-Q4waTOOt-hbxA1spil7z_I,17222
 not1mm/plugins/iaru_hf.py,sha256=VtNCijj_p03EIRfUJE-5FSarGb8P-Ek7gxIdPF_zHQQ,16721
 not1mm/plugins/icwc_mst.py,sha256=IUpAETCjXxeTmOFu2ItivXiZGRaQgcuaPSu6Q1kOJAk,16539
-not1mm/plugins/jidx_cw.py,sha256=dsirWVEmogPSxSpo2uNGYa12qXiokAGad1IoclG5rpA,15945
-not1mm/plugins/jidx_ph.py,sha256=Ln47W-lPDieG3e67vVHwtPN3jKHVtb87fviyYBL8pi0,14894
+not1mm/plugins/jidx_cw.py,sha256=fbdo-KDzNAHq-lH1V0X99wsZJkBVUkJN4yyegTRZFrs,16292
+not1mm/plugins/jidx_ph.py,sha256=oFHZOPIa0pzVge0F73WPZ3z4cLiZCSBlO3499_Pe9NI,15241
 not1mm/plugins/k1usn_sst.py,sha256=yeaejs9rgXot1ISayTHFCWtYcNxOT2NG4E9oeXfQrq8,17198
 not1mm/plugins/labre_rs_digi.py,sha256=93awbxHK2Wi_XZWvUvtaZlQaxpoyX-ev_uj5lm0IZ60,20125
 not1mm/plugins/lz-dx.py,sha256=hP6APYus4AFpz1rMxU82mq7ZB15_hwgsfuR4qInEG6k,19886
@@ -178,9 +179,9 @@ not1mm/plugins/stew_perry_topband.py,sha256=3U-Dr28haBTqTaZWLiC1qHQBmLsLENDL-ihy
 not1mm/plugins/ukeidx.py,sha256=0ABGW7_9Ui0Rgr8mkPBxOJokAIerM1a4-HWnl6VsnV8,19105
 not1mm/plugins/weekly_rtty.py,sha256=C8Xs3Q5UgSYx-mFFar8BVARWtmqlyrbeC98Ubzb4UN8,20128
 not1mm/plugins/winter_field_day.py,sha256=hmAMgkdqIXtnCNyUp8J9Bb8liN8wj10wps6ROuG-Bok,15284
-not1mm-25.4.12.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-25.4.12.dist-info/METADATA,sha256=2CaR_uTiFmy3n94pB5vwG4eRTjCO0iTgLAkVBU9C3rA,38276
-not1mm-25.4.12.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-not1mm-25.4.12.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-25.4.12.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-25.4.12.dist-info/RECORD,,
+not1mm-25.4.14.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-25.4.14.dist-info/METADATA,sha256=zEUjyqIWcZk19fufgQqtY-OwoWxDYPuoZ9y0gdbxYEc,39394
+not1mm-25.4.14.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+not1mm-25.4.14.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-25.4.14.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-25.4.14.dist-info/RECORD,,