not1mm 24.9.15__py3-none-any.whl → 24.9.23__py3-none-any.whl

not1mm/data/new_contest.ui

@@ -287,6 +287,11 @@
        <string>CQ WW CW</string>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>CQ WW RTTY</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>CQ WW SSB</string>
@@ -376,24 +381,24 @@
      </property>
      <property name="dateTime">
       <datetime>
-       <hour>8</hour>
+       <hour>0</hour>
        <minute>0</minute>
        <second>0</second>
        <year>2024</year>
        <month>1</month>
-       <day>1</day>
+       <day>2</day>
       </datetime>
      </property>
      <property name="date">
       <date>
        <year>2024</year>
        <month>1</month>
-       <day>1</day>
+       <day>2</day>
       </date>
      </property>
      <property name="time">
       <time>
-       <hour>8</hour>
+       <hour>0</hour>
        <minute>0</minute>
        <second>0</second>
       </time>

not1mm/data/rttymacros.txt

@@ -0,0 +1,24 @@
+S|F1|MyCall|{MYCALL}
+S|F2|Exch|{SNT} {EXCH}
+S|F3|My NR|{SENTNR}
+S|F4|empty| 
+S|F5|AGN|agn
+S|F6|?|?
+S|F7|Roger|rr
+S|F8|73|73
+S|F9|..|ee
+S|F10|Call?|cl?
+S|F11|NR??|NR?
+S|F12|TU|tu
+R|F1|Run CQ|cq test {MYCALL} {MYCALL} test
+R|F2|HisCall|{HISCALL}
+R|F3|Run Exch|{HISCALL} {SNT} {EXCH}
+R|F4|Run TU|tu {MYCALL} qrz
+R|F5|MyCall|{MYCALL}
+R|F6|MyNR|{SENTNR}
+R|F7|?|?
+R|F8|Roger|rr
+R|F9|AGN|agn
+R|F10|Call?|cl?
+R|F11|NR?|NR?
+R|F12|Ack Call?|{HISCALL} rr tu

not1mm/lib/cat_interface.py

@@ -90,7 +90,7 @@ class CAT:
     def __initialize_rigctrld(self):
         try:
             self.rigctrlsocket = socket.socket()
-            self.rigctrlsocket.settimeout(0.5)
+            self.rigctrlsocket.settimeout(0.1)
             self.rigctrlsocket.connect((self.host, self.port))
             logger.debug("Connected to rigctrld")
             self.online = True
@@ -104,6 +104,18 @@ class CAT:
         if self.interface == "rigctld":
             self.__initialize_rigctrld()
 
+    def __get_serial_string(self):
+        """Gets any serial data waiting"""
+        dump = ""
+        thegrab = ""
+        try:
+            while True:
+                thegrab += self.rigctrlsocket.recv(1024).decode()
+                dump += thegrab
+        except socket.error:
+            ...
+        return dump
+
     def sendcw(self, texttosend):
         """..."""
         logger.debug(f"{texttosend=} {self.interface=}")
@@ -119,7 +131,7 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(bytes(f"b{texttosend}\n", "utf-8"))
-                _ = self.rigctrlsocket.recv(1024).decode().strip()
+                _ = self.__get_serial_string()
                 return True
             except socket.error as exception:
                 self.online = False
@@ -216,7 +228,7 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(b"f\n")
-                return self.rigctrlsocket.recv(1024).decode().strip()
+                return self.__get_serial_string().strip()
             except socket.error as exception:
                 self.online = False
                 logger.debug("getvfo_rigctld: %s", f"{exception}")
@@ -237,6 +249,8 @@ class CAT:
 
     def __getmode_flrig(self) -> str:
         """Returns mode via flrig"""
+        # QMX ['CW-U', 'CW-L', 'DIGI-U', 'DIGI-L']
+        # 7300 ['LSB', 'USB', 'AM', 'FM', 'CW', 'CW-R', 'RTTY', 'RTTY-R', 'LSB-D', 'USB-D', 'AM-D', 'FM-D']
         try:
             self.online = True
             return self.server.rig.get_mode()
