not1mm 24.11.19__tar.gz → 24.11.23__tar.gz

{not1mm-24.11.19 → not1mm-24.11.23}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.11.19
+Version: 24.11.23
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -205,7 +205,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## List of should be working contests, those in bold have ESM
 
-- General Logging (There are better general loggers like QLog, KLog, CQRLog)
+- **General Logging** (There are better general loggers like QLog, KLog, CQRLog)
 - 10 10 Fall CW
 - 10 10 Spring CW
 - 10 10 Summer Phone
@@ -238,6 +238,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-11-23] Made macros per contest.
+- [24-11-21] Merged PR from alduhoo setting CW Speed via rigctld, Added ESM and call history support for General Logging.
 - [24-11-19] Added ESM to Stew Perry, Phone Weekly, Medium Speed Test and JIDX.
 - [24-11-18] Accepted PR from dg9vh for the DARC XMAS Contest.
 - [24-11-17] Accepted PR from dg9vh for the LZ DX contest.
@@ -953,7 +955,6 @@ So if one were to go to `FILE -> LOAD CALL HISTORY FILE` and choose a downloaded
 
 Where the Name and State would auto-populate and the UserText info apprears in the bottom left.
 
-
 ## Contest specific notes
 
 I found it might be beneficial to have a section devoted to wierd quirky things

{not1mm-24.11.19 → not1mm-24.11.23}/README.md

@@ -174,7 +174,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## List of should be working contests, those in bold have ESM
 
-- General Logging (There are better general loggers like QLog, KLog, CQRLog)
+- **General Logging** (There are better general loggers like QLog, KLog, CQRLog)
 - 10 10 Fall CW
 - 10 10 Spring CW
 - 10 10 Summer Phone
@@ -207,6 +207,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-11-23] Made macros per contest.
+- [24-11-21] Merged PR from alduhoo setting CW Speed via rigctld, Added ESM and call history support for General Logging.
 - [24-11-19] Added ESM to Stew Perry, Phone Weekly, Medium Speed Test and JIDX.
 - [24-11-18] Accepted PR from dg9vh for the DARC XMAS Contest.
 - [24-11-17] Accepted PR from dg9vh for the LZ DX contest.
@@ -922,7 +924,6 @@ So if one were to go to `FILE -> LOAD CALL HISTORY FILE` and choose a downloaded
 
 Where the Name and State would auto-populate and the UserText info apprears in the bottom left.
 
-
 ## Contest specific notes
 
 I found it might be beneficial to have a section devoted to wierd quirky things

{not1mm-24.11.19 → not1mm-24.11.23}/not1mm/__main__.py

@@ -256,7 +256,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.actionNew_Database.triggered.connect(self.new_database)
         self.actionOpen_Database.triggered.connect(self.open_database)
 
-        self.actionEdit_Macros.triggered.connect(self.edit_cw_macros)
+        self.actionEdit_Macros.triggered.connect(self.edit_macros)
 
         self.actionAbout.triggered.connect(self.show_about_dialog)
         self.actionHotKeys.triggered.connect(self.show_key_help)
@@ -659,7 +659,7 @@ class MainWindow(QtWidgets.QMainWindow):
         self.show_splash_msg("Loading contest.")
         self.load_contest()
         self.show_splash_msg("Reading macros.")
-        self.read_cw_macros()
+        self.read_macros()
 
         self.show_splash_msg("Starting FlDigi watcher.")
         self.fldigi_watcher = FlDigiWatcher()
@@ -1627,6 +1627,7 @@ class MainWindow(QtWidgets.QMainWindow):
                     cmd["COLUMNS"] = self.contest.columns
                     if self.log_window:
                         self.log_window.msg_from_main(cmd)
+            self.read_macros()
 
     def check_for_new_cty(self) -> None:
         """
@@ -1971,6 +1972,8 @@ class MainWindow(QtWidgets.QMainWindow):
             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_speed(self.cw_speed.value())
+                elif self.rig_control.interface == "rigctld":
+                    self.rig_control.cat.set_rigctl_cw_speed(self.cw_speed.value())
 
     def stop_cw(self):
         """"""
@@ -2802,7 +2805,7 @@ class MainWindow(QtWidgets.QMainWindow):
         """
         self.pref["run_state"] = self.radioButton_run.isChecked()
         self.write_preference()
-        self.read_cw_macros()
+        self.read_macros()
         self.check_esm()
 
     def write_preference(self) -> None:
