not1mm 24.12.15__py3-none-any.whl → 25.1.1__py3-none-any.whl

not1mm/__main__.py

@@ -1742,7 +1742,7 @@ class MainWindow(QtWidgets.QMainWindow):
         """
 
         self.show_message_box(
-            "[CTRL-Esc]\tStops cwdaemon from sending Morse.\n"
+            "[ESC]\tStops cwdaemon from sending Morse.\n"
             "[PgUp]\tIncreases the cw sending speed.\n"
             "[PgDown]\tDecreases the cw sending speed.\n"
             "[Arrow-Up] Jump to the next spot above the current VFO cursor\n"
@@ -2731,6 +2731,9 @@ class MainWindow(QtWidgets.QMainWindow):
         macro = macro.replace(
             "{EXCH}", self.contest_settings.get("SentExchange", "xxx")
         )
+        if "{LOGIT}" in macro:
+            macro = macro.replace("{LOGIT}", "")
+            self.save_contact()
         return macro
 
     def ptt_on(self) -> None:

not1mm/data/new_contest.ui

@@ -237,6 +237,11 @@
        <string>ARRL FIELD DAY</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>ARRL RTTY RU</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>ARRL SS CW</string>

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.12.15"
+__version__ = "25.1.1"

not1mm/plugins/arrl_rtty_ru.py

@@ -1,19 +1,55 @@
-"""ARRL plugin"""
+"""
+Mode:	RTTY
+ 	Bands:	80, 40, 20, 15, 10m
+ 	Classes:	Single Op (QRP/Low/High)
+Single Op Unlimited (QRP/Low/High)
+Single Op Overlay: (Limited Antennas)
+Multi-Single (Low/High)
+Multi-Two
+Multi-Multi
+ 	Max operating hours:	24 hours
+ 	Max power:	HP: 1500 watts
+LP: 100 watts
+ 	Exchange:	W/VE: RST + (state/province)
+non-W/VE: RST + Serial No.
+ 	Work stations:	Once per band
+ 	QSO Points:	1 point per QSO
+ 	Multipliers:	Each US state+DC (except KH6/KL7) once only
+Each VE province/territory once only
+Each DXCC country (including KH6/KL7) once only
+ 	Score Calculation:	Total score = total QSO points x total mults
+ 	Submit logs by:	2359Z January 12, 2025
+ 	E-mail logs to:	(none)
+ 	Upload log at:	https://contest-log-submission.arrl.org/
+ 	Mail logs to:	RTTY Roundup
+ARRL
+225 Main St.
+Newington, CT 06111
+USA
+ 	Find rules at:	https://www.arrl.org/rtty-roundup
+
+
+"""
 
 # pylint: disable=invalid-name, unused-argument, unused-variable, c-extension-no-member
 
 import datetime
-from decimal import Decimal
-from pathlib import Path
+import logging
 
+from pathlib import Path
 from PyQt6 import QtWidgets
-from not1mm.lib.plugin_common import online_score_xml
 
-EXCHANGE_HINT = ""
+from not1mm.lib.plugin_common import gen_adif, get_points, online_score_xml
+from not1mm.lib.version import __version__
+
+logger = logging.getLogger(__name__)
 
-name = "ARRL RTTY Round Up"
+EXCHANGE_HINT = "State/Province or #"
+
+name = "ARRL RTTY Roundup"
+mode = "RTTY"  # CW SSB BOTH RTTY
 cabrillo_name = "ARRL-RTTY"
-mode = "BOTH"  # CW SSB BOTH RTTY
+
 columns = [
     "YYYY-MM-DD HH:MM:SS",
     "Call",
@@ -22,23 +58,13 @@ columns = [
     "Rcv",
     "SentNr",
     "RcvNr",
-    "Exchange1",
-    "CK",
-    "Prec",
-    "Sect",
-    "WPX",
-    "Power",
-    "M1",
-    "ZN",
-    "M2",
-    "PFX",
     "PTS",
-    "Name",
-    "Comment",
 ]
 
+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 = 4
+dupe_type = 2
 
 
 def init_contest(self):
@@ -46,10 +72,23 @@ def init_contest(self):
     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.snt_label.setText("SNT")
+    self.field1.setAccessibleName("RST Sent")
+    # label = self.field3.findChild(QtWidgets.QLabel)
+    self.other_label.setText("SentNR")
+    self.field3.setAccessibleName("Sent Number")
+    # label = self.field4.findChild(QtWidgets.QLabel)
+    self.exch_label.setText("State|Prov|SN")
+    self.field4.setAccessibleName("State Province or Serial Number")
 
 
 def reset_label(self):
@@ -78,8 +117,22 @@ def set_tab_prev(self):
     }
 
 
+def validate(self):
+    """doc"""
+    # exchange = self.other_2.text().upper().split()
+    # if len(exchange) == 3:
+    #     if exchange[0].isalpha() and exchange[1].isdigit() and exchange[2].isalpha():
+    #         return True
+    # return False
+    return True
+
+
 def set_contact_vars(self):
     """Contest Specific"""
+    self.contact["SNT"] = self.sent.text()
+    self.contact["RCV"] = self.receive.text()
+    self.contact["NR"] = self.other_2.text().upper()
+    self.contact["SentNr"] = self.other_1.text()
 
 
 def predupe(self):
@@ -87,15 +140,51 @@ def predupe(self):
 
 
 def prefill(self):
-    """Fill SentNR"""
+    """Fill sentnr"""
+    result = self.database.get_serial()
+    serial_nr = str(result.get("serial_nr", "1")).zfill(3)
+    if serial_nr == "None":
+        serial_nr = "001"
+
+    exchange = self.contest_settings.get("SentExchange", "").replace("#", serial_nr)
+    if len(self.other_1.text()) == 0:
+        self.other_1.setText(exchange)
 
 
 def points(self):
     """Calc point"""
+    return 1
 
 
 def show_mults(self, rtc=None):
     """Return display string for mults"""
+    # CountryPrefix, integer
+
+    us_ve = 0
+    dx = 0
+
+    sql = (
+        "select count(DISTINCT(NR || ':' || Mode)) as mult_count "
+        f"from dxlog where ContestNR = {self.database.current_contest} and typeof(NR) = 'text';"
+    )
+    result = self.database.exec_sql(sql)
+    if result:
+        us_ve = result.get("mult_count", 0)
+
+    # DX
+    sql = (
+        "select count(DISTINCT(CountryPrefix || ':' || Mode)) as mult_count "
+        f"from dxlog where ContestNR = {self.database.current_contest} "
+        "and typeof(NR) = 'integer';"
+    )
+    result = self.database.exec_sql(sql)
+    if result:
+        dx = result.get("mult_count", 0)
+
+    if rtc is not None:
+        return dx, us_ve
+
+    return us_ve + dx
 
 
 def show_qso(self):
@@ -106,183 +195,346 @@ def show_qso(self):
     return 0
 
 
-def get_points(self):
-    """Return raw points before mults"""
-    result = self.database.fetch_points()
-    if result:
-        return int(result.get("Points", 0))
-    return 0
-
-
 def calc_score(self):
     """Return calculated score"""
-    result = self.database.fetch_points()
+    # Multipliers: Each US State + DC once per mode
+    _points = get_points(self)
+    _mults = show_mults(self)
+    _power_mult = 1
+    # if self.contest_settings.get("PowerCategory", "") == "QRP":
+    #     _power_mult = 2
+    return _points * _power_mult * _mults
 
 
 def adif(self):
-    """
-    Creates an ADIF file of the contacts made.
-    """
+    """Call the generate ADIF function"""
+    gen_adif(self, 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.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}.adi"
+        + 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="utf-8") as file_descriptor:
-            print("<ADIF_VER:5>2.2.0", end="\r\n", file=file_descriptor)
-            print("<EOH>", end="\r\n", file=file_descriptor)
+        with open(filename, "w", encoding=file_encoding) 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', '')}",
+                    "\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:
-                hiscall = contact.get("Call", "")
-                hisname = contact.get("Name", "")
-                the_date_and_time = contact.get("TS")
-                # band = contact.get("Band")
-                themode = contact.get("Mode")
-                frequency = str(Decimal(str(contact.get("Freq", 0))) / 1000)
-                sentrst = contact.get("SNT", "")
-                rcvrst = contact.get("RCV", "")
-                sentnr = str(contact.get("SentNr", "0"))
-                rcvnr = str(contact.get("NR", "0"))
-                grid = contact.get("GridSquare", "")
-                comment = contact.get("Comment", "")
+                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]
-                print(
-                    f"<QSO_DATE:{len(''.join(loggeddate.split('-')))}:d>"
-                    f"{''.join(loggeddate.split('-'))}",
-                    end="\r\n",
-                    file=file_descriptor,
+                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,
                 )
-
-                try:
-                    print(
-                        f"<TIME_ON:{len(loggedtime)}>{loggedtime}",
-                        end="\r\n",
-                        file=file_descriptor,
-                    )
-                except TypeError:
-                    ...
-
-                try:
-                    print(
-                        f"<CALL:{len(hiscall)}>{hiscall.upper()}",
-                        end="\r\n",
-                        file=file_descriptor,
-                    )
-                except TypeError:
-                    ...
-
-                try:
-                    if len(hisname):
-                        print(
-                            f"<NAME:{len(hisname)}>{hisname.title()}",
-                            end="\r\n",
-                            file=file_descriptor,
-                        )
-                except TypeError:
-                    ...
-
-                try:
-                    print(
-                        f"<MODE:{len(themode)}>{themode}",
-                        end="\r\n",
-                        file=file_descriptor,
-                    )
-                except TypeError:
-                    ...
-
-                try:
-                    print(
-                        f"<FREQ:{len(frequency)}>{frequency}",
-                        end="\r\n",
-                        file=file_descriptor,
-                    )
-                except TypeError:
-                    ...
-
-                try:
-                    print(
-                        f"<RST_SENT:{len(sentrst)}>{sentrst}",
-                        end="\r\n",
-                        file=file_descriptor,
-                    )
-                except TypeError:
-                    ...
-
-                try:
-                    print(
-                        f"<RST_RCVD:{len(rcvrst)}>{rcvrst}",
-                        end="\r\n",
-                        file=file_descriptor,
-                    )
-                except TypeError:
-                    ...
-
-                try:
-                    if sentnr != "0":
-                        print(
-                            f"<STX_STRING:{len(sentnr)}>{sentnr}",
-                            end="\r\n",
-                            file=file_descriptor,
-                        )
-                except TypeError:
-                    ...
-
-                try:
-                    if rcvnr != "0":
-                        print(
-                            f"<SRX_STRING:{len(rcvnr)}>{rcvnr}",
-                            end="\r\n",
-                            file=file_descriptor,
-                        )
-                except TypeError:
-                    ...
-
-                try:
-                    if len(grid) > 1:
-                        print(
-                            f"<GRIDSQUARE:{len(grid)}>{grid}",
-                            end="\r\n",
-                            file=file_descriptor,
-                        )
-                except TypeError:
-                    ...
-
-                try:
-                    if len(comment):
-                        print(
-                            f"<COMMENT:{len(comment)}>{comment}",
-                            end="\r\n",
-                            file=file_descriptor,
-                        )
-                except TypeError:
-                    ...
-
-                print("<EOR>", end="\r\n", file=file_descriptor)
-                print("", end="\r\n", file=file_descriptor)
-    except IOError:
-        ...
-
-
-def cabrillo(self):
-    """Generates Cabrillo file. Maybe."""
+            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 recalculate_mults(self):
     """Recalculates multipliers after change in logged qso."""
 
 
-# States/Prov.	DXCC	state	country
+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
+                    if button == self.esm_dict["HISCALL"]:
+                        self.process_function_key(button, rttysendrx=False)
+                        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('Name', '')}, {result.get('State', '')}, {result.get('UserText','...')}"
+        )
+    else:
+        self.history_info.setText("")
+
+
+def check_call_history(self):
+    """"""
+    result = self.database.fetch_call_history(self.callsign.text())
+    if result:
+        self.history_info.setText(f"{result.get('UserText','')}")
+        if self.other_2.text() == "":
+            self.other_2.setText(f"{result.get('State', '')}")
 
 
 def get_mults(self):
     """"""
-
     mults = {}
-    mults["state"], mults["country"] = show_mults(self, rtc=True)
+    mults["country"], mults["state"] = show_mults(self, rtc=True)
     return mults
 
 

not1mm/plugins/general_logging.py

@@ -183,14 +183,18 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                 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() == "" and self.other_1.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")
+
         elif self.current_widget in ["other_1", "other_2"]:
-            if self.other_2.text() == "" and self.other_1.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")
+            buttons_to_send.append("LOGIT")
+
 
         if with_enter is True and bool(len(buttons_to_send)):
             for button in buttons_to_send:
@@ -205,14 +209,19 @@ def process_esm(self, new_focused_widget=None, with_enter=False):
                 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() == "" and self.other_1.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")
+
         elif self.current_widget in ["other_1", "other_2"]:
-            if self.other_2.text() == "" and self.other_1.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")
+            buttons_to_send.append("LOGIT")
+
+
         if with_enter is True and bool(len(buttons_to_send)):
             for button in buttons_to_send:
                 if button:

{not1mm-24.12.15.dist-info → not1mm-25.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.12.15
+Version: 25.1.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -214,6 +214,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 - ARRL 160M
 - ARRL DX CW, SSB
 - ARRL Field Day
+- ARRL RTTY Roundup
 - ARRL Sweepstakes CW, SSB
 - ARRL VHF January, June, September
 - CQ 160 CW, SSB
@@ -239,21 +240,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
-- [24-12-15] Fixed Button focus policy in the bandmap window.
-- [24-12-14] Changed method of detecting fldigi QSOs. See docs.
-- [24-12-12] Add a try exception for a unicode decode error.
-- [24-12-11-1] Add RTC to RAC Canada Day, ARRL VHF, ARRL Field Day, ARRL SS, ARRL DX, 10 10
-- [24-12-11] Add RTC to IARU HF, IARU Field Day, DARC XMAS, CQ WW, CQ WPX
-- [24-12-9] Add RTC to Winter Field Day, Stew Perry, REF, RAEM, NAQP, LZ-DX, JIDX
-- [24-12-8-2] Add RTC to ARRL 10M, Tweaked cabrillo file output.
-- [24-12-8-1] Changed cabrillo names for Weekly RTTY, CW Ops CWT and K1USN SST.
-- [24-12-8] Fix: Weekly RTTY mults. Add RTC to Weekly RTTY.
-- [24-12-6] Add RTC to K1USN.
--[24-12-5-1] ARRL 160 gets rtc.
-- [24-12-5] Add 'real time' score posting to external sites.
-- [24-12-4] Merged PR from @alduhoo Add STATION_CALLSIGN field to ADIF output
-- [24-12-3-1] Adding ARRL 160
-- [24-12-3] Add button to bandmap to delete marked spots.
+- [25-1-1] Added ARRL RTTY RU.
 
 See [CHANGELOG.md](CHANGELOG.md) for prior changes.
 
@@ -688,6 +675,7 @@ You can include a limited set of substitution instructions.
 | {SNT} | Sends 5nn (cw) or 599 (ssb) |
 | {SENTNR} | Sends whats in the SentNR field. |
 | {EXCH} | Sends what's in the Sent Exchange field when contest is defined. |
+| {LOGIT} | Log the contact after macro pressed. |
 | '#' | Sends serial number. |
 
 ### Macro use with voice

{not1mm-24.12.15.dist-info → not1mm-25.1.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=bThSgJVaz1ae0Y-ayJpuYn8NvAPiBXOTvy-PctnLkg4,144712
+not1mm/__main__.py,sha256=mMKDAkCWN5gF4SM7-wod-njba7RDw2Zfr-pNI5q7FxY,144819
 not1mm/bandmap.py,sha256=zD3aUf36NVQCy0plAcZLNxYhSEM9xZ8J1Cu9vrcFPYA,31136
 not1mm/checkwindow.py,sha256=VFAcKYTcoWhmIf91chwY6tyao9FQMWPiUkgDDkkWaog,9670
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
@@ -32,7 +32,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=pI-70TYESe85ENkRH8l1DXnKDOkwYqKXUdMk6KYaN50,63193
-not1mm/data/new_contest.ui,sha256=KXLQixsrKPnS7siN12CznMxtJtwVInf8Aqdw7o4Q2kA,23844
+not1mm/data/new_contest.ui,sha256=Sc8HquH7BK0bmkypeK_HbfhArE6yaw02WONOUlRdmuA,23953
 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
@@ -114,7 +114,7 @@ not1mm/lib/plugin_common.py,sha256=-cvXtEAUgZ7GtxaNiwVdHbZ-7wEBeoMPRZXNdCxnPyA,1
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=j5lIMLHJ-eqIaVr_QhI82gkbOl17_C-5suRkWbHYET8,14717
 not1mm/lib/super_check_partial.py,sha256=hwT2NRwobu0PLDyw6ltmbmcAtGBD02CKGFbgGWjXMqA,2334
-not1mm/lib/version.py,sha256=GQKfhZJyPwIF-xUN3Mc7XRFq9rN7sj_BtI6tcmK9CP8,49
+not1mm/lib/version.py,sha256=CqwwZgPnGFUAeenWk7Ey1p5bFWF45s1jdEZbwTt9guc,47
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=5QUyGMvGBC-HxcY_z9QbfuxSg3f7p6C9K4qhTxgZE7k,14719
 not1mm/plugins/10_10_spring_cw.py,sha256=XjYFM263WYyG6nVQzPObW4YC7Z9L93rixSOcVsxPvH4,14722
@@ -126,7 +126,7 @@ not1mm/plugins/arrl_160m.py,sha256=9SHfxjTX_LECOYDsICnoX_Q133atojsJbmFapehleYE,2
 not1mm/plugins/arrl_dx_cw.py,sha256=4UMN1HWPNbkz2T6K33GJ0wUkE7yq46C57C6BUwbu5cs,18014
 not1mm/plugins/arrl_dx_ssb.py,sha256=X2C0hPY45_CvA2_97O0NAw3HF4QGgs5o0WVTlwMMme8,18017
 not1mm/plugins/arrl_field_day.py,sha256=X7BLs87ikQEm1xuh2sSj-8KcFA9pqnut6uFGM2xJe7c,16743
-not1mm/plugins/arrl_rtty_ru.py,sha256=Cov4_0AQEWSmj8hjiuW_lgpqRZHuxqufbXBbKjPYLH4,7667
+not1mm/plugins/arrl_rtty_ru.py,sha256=ag1Man_y1A5gyWcU98TcXbOL33nVdPpRXrzotI7Snkc,17061
 not1mm/plugins/arrl_ss_cw.py,sha256=uv71xstpmBiDTyU5zF8pe6UIS-5v6hi0aMBksbPvCzc,17458
 not1mm/plugins/arrl_ss_phone.py,sha256=V3dgBXoLb3mWMbb1s-ovx-SoUBL5IxE8omkQbP7siwk,16794
 not1mm/plugins/arrl_vhf_jan.py,sha256=SDk0gGg00XPuCpl6DsyozAnEoOBgiS1wMUhDPPB5RsM,20267
@@ -143,7 +143,7 @@ not1mm/plugins/cq_ww_rtty.py,sha256=RJywVSNujM4CxxTRCGKXhjmbz6OMzGR5eHSAmQcT6Pc,
 not1mm/plugins/cq_ww_ssb.py,sha256=uRMXaTfkIt7QJxQBaBAvc2fmT6ak26SzBBezd5k_hMc,17991
 not1mm/plugins/cwt.py,sha256=7BoKVrIywlHpP4f4_mrUyWKVsK6vujreb8jDWyXrwUc,17530
 not1mm/plugins/darc_xmas.py,sha256=p9JbOJlEoOsB86E5ciHdrY7L-10tnNEWuTxq9EfCNBM,18907
-not1mm/plugins/general_logging.py,sha256=NV_FCgpAEEQrVRxMDD7nQ2krJgPrhtopizxrGndtUNk,6686
+not1mm/plugins/general_logging.py,sha256=gpZhoBr9fKpcTrefufmtvMHVrzlSqUsch64O8-oKhls,6915
 not1mm/plugins/helvetia.py,sha256=CnAq0mXZC2tO_pEwIoDN6MHAv95NPcLRvG1gnjfAcF8,20032
 not1mm/plugins/iaru_fieldday_r1_cw.py,sha256=lueTnK50yRSMqASlktrhuFOJkSBDsQw4OyT9eYwpugU,17155
 not1mm/plugins/iaru_fieldday_r1_ssb.py,sha256=1lYxeo4j_piiFZ_db-vHIHT5c1jSeFPBuw6yf1kur6Y,17159
@@ -163,9 +163,9 @@ not1mm/plugins/ref_ssb.py,sha256=vfS9-mcnbw2znRvU4jh20JqI9BXap8jV65OV5mbCkCk,209
 not1mm/plugins/stew_perry_topband.py,sha256=D1hekmMbx-i4BhaP2uzOK3OzaVVMMdgcN3RmfweNqHo,15341
 not1mm/plugins/weekly_rtty.py,sha256=huZszbZsIh4vF3cP80UyPzy3qxIoHdEiT1b6KuvwgYc,20083
 not1mm/plugins/winter_field_day.py,sha256=cSCFwy1LOoDDA9Zs1LHRG3r8spDMSKDisxyPxnVrLjw,15149
-not1mm-24.12.15.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.12.15.dist-info/METADATA,sha256=wRtlNAAWAgR8Duv2TpPL49stSxf0cCfv6f_x1o3VBK0,36502
-not1mm-24.12.15.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-not1mm-24.12.15.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.12.15.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.12.15.dist-info/RECORD,,
+not1mm-25.1.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-25.1.1.dist-info/METADATA,sha256=qmgKembLLFua5erWr8T0EjHT0Ah_ZYtiZ3tnnVhVbBk,35673
+not1mm-25.1.1.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+not1mm-25.1.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-25.1.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-25.1.1.dist-info/RECORD,,