not1mm 24.7.25.1__py3-none-any.whl → 24.7.29__py3-none-any.whl

not1mm/__main__.py

@@ -564,6 +564,8 @@ class MainWindow(QtWidgets.QMainWindow):
         if self.actionVFO.isChecked():
             self.vfo_window.show()
 
+        self.cwspeed_spinbox_changed()
+
         if not DEBUG_ENABLED:
             if VersionTest(__version__).test():
                 self.show_message_box(
@@ -1264,6 +1266,12 @@ class MainWindow(QtWidgets.QMainWindow):
                     else:
                         self.cw_speed.hide()
 
+                if hasattr(self.contest, "ft8_handler"):
+                    self.contest.set_self(self)
+                    self.ft8.set_callback(self.contest.ft8_handler)
+                else:
+                    self.ft8.set_callback(None)
+
                 self.clearinputs()
                 cmd = {}
                 cmd["cmd"] = "NEWDB"
@@ -1582,6 +1590,10 @@ class MainWindow(QtWidgets.QMainWindow):
             self.cw.sendcw(f"\x1b2{self.cw.speed}")
         if self.cw.servertype == 2:
             self.cw.set_winkeyer_speed(self.cw_speed.value())
+        if self.rig_control:
+            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())
 
     def keyPressEvent(self, event) -> None:  # pylint: disable=invalid-name
         """
@@ -1655,6 +1667,12 @@ class MainWindow(QtWidgets.QMainWindow):
                 if self.cw.servertype == 1:
                     self.cw.sendcw("\x1b4")
                     return
+            if self.rig_control:
+                if self.rig_control.online:
+                    if self.pref.get("cwtype") == 3 and self.rig_control is not None:
+                        if self.rig_control.interface == "flrig":
+                            self.rig_control.cat.set_flrig_cw_send(False)
+                            self.rig_control.cat.set_flrig_cw_send(True)
         if event.key() == Qt.Key.Key_Up:
             cmd = {}
             cmd["cmd"] = "PREVSPOT"
@@ -2867,12 +2885,16 @@ class MainWindow(QtWidgets.QMainWindow):
         None
         """
 
-        if mode in ("CW", "CW-U", "CW-L"):
+        if mode in ("CW", "CW-U", "CW-L", "CWR"):
             self.setmode("CW")
             self.radio_state["mode"] = "CW"
             if self.rig_control:
                 if self.rig_control.online:
                     self.rig_control.set_mode("CW")
+                    if self.pref.get("cwtype") == 3 and self.rig_control is not None:
+                        if self.rig_control.interface == "flrig":
+                            self.cwspeed_spinbox_changed()
+                            self.rig_control.cat.set_flrig_cw_send(True)
             band = getband(str(self.radio_state.get("vfoa", "0.0")))
             self.set_band_indicator(band)
             self.set_window_title()
@@ -3019,7 +3041,7 @@ class MainWindow(QtWidgets.QMainWindow):
 
     def setmode(self, mode: str) -> None:
         """Call when the mode changes."""
-        if mode in ("CW", "CW-U", "CW-L"):
+        if mode in ("CW", "CW-U", "CW-L", "CWR"):
             if self.current_mode != "CW":
                 self.current_mode = "CW"
                 self.sent.setText("599")
@@ -3149,7 +3171,7 @@ class MainWindow(QtWidgets.QMainWindow):
             info_dirty = True
             self.radio_state["bw"] = bw
 
-        if mode in ("CW", "CW-U", "CW-L"):
+        if mode in ("CW", "CW-U", "CW-L", "CWR"):
             self.setmode(mode)
         if mode == "LSB" or mode == "USB":
             self.setmode("SSB")
@@ -3379,7 +3401,6 @@ def run() -> None:
         f"Resolved OS file system paths: MODULE_PATH {fsutils.MODULE_PATH}, USER_DATA_PATH {fsutils.USER_DATA_PATH}, CONFIG_PATH {fsutils.CONFIG_PATH}"
     )
     install_icons()
-    # timer.start(250)
     sys.exit(app.exec())
 
 