@@ -3349,7 +3352,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.set_band_indicator(band)
             self.set_window_title()
             self.clearinputs()
-            self.read_cw_macros()
+            self.read_macros()
             return
         if mode in (
             "DIGI-U",
@@ -3370,7 +3373,7 @@ class MainWindow(QtWidgets.QMainWindow):
             self.set_band_indicator(band)
             self.set_window_title()
             self.clearinputs()
-            self.read_cw_macros()
+            self.read_macros()
             return
         if mode == "SSB":
             if intended_freq:
@@ -3391,7 +3394,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.set_band_indicator(band)
             self.set_window_title()
             self.clearinputs()
-            self.read_cw_macros()
+            self.read_macros()
 
     def check_callsign(self, callsign) -> None:
         """
@@ -3478,7 +3481,7 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.current_mode = "CW"
                 self.sent.setText("599")
                 self.receive.setText("599")
-                self.read_cw_macros()
+                self.read_macros()
                 if self.contest:
                     if self.contest.name == "ICWC Medium Speed Test":
                         self.contest.prefill(self)
@@ -3488,14 +3491,14 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.current_mode = "SSB"
                 self.sent.setText("59")
                 self.receive.setText("59")
-                self.read_cw_macros()
+                self.read_macros()
             return
         if mode in ("RTTY", "DIGI-U", "DIGI-L"):
             if self.current_mode != "RTTY":
                 self.current_mode = "RTTY"
                 self.sent.setText("599")
                 self.receive.setText("599")
-                self.read_cw_macros()
+                self.read_macros()
 
     def get_opon(self) -> None:
         """
@@ -3662,18 +3665,13 @@ class MainWindow(QtWidgets.QMainWindow):
             except TypeError as err:
                 logger.debug(f"{err=} {vfo=} {the_dict=}")
 
-    def edit_cw_macros(self) -> None:
-        """
-        Calls the default text editor to edit the CW macro file.
-
-        Parameters
-        ----------
-        None
-
-        Returns
-        -------
-        None
-        """
+    def get_macro_filename(self):
+        """"""
+        # Have not1mm check in USER_DATA_PATH for the existence of a folder with the contests name.
+        # If it exists, check to see if a cw/ssb/rtty macro files exists within it and load them before
+        # falling back to the default ones.
+        # If user selects menu option to edit the current macro file, make the previous checks, if the
+        # specific one does not exist, copy the default to the contest directory and edit that copy.
         if self.radio_state.get("mode") in ("CW", "CW-L", "CW-R", "CWR"):
             macro_file = "cwmacros.txt"
         elif self.radio_state.get("mode") in (
@@ -3693,8 +3691,14 @@ class MainWindow(QtWidgets.QMainWindow):
             macro_file = "rttymacros.txt"
         else:
             macro_file = "ssbmacros.txt"
+
+        try:
+            if not (fsutils.USER_DATA_PATH / self.contest.name).exists():
+                os.mkdir(fsutils.USER_DATA_PATH / self.contest.name)
+        except AttributeError:
+            return ""
+
         if not (fsutils.USER_DATA_PATH / macro_file).exists():
-            logger.debug("copying default macro file.")
             try:
                 copyfile(
                     fsutils.APP_DATA_PATH / macro_file,
@@ -3702,57 +3706,50 @@ class MainWindow(QtWidgets.QMainWindow):
                 )
             except IOError as err:
                 logger.critical(f"Error {err} copying macro file.")
+
+        if not (fsutils.USER_DATA_PATH / self.contest.name / macro_file).exists():
+            try:
+                copyfile(
+                    fsutils.APP_DATA_PATH / macro_file,
+                    fsutils.USER_DATA_PATH / self.contest.name / macro_file,
+                )
+            except IOError as err:
+                logger.critical(f"Error {err} copying macro file.")
+
+        return fsutils.USER_DATA_PATH / self.contest.name / macro_file
+
+    def edit_macros(self) -> None:
+        """
+        Calls the default text editor to edit the CW macro file.
+
+        Parameters
+        ----------
+        None
+
+        Returns
+        -------
+        None
+        """
+
+        macro_file = self.get_macro_filename()
+
         try:
-            fsutils.openFileWithOS(fsutils.USER_DATA_PATH / macro_file)
+            fsutils.openFileWithOS(macro_file)
         except FileNotFoundError | PermissionError | OSError as err:
-            logger.critical(
-                f"Could not open file {fsutils.USER_DATA_PATH / macro_file} {err}"
-            )
-        self.read_cw_macros()
+            logger.critical(f"Could not open file {macro_file} {err}")
+        self.read_macros()
 
-    def read_cw_macros(self) -> None:
+    def read_macros(self) -> None:
         """
         Reads in the CW macros, firsts it checks to see if the file exists. If it does not,
         and this has been packaged with pyinstaller it will copy the default file from the
         temp directory this is running from... In theory.
         """
 
-        if self.radio_state.get("mode") in (
-            "CW",
-            "CW-L",
-            "CW-R",
-        ):
-            macro_file = "cwmacros.txt"
-        elif self.radio_state.get("mode") in (
-            "RTTY",
-            "RTTY-R",
-            "LSB-D",
-            "USB-D",
-            "AM-D",
-            "FM-D",
-            "DIGI-U",
-            "DIGI-L",
-            "RTTYR",
-            "PKTLSB",
-            "PKTUSB",
-        ):
-            macro_file = "rttymacros.txt"
-        else:
-            macro_file = "ssbmacros.txt"
+        macro_file = self.get_macro_filename()
 
-        if not (fsutils.USER_DATA_PATH / macro_file).exists():
-            logger.debug("copying default macro file.")
-            try:
-                copyfile(
-                    fsutils.APP_DATA_PATH / macro_file,
-                    fsutils.USER_DATA_PATH / macro_file,
-                )
-            except IOError as err:
-                logger.critical(f"Error {err} copying macro file.")
         try:
-            with open(
-                fsutils.USER_DATA_PATH / macro_file, "r", encoding="utf-8"
-            ) as file_descriptor:
+            with open(macro_file, "r", encoding="utf-8") as file_descriptor:
                 for line in file_descriptor:
                     mode, fkey, buttonname, cwtext = line.split("|")
                     if mode.strip().upper() == "R" and self.pref.get("run_state"):

{not1mm-24.11.19 → not1mm-24.11.23}/not1mm/data/donors.html

@@ -3,6 +3,7 @@
     <center>Donors</center>
 </h2>
 <hr />
+<center>Adrian VA3NB</center>
 <center>Brian KB3ORR</center>
 <center>Connor KD9LSV</center>
 

{not1mm-24.11.19 → not1mm-24.11.23}/not1mm/lib/cat_interface.py

@@ -9,7 +9,7 @@ rig.cwio_send             n:i  cwio transmit 1/0 (on/off)
 command lines to test the CW API via XMLRPC
 
 Setting WPM
-curl -d "<?xml version='1.0'?><methodCall><methodName>rig.cwio_set_wpm</methodName><params><param><value><i4>28</i4></value></param></params></methodCall>" http://localhost:12345 
+curl -d "<?xml version='1.0'?><methodCall><methodName>rig.cwio_set_wpm</methodName><params><param><value><i4>28</i4></value></param></params></methodCall>" http://localhost:12345
 
 Setting the text to send
 curl -d "<?xml version='1.0'?><methodCall><methodName>rig.cwio_text</methodName><params><param><value><string>test test test</string></value></param></params></methodCall>" http://localhost:12345
@@ -178,6 +178,21 @@ class CAT:
         self.__initialize_rigctrld()
         return False
 
+    def set_rigctl_cw_speed(self, speed):
+        """Set CW speed via rigctld"""
+        if self.rigctrlsocket:
+            try:
+                self.online = True
+                self.rigctrlsocket.send(bytes(f"L KEYSPD {speed}\n", "utf-8"))
+                _ = self.__get_serial_string()
+                return
+            except socket.error as exception:
+                self.online = False
+                logger.debug("set_level_rigctld: %s", f"{exception}")
+                self.rigctrlsocket = None
+                return
+        self.__initialize_rigctrld()
+
     def sendcwxmlrpc(self, texttosend):
         """Add text to flrig's cw send buffer."""
         logger.debug(f"{texttosend=}")

not1mm-24.11.23/not1mm/lib/version.py

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

not1mm-24.11.23/not1mm/plugins/general_logging.py

@@ -0,0 +1,241 @@
+"""General Logging plugin"""
+
+# pylint: disable=invalid-name, unused-argument, unused-variable, c-extension-no-member, unused-import
+
+import logging
+
+from PyQt6 import QtWidgets
+
+from not1mm.lib.plugin_common import gen_adif, get_points
+from not1mm.lib.version import __version__
+
+logger = logging.getLogger(__name__)
+EXCHANGE_HINT = ""
+name = "General Logging"
+cabrillo_name = "General-Logging"
+mode = "BOTH"  # CW SSB BOTH RTTY
+columns = [0, 1, 2, 3, 4, 16, 17]
+columns = [
+    "YYYY-MM-DD HH:MM:SS",
+    "Call",
+    "Freq",
+    "Mode",
+    "Snt",
+    "Rcv",
+    "Name",
+    "Comment",
+]
+
+# 1 once per contest, 2 work each band, 3 each band/mode, 4 no dupe checking
+dupe_type = 4
+
+
+def init_contest(self):
+    """setup plugin"""
+    set_tab_next(self)
+    set_tab_prev(self)
+    interface(self)
+    self.next_field = self.other_1
+
+
+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")
+    self.other_label.setText("Name")
+    self.field3.setAccessibleName("Name")
+    self.exch_label.setText("Comment")
+    self.field4.setAccessibleName("Comment")
+
+
+def reset_label(self):
+    """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_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.sent,
+        self.other_1: self.receive,
+        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["Name"] = self.other_1.text()
+    self.contact["Comment"] = self.other_2.text()
+
+
+def predupe(self):
+    """called after callsign entered"""
+
+
+def prefill(self):
+    """Fill SentNR"""
+
+
+def points(self):
+    """Calc point"""
+
+
+def show_mults(self):
+    """Return display string for mults"""
+
+
+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()
+
+
+def adif(self):
+    """Call the generate ADIF function"""
+    gen_adif(self, cabrillo_name)
+
+
+def cabrillo(self, file_encoding):
+    """Generates Cabrillo file. Maybe."""
+
+
+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.F1,
+        self.F2,
+        self.F3,
+        self.F4,
+        self.F5,
+        self.F6,
+        self.F7,
+        self.F8,
+        self.F9,
+        self.F10,
+        self.F11,
+        self.F12,
+    ]:
+        self.restore_button_color(a_button)
+
+    buttons_to_send = []
+
+    if self.pref.get("run_state"):
+        if self.current_widget == "callsign":
+            if len(self.callsign.text()) < 3:
+                self.make_button_green(self.esm_dict["CQ"])
+                buttons_to_send.append(self.esm_dict["CQ"])
+            elif len(self.callsign.text()) > 2:
+                self.make_button_green(self.esm_dict["HISCALL"])
+                self.make_button_green(self.esm_dict["EXCH"])
+                buttons_to_send.append(self.esm_dict["HISCALL"])
+                buttons_to_send.append(self.esm_dict["EXCH"])
+
+        elif self.current_widget in ["other_1", "other_2"]:
+            if self.other_2.text() == "" 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")
+
+        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_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")
+        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('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_1.text() == "":
+            self.other_1.setText(f"{result.get('Name', '')}")

{not1mm-24.11.19 → not1mm-24.11.23}/not1mm.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.11.19
+Version: 24.11.23
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -205,7 +205,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## List of should be working contests, those in bold have ESM
 
-- General Logging (There are better general loggers like QLog, KLog, CQRLog)
+- **General Logging** (There are better general loggers like QLog, KLog, CQRLog)
 - 10 10 Fall CW
 - 10 10 Spring CW
 - 10 10 Summer Phone
@@ -238,6 +238,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes (Polishing the Turd)
 
+- [24-11-23] Made macros per contest.
+- [24-11-21] Merged PR from alduhoo setting CW Speed via rigctld, Added ESM and call history support for General Logging.
 - [24-11-19] Added ESM to Stew Perry, Phone Weekly, Medium Speed Test and JIDX.
 - [24-11-18] Accepted PR from dg9vh for the DARC XMAS Contest.
 - [24-11-17] Accepted PR from dg9vh for the LZ DX contest.
@@ -953,7 +955,6 @@ So if one were to go to `FILE -> LOAD CALL HISTORY FILE` and choose a downloaded
 
 Where the Name and State would auto-populate and the UserText info apprears in the bottom left.
 
-
 ## Contest specific notes
 
 I found it might be beneficial to have a section devoted to wierd quirky things

{not1mm-24.11.19 → not1mm-24.11.23}/pyproject.toml

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

not1mm-24.11.19/not1mm/lib/version.py

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