@@ -253,11 +267,13 @@ class CAT:
 
     def __getmode_rigctld(self) -> str:
         """Returns mode vai rigctld"""
+        # QMX 'AM CW USB LSB RTTY FM CWR RTTYR'
+        # 7300 'AM CW USB LSB RTTY FM CWR RTTYR PKTLSB PKTUSB FM-D AM-D'
         if self.rigctrlsocket:
             try:
                 self.online = True
                 self.rigctrlsocket.send(b"m\n")
-                mode = self.rigctrlsocket.recv(1024).decode()
+                mode = self.__get_serial_string()
                 mode = mode.strip().split()[0]
                 # logger.debug("%s", mode)
                 return mode
@@ -302,7 +318,7 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(b"m\n")
-                mode = self.rigctrlsocket.recv(1024).decode()
+                mode = self.__get_serial_string()
                 mode = mode.strip().split()[1]
                 # logger.debug("%s", mode)
                 return mode
@@ -344,7 +360,7 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(b"l RFPOWER\n")
-                return int(float(self.rigctrlsocket.recv(1024).decode().strip()) * 100)
+                return int(float(self.__get_serial_string().strip()) * 100)
             except socket.error as exception:
                 self.online = False
                 logger.debug("getpower_rigctld: %s", f"{exception}")
@@ -381,7 +397,7 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(b"t\n")
-                ptt = self.rigctrlsocket.recv(1024).decode()
+                ptt = self.__get_serial_string()
                 logger.debug("%s", ptt)
                 ptt = ptt.strip()
                 return ptt
@@ -391,6 +407,49 @@ class CAT:
                 self.rigctrlsocket = None
         return "0"
 
+    def get_mode_list(self):
+        "Get a list of modes supported by the radio"
+        if self.interface == "flrig":
+            return self.__get_mode_list_flrig()
+        if self.interface == "rigctld":
+            return self.__get_mode_list_rigctld()
+        return False
+
+    def __get_mode_list_flrig(self):
+        """Returns list of modes supported by the radio"""
+        try:
+            self.online = True
+            return self.server.rig.get_modes()
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
+        ) as exception:
+            self.online = False
+            logger.debug("%s", f"{exception}")
+        return ""
+
+    def __get_mode_list_rigctld(self):
+        """Returns list of modes supported by the radio"""
+        # Mode list: AM CW USB LSB RTTY FM CWR RTTYR
+        if self.rigctrlsocket:
+            try:
+                self.online = True
+                self.rigctrlsocket.send(b"1\n")
+                dump = self.__get_serial_string()
+                for line in dump.splitlines():
+                    if "Mode list:" in line:
+                        modes = line.split(":")[1].strip()
+                        return modes
+                return ""
+            except socket.error as exception:
+                self.online = False
+                logger.debug("%s", f"{exception}")
+                self.rigctrlsocket = None
+        return ""
+
     def set_vfo(self, freq: str) -> bool:
         """Sets the radios vfo"""
         try:
@@ -424,7 +483,7 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(bytes(f"F {freq}\n", "utf-8"))
-                _ = self.rigctrlsocket.recv(1024).decode().strip()
+                _ = self.__get_serial_string()
                 return True
             except socket.error as exception:
                 self.online = False
@@ -464,7 +523,7 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(bytes(f"M {mode} 0\n", "utf-8"))
-                _ = self.rigctrlsocket.recv(1024).decode().strip()
+                _ = self.__get_serial_string()
                 return True
             except socket.error as exception:
                 self.online = False
@@ -503,7 +562,7 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(rig_cmd)
-                _ = self.rigctrlsocket.recv(1024).decode().strip()
+                _ = self.__get_serial_string()
             except socket.error:
                 self.online = False
                 self.rigctrlsocket = None
@@ -532,7 +591,7 @@ class CAT:
         try:
             self.online = True
             self.rigctrlsocket.send(rig_cmd)