@@ -3403,15 +3424,9 @@ app = QtWidgets.QApplication(sys.argv)
 families = load_fonts_from_dir(os.fspath(fsutils.APP_DATA_PATH))
 logger.info(f"font families {families}")
 window = MainWindow()
-# height = window.pref.get("window_height", 300)
-# width = window.pref.get("window_width", 700)
-# x = window.pref.get("window_x", -1)
-# y = window.pref.get("window_y", -1)
-# window.setGeometry(x, y, width, height)
 window.callsign.setFocus()
 window.show()
-# timer = QtCore.QTimer()
-# timer.timeout.connect(window.poll_radio)
+
 
 if __name__ == "__main__":
     run()

not1mm/lib/cat_interface.py

@@ -114,7 +114,7 @@ class CAT:
             self.sendcwrigctl(texttosend)
 
     def sendcwrigctl(self, texttosend):
-        """..."""
+        """Send text via rigctld"""
         if self.rigctrlsocket:
             try:
                 self.online = True
@@ -130,11 +130,10 @@ class CAT:
         return False
 
     def sendcwxmlrpc(self, texttosend):
-        """..."""
-        print(f"{texttosend=}")
+        """Add text to flrig's cw send buffer."""
+        logger.debug(f"{texttosend=}")
         try:
             self.online = True
-            self.server.rig.cwio_send(1)
             self.server.rig.cwio_text(texttosend)
             return
         except (
@@ -145,10 +144,45 @@ class CAT:
             http.client.ResponseNotReady,
         ) as exception:
             self.online = False
-            print("sendcwxmlrpc: %s", f"{exception}")
-            # logger.debug("sendcwxmlrpc: %s", f"{exception}")
+            logger.debug("%s", f"{exception}")
         return False
 
+    def set_flrig_cw_send(self, send: bool) -> None:
+        """Turn on flrig cw keyer send flag."""
+        if self.interface == "rigctld":
+            return
+        try:
+            self.online = True
+            self.server.rig.cwio_send(int(send))
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
+            ValueError,
+        ) as exception:
+            self.online = False
+            logger.debug("%s", f"{exception}")
+
+    def set_flrig_cw_speed(self, speed):
+        """Set flrig's CW send speed"""
+        if self.interface == "rigctld":
+            return
+        try:
+            self.online = True
+            self.server.rig.cwio_set_wpm(int(speed))
+        except (
+            ConnectionRefusedError,
+            xmlrpc.client.Fault,
+            http.client.BadStatusLine,
+            http.client.CannotSendRequest,
+            http.client.ResponseNotReady,
+            ValueError,
+        ) as exception:
+            self.online = False
+            logger.debug("%s", f"{exception}")
+
     def get_vfo(self) -> str:
         """Poll the radio for current vfo using the interface"""
         vfo = ""

not1mm/lib/version.py

@@ -1,3 +1,4 @@
 """It's the version"""
 
-__version__ = "24.7.25.1"
+__version__ = "24.7.29"
+

not1mm/plugins/arrl_field_day.py

@@ -13,6 +13,8 @@ from not1mm.lib.version import __version__
 
 logger = logging.getLogger(__name__)
 
+ALTEREGO = None
+
 EXCHANGE_HINT = "1D ORG"
 
 name = "ARRL Field Day"
@@ -319,3 +321,48 @@ def cabrillo(self):
 
 def recalculate_mults(self):
     """Recalculates multipliers after change in logged qso."""