-            _ = self.rigctrlsocket.recv(1024).decode().strip()
+            _ = self.__get_serial_string()
         except socket.error:
             self.online = False
             self.rigctrlsocket = None
@@ -568,7 +627,7 @@ class CAT:
         try:
             self.online = True
             self.rigctrlsocket.send(rig_cmd)
-            _ = self.rigctrlsocket.recv(1024).decode().strip()
+            _ = self.__get_serial_string()
         except socket.error:
             self.online = False
             self.rigctrlsocket = None

not1mm/lib/cwinterface.py

@@ -50,35 +50,43 @@ class CW:
     def sendcw(self, texttosend):
         """sends cw to k1el"""
         logger.debug(f"{texttosend=} {self.servertype=}")
-        if self.servertype == 2:
-            self._sendcw_xmlrpc(texttosend)
-        if self.servertype == 1:
-            self._sendcw_udp(texttosend)
-        if self.servertype == 3 and self.cw is not None:
-            self._sendcwcat(texttosend)
+        if texttosend:
+            if self.servertype == 2:
+                self._sendcw_xmlrpc(texttosend)
+            if self.servertype == 1:
+                self._sendcw_udp(texttosend)
+            if self.servertype == 3 and self.cw is not None:
+                self._sendcwcat(texttosend)
 
     def _sendcw_xmlrpc(self, texttosend):
         """sends cw to xmlrpc"""
         logger.debug("xmlrpc: %s", texttosend)
-        with ServerProxy(f"http://{self.host}:{self.port}") as proxy:
-            try:
-                proxy.k1elsendstring(texttosend)
-            except Error as exception:
-                logger.debug(
-                    "http://%s:%s, xmlrpc error: %s", self.host, self.port, exception
-                )
-            except ConnectionRefusedError:
-                logger.debug(
-                    "http://%s:%s, xmlrpc Connection Refused", self.host, self.port
-                )
+        if texttosend:
+            with ServerProxy(f"http://{self.host}:{self.port}") as proxy:
+                try:
+                    proxy.k1elsendstring(texttosend)
+                except Error as exception:
+                    logger.debug(
+                        "http://%s:%s, xmlrpc error: %s",
+                        self.host,
+                        self.port,
+                        exception,
+                    )
+                except ConnectionRefusedError:
+                    logger.debug(
+                        "http://%s:%s, xmlrpc Connection Refused", self.host, self.port
+                    )
 
     def _sendcw_udp(self, texttosend):
         """send cw to udp port"""
         logger.debug("UDP: %s", texttosend)
-        server_address_port = (self.host, self.port)
-        # bufferSize          = 1024
-        udp_client_socket = socket.socket(family=socket.AF_INET, type=socket.SOCK_DGRAM)
-        udp_client_socket.sendto(bytes(texttosend, "utf-8"), server_address_port)
+        if texttosend:
+            server_address_port = (self.host, self.port)
+            # bufferSize          = 1024
+            udp_client_socket = socket.socket(
+                family=socket.AF_INET, type=socket.SOCK_DGRAM
+            )
+            udp_client_socket.sendto(bytes(texttosend, "utf-8"), server_address_port)
 
     def _sendcwcat(self, texttosend):
         """..."""

not1mm/lib/fldigi_sendstring.py

@@ -0,0 +1,23 @@
+import xmlrpc.client
+
+
+class FlDigi_Comm:
+    """Send strings to fldigi for RTTY"""
+
+    def __init__(self):
+        self.target = "http://127.0.0.1:7362"
+
+    def send_string(
+        self, message: str = None, nlbefore: bool = True, rxafter: bool = True
+    ):
+        """send string"""
+        try:
+            server = xmlrpc.client.ServerProxy(self.target)
+            server.main.tx()
+            if nlbefore:
+                message = f"\n{message}"
+            if rxafter:
+                message = f"{message}^r"
+            server.text.add_tx(message)
+        except OSError:
+            ...

not1mm/lib/lookup.py

@@ -188,7 +188,10 @@ class QRZlookup:
             payload = {"s": self.session, "callsign": call}
             try:
                 query_result = requests.get(self.qrzurl, params=payload, timeout=10.0)
-            except requests.exceptions.Timeout as exception:
+            except (
+                requests.exceptions.Timeout,
+                requests.exceptions.ConnectionError,
+            ) as exception:
                 self.error = True
                 return {"error": exception}
             baseroot = xmltodict.parse(query_result.text)
@@ -228,8 +231,8 @@ class HamQTH:
         self.session = False
         payload = {"u": self.username, "p": self.password}
         try:
-            query_result = requests.get(self.url, params=payload, timeout=10.0)
-        except requests.exceptions.Timeout:
+            query_result = requests.get(self.url, params=payload, timeout=2.0)
+        except (requests.exceptions.Timeout, requests.exceptions.ConnectionError):
             self.error = True
             return
         logger.info("resultcode: %s", query_result.status_code)
@@ -258,7 +261,7 @@ class HamQTH:
             payload = {"id": self.session, "callsign": call, "prg": "not1mm"}
             try:
                 query_result = requests.get(self.url, params=payload, timeout=10.0)
-            except requests.exceptions.Timeout:
+            except (requests.exceptions.Timeout, requests.exceptions.ConnectionError):
                 self.error = True
                 return the_result
             logger.info("resultcode: %s", query_result.status_code)

not1mm/lib/plugin_common.py

@@ -189,6 +189,15 @@ def gen_adif(self, cabrillo_name: str, contest_id=""):
                                 end="\r\n",
                                 file=file_descriptor,
                             )
+                    # ------------CQ-WW-DX-RTTY---------
+                    elif cabrillo_name == "CQ-WW-RTTY":
+                        rcv = f"{str(contact.get('ZN', '')).zfill(2)} {contact.get('Exchange1', 'DX')}"
+                        if len(rcv) > 1:
+                            print(
+                                f"<SRX_STRING:{len(rcv)}>{rcv.upper()}",
+                                end="\r\n",
+                                file=file_descriptor,
+                            )
                     elif rcvnr != "0":
                         print(
                             f"<SRX_STRING:{len(rcvnr)}>{rcvnr}",

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.9.15"
+__version__ = "24.9.23"

not1mm/plugins/cq_ww_cw.py

@@ -1,5 +1,39 @@
 """CQ World Wide DX CW plugin"""
 
+# CQ Worldwide DX Contest, CW
+#  	Status:	Active
+#  	Geographic Focus:	Worldwide
+#  	Participation:	Worldwide
+#  	Awards:	Worldwide
+#  	Mode:	CW
+#  	Bands:	160, 80, 40, 20, 15, 10m
+#  	Classes:	Single Op All Band (QRP/Low/High)
+# Single Op Single Band (QRP/Low/High)
+# Single Op Assisted All Band (QRP/Low/High)
+# Single Op Assisted Single Band (QRP/Low/High)
+# Single Op Overlays: (Classic/Rookie/Youth)
+# Multi-Single (Low/High)
+# Multi-Two
+# Multi-Multi
+# Explorer
+#  	Max power:	HP: 1500 watts
+# LP: 100 watts
+# QRP: 5 watts
+#  	Exchange:	RST + CQ Zone No.
+#  	Work stations:	Once per band
+#  	QSO Points:	0 points per QSO with same country (counts as mult)
+# 1 point per QSO with different country same continent
+# 2 points per QSO with different country same continent (NA)
+# 3 points per QSO with different continent
+#  	Multipliers:	Each CQ zone once per band
+# Each country once per band
+#  	Score Calculation:	Total score = total QSO points x total mults
+#  	E-mail logs to:	(none)
+#  	Upload log at:	https://www.cqww.com/logcheck/
+#  	Mail logs to:	(none)
+#  	Find rules at:	https://www.cqww.com/rules.htm
+#  	Cabrillo name:	CQ-WW-CW
+
 # pylint: disable=invalid-name, unused-argument, unused-variable, c-extension-no-member, unused-import
 
 import datetime