+
+
+def set_self(the_outie):
+    """..."""
+    globals()["ALTEREGO"] = the_outie
+
+
+def ft8_handler(the_packet: dict):
+    """Process FT8 QSO packets
+
+    {
+        'CALL': 'KE0OG',
+        'GRIDSQUARE': 'DM10AT',
+        'MODE': 'FT8',
+        'RST_SENT': '',
+        'RST_RCVD': '',
+        'QSO_DATE': '20210329',
+        'TIME_ON': '183213',
+        'QSO_DATE_OFF': '20210329',
+        'TIME_OFF': '183213',
+        'BAND': '20M',
+        'FREQ': '14.074754',
+        'STATION_CALLSIGN': 'K6GTE',
+        'MY_GRIDSQUARE': 'DM13AT',
+        'CONTEST_ID': 'ARRL-FIELD-DAY',
+        'SRX_STRING': '1D UT',
+        'CLASS': '1D',
+        'ARRL_SECT': 'UT'
+    }
+
+    """
+    print(f"{the_packet=}")
+
+    if ALTEREGO is not None:
+
+        ALTEREGO.callsign.setText(the_packet.get("CALL"))
+        ALTEREGO.contact["Call"] = the_packet.get("CALL", "")
+        ALTEREGO.contact["SNT"] = ALTEREGO.sent.text()
+        ALTEREGO.contact["RCV"] = ALTEREGO.receive.text()
+        ALTEREGO.contact["Exchange1"] = the_packet.get("CLASS", "ERR")
+        ALTEREGO.contact["Sect"] = the_packet.get("ARRL_SECT", "ERR")
+        ALTEREGO.contact["Mode"] = "FT8"
+        ALTEREGO.other_1.setText(the_packet.get("CLASS", "ERR"))
+        ALTEREGO.other_2.setText(the_packet.get("ARRL_SECT", "ERR"))
+        print(f"\n{ALTEREGO.contact=}\n")

{not1mm-24.7.25.1.dist-info → not1mm-24.7.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.7.25.1
+Version: 24.7.29
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -223,6 +223,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-7-29] Add flrig cw speed change via onscreen widget.
+- [24-7-28] Second try at flrig CW.
 - [24-7-25-1] Have VFO dock widget handle disconnect/reconnect events of the USB VFO knob more gracefully.
 - [24-7-25] Updated application categories for the desktop file.
 - [24-7-25] Maybe let flrig send CW... Probably not.

{not1mm-24.7.25.1.dist-info → not1mm-24.7.29.dist-info}/RECORD

@@ -1,5 +1,5 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=yVBck7JN7jIc49RvxkHhMI9QphC85pLufOH7Uul738o,120573
+not1mm/__main__.py,sha256=-zzE1QUDpuVKwgWJeoEPJ7ceCCvx0YLBISw24xQJgs4,121481
 not1mm/bandmap.py,sha256=Ml5DDoybk_I56q2WLYDKE4lfmh6pb9XxW0qpl5nDFYY,32161
 not1mm/checkwindow.py,sha256=zHxkCQ4BJ-pN80dSTQdiKq8RqY4oWzJveXZhQ2bu3PY,10436
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
@@ -91,7 +91,7 @@ not1mm/data/phonetics/yourcall.wav,sha256=4kheHJmCiRDL2kjhlgXQ8_u_eEMgKxiNGu5UBk
 not1mm/data/phonetics/z.wav,sha256=arafCi7fwmBLdVDI-PRyaL4U-03PIQDhffwY5noJ_2c,51768
 not1mm/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/lib/about.py,sha256=sWycfGcruN3SaEe4JmaJ61K6D8Itq0WxpUYT-lEcmYM,416
-not1mm/lib/cat_interface.py,sha256=-ri3woVU_Q7r7usf5y15lm_9CQVxTgBYn2CSXt48ihg,18390
+not1mm/lib/cat_interface.py,sha256=aazvNTSeZAROq3KL8gPx-I95iVez2IiIOSk22qeqVCQ,19502
 not1mm/lib/cwinterface.py,sha256=Q8p3pScOHczZ8ptICfH1Yu6rCEwQJLgrNwYMN76B2i8,3389
 not1mm/lib/database.py,sha256=RQoj3JsTejMiiFIN42lY3N4jrj80htftdoFeRqVKnKs,42480
 not1mm/lib/edit_contact.py,sha256=Ki9bGPpqyQQBB1cU8VIBDCal3lbXeQ6qxhzklmhE2_w,353
@@ -109,7 +109,7 @@ not1mm/lib/plugin_common.py,sha256=AAKBPCXzTWZJb-h08uPNnHVG7bSCg7kwukc211gFivY,8
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
 not1mm/lib/settings.py,sha256=MWiKXbasaFbzeHTjfzTaTqbCBrIijudP_-0a5jNmUAA,9265
 not1mm/lib/super_check_partial.py,sha256=p5l3u2ZOCBtlWgbvskC50FpuoaIpR07tfC6zTdRWbh4,2334
-not1mm/lib/version.py,sha256=vCCHd-NGTIRQF1HQqLA4TFjkjFR_ZtwCDpkOE8lTF1M,50
+not1mm/lib/version.py,sha256=BMpTloYgDxnJAW_gTC-FRCBOqBhNTglZbFeS_OdpJiQ,49
 not1mm/lib/versiontest.py,sha256=8vDNptuBBunn-1IGkjNaquehqBYUJyjrPSF8Igmd4_Y,1286
 not1mm/plugins/10_10_fall_cw.py,sha256=IttjX1yy4nDdACGsiYlPteFG8eVseX_WtoFio6bqHE8,10953
 not1mm/plugins/10_10_spring_cw.py,sha256=ThCptdM3dX4ywhoy2JRcOEyHSqcJolFaT7O_PYzM1Mg,10958
@@ -119,7 +119,7 @@ not1mm/plugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 not1mm/plugins/arrl_10m.py,sha256=EyNRb3Sm0Qb-GVm0p05EnadlHisVh7y-sKTBP2ddMLo,13768
 not1mm/plugins/arrl_dx_cw.py,sha256=LVnYDNFEUiIpQ1TlhOCcRK7JNwH5XPO5WzUoApSUMTY,13802
 not1mm/plugins/arrl_dx_ssb.py,sha256=fUFzuNbCAfA5sQSYm8ISV3P9Z_2xnuKeOdO6E66zn1k,13805
-not1mm/plugins/arrl_field_day.py,sha256=OSro24LsSVW41yecKziWQMjflJbo62P8C53Q3M3-Lb0,10052
+not1mm/plugins/arrl_field_day.py,sha256=bMBrww0-zBnkrLY3JsG1tXumeWGDWgLi1QZiPtriFqE,11387
 not1mm/plugins/arrl_rtty_ru.py,sha256=hKUS4isjdXo3EYxQrsqsDupPp2chW8fpoWj0T1pTgJ4,7994
 not1mm/plugins/arrl_ss_cw.py,sha256=4yN68xZMuJRaSUfdiY4hafC07A3lifl5q6DEUZ-oYPQ,13080
 not1mm/plugins/arrl_ss_phone.py,sha256=Yzc5sNjrY8TlnozbYF6k8hbEamyDuUAD_3-BNqHgXqY,13068
@@ -145,9 +145,9 @@ not1mm/plugins/naqp_ssb.py,sha256=VLWVrSzI0UP1AhSXYn61eZ7or1rz6a_pS_xCKfgS4Jw,11
 not1mm/plugins/phone_weekly_test.py,sha256=fLpMe03WB9_KgRl6vMgQQt_aktFdqfNt2Sw81CTRAUs,12325
 not1mm/plugins/stew_perry_topband.py,sha256=CKBQbYl4ETxhXJd2dma4fg_C5pag_s7Nf61SCztZtqE,10668
 not1mm/plugins/winter_field_day.py,sha256=4rcfRtobwjHO6BNL3WOTHzBmyyeuX79BNGBG8PfjrI8,10238
-not1mm-24.7.25.1.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.7.25.1.dist-info/METADATA,sha256=F72Ht3kFbVRg_dd4Y24UagfXACEBvjkEvrQO9ScxBRU,29413
-not1mm-24.7.25.1.dist-info/WHEEL,sha256=Wyh-_nZ0DJYolHNn1_hMa4lM7uDedD_RGVwbmTjyItk,91
-not1mm-24.7.25.1.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.7.25.1.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.7.25.1.dist-info/RECORD,,
+not1mm-24.7.29.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.7.29.dist-info/METADATA,sha256=gxO9nKYQuDwbFIRsySM-8YZydIx54Nn5gF8W8UUhUAY,29506
+not1mm-24.7.29.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+not1mm-24.7.29.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.7.29.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.7.29.dist-info/RECORD,,

{not1mm-24.7.25.1.dist-info → not1mm-24.7.29.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (71.1.0)
+Generator: setuptools (72.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any