not1mm 25.4.21__tar.gz → 25.4.25__tar.gz

{not1mm-25.4.21 → not1mm-25.4.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.4.21
+Version: 25.4.25
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -256,6 +256,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-4-25] Merged PR from @microphonon making changes to ARRL VHF and CWOps CWT.
+- [25-4-22] Mostly code cleanup. Not running some code when not needed.
 - [25-4-21] Add a couple more debug messages. Add LSB/USB to input-able commands to the callsign field.
 - [25-4-19-1] Add FM and AM as input-able commands to the callsign field.
 - [25-4-19] Changed S&P QSY wipe from 50hz to 500hz.

{not1mm-25.4.21 → not1mm-25.4.25}/README.md

@@ -224,6 +224,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [25-4-25] Merged PR from @microphonon making changes to ARRL VHF and CWOps CWT.
+- [25-4-22] Mostly code cleanup. Not running some code when not needed.
 - [25-4-21] Add a couple more debug messages. Add LSB/USB to input-able commands to the callsign field.
 - [25-4-19-1] Add FM and AM as input-able commands to the callsign field.
 - [25-4-19] Changed S&P QSY wipe from 50hz to 500hz.

{not1mm-25.4.21 → not1mm-25.4.25}/not1mm/__main__.py

@@ -3192,12 +3192,12 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.pref.get("CAT_ip", "127.0.0.1"),
                 int(self.pref.get("CAT_port", 12345)),
             )
-            self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
-            self.rig_control.moveToThread(self.radio_thread)
-            self.radio_thread.started.connect(self.rig_control.run)
-            self.radio_thread.finished.connect(self.rig_control.deleteLater)
-            self.rig_control.poll_callback.connect(self.poll_radio)
-            self.radio_thread.start()
+            # self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
+            # self.rig_control.moveToThread(self.radio_thread)
+            # self.radio_thread.started.connect(self.rig_control.run)
+            # self.radio_thread.finished.connect(self.rig_control.deleteLater)
+            # self.rig_control.poll_callback.connect(self.poll_radio)
+            # self.radio_thread.start()
 
         elif self.pref.get("userigctld", False) is True:
             logger.debug(
@@ -3209,24 +3209,24 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.pref.get("CAT_ip", "127.0.0.1"),
                 int(self.pref.get("CAT_port", 4532)),
             )
-            self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
-            self.rig_control.moveToThread(self.radio_thread)
-            self.radio_thread.started.connect(self.rig_control.run)
-            self.radio_thread.finished.connect(self.rig_control.deleteLater)
-            self.rig_control.poll_callback.connect(self.poll_radio)
-            self.radio_thread.start()
+            # self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
+            # self.rig_control.moveToThread(self.radio_thread)
+            # self.radio_thread.started.connect(self.rig_control.run)
+            # self.radio_thread.finished.connect(self.rig_control.deleteLater)
+            # self.rig_control.poll_callback.connect(self.poll_radio)
+            # self.radio_thread.start()
         else:
             self.rig_control = Radio(
                 "fake",
                 self.pref.get("CAT_ip", "127.0.0.1"),
                 int(self.pref.get("CAT_port", 0000)),
             )
-            self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
-            self.rig_control.moveToThread(self.radio_thread)
-            self.radio_thread.started.connect(self.rig_control.run)
-            self.radio_thread.finished.connect(self.rig_control.deleteLater)
-            self.rig_control.poll_callback.connect(self.poll_radio)
-            self.radio_thread.start()
+        self.rig_control.delta = int(self.pref.get("CAT_polldelta", 555))
+        self.rig_control.moveToThread(self.radio_thread)
+        self.radio_thread.started.connect(self.rig_control.run)
+        self.radio_thread.finished.connect(self.rig_control.deleteLater)
+        self.rig_control.poll_callback.connect(self.poll_radio)
+        self.radio_thread.start()
 
         self.cw = None
         if (
@@ -3925,13 +3925,10 @@ class MainWindow(QtWidgets.QMainWindow):
         self.contact["Band"] = get_logged_band(str(vfo))
         self.set_band_indicator(band)
 
-        if self.rig_control:
-            if self.rig_control.online:
-                self.rig_control.get_modes()
-
         if self.radio_state.get("mode") != mode:
             info_dirty = True
-            self.radio_state["mode"] = mode
+            if "set_freq:" not in mode:
+                self.radio_state["mode"] = mode
 
         if self.radio_state.get("bw") != bw:
             info_dirty = True
@@ -3959,26 +3956,26 @@ class MainWindow(QtWidgets.QMainWindow):
         ):
             self.setmode("RTTY")
 
-        cmd = {}
-        cmd["cmd"] = "RADIO_STATE"
-        cmd["band"] = band
-        cmd["vfoa"] = vfo
-        cmd["mode"] = mode
-        cmd["bw"] = bw
         if self.bandmap_window:
+            cmd = {}
+            cmd["cmd"] = "RADIO_STATE"
+            cmd["band"] = band
+            cmd["vfoa"] = vfo
+            cmd["mode"] = mode
+            cmd["bw"] = bw
             self.bandmap_window.msg_from_main(cmd)
         if info_dirty:
             try:
                 logger.debug("VFO: %s  MODE: %s BW: %s", vfo, mode, bw)
                 self.set_window_title()
-                cmd = {}
-                cmd["cmd"] = "RADIO_STATE"
-                cmd["band"] = band
-                cmd["vfoa"] = vfo
-                cmd["mode"] = mode
-                cmd["bw"] = bw
-                if self.bandmap_window:
-                    self.bandmap_window.msg_from_main(cmd)
+                # cmd = {}
+                # cmd["cmd"] = "RADIO_STATE"
+                # cmd["band"] = band
+                # cmd["vfoa"] = vfo
+                # cmd["mode"] = mode
+                # cmd["bw"] = bw
+                # if self.bandmap_window:
+                #     self.bandmap_window.msg_from_main(cmd)
                 if self.n1mm:
                     self.n1mm.radio_info["Freq"] = vfo[:-1]
                     self.n1mm.radio_info["TXFreq"] = vfo[:-1]

{not1mm-25.4.21 → not1mm-25.4.25}/not1mm/bandmap.py

@@ -385,7 +385,7 @@ class BandMapWindow(QDockWidget):
 
     def msg_from_main(self, packet):
         """"""
-        if self.active is False:
+        if self.active is False or not self.isVisible():
             return
         if packet.get("cmd", "") == "RADIO_STATE":
             self.set_band(packet.get("band") + "m", False)
@@ -688,7 +688,7 @@ class BandMapWindow(QDockWidget):
     def update_stations(self):
         """doc"""
         self.update_timer.setInterval(UPDATE_INTERVAL)
-        if self.active is False:
+        if self.active is False or not self.isVisible():
             return
         self.clear_all_callsign_from_scene()
         self.spot_aging()

{not1mm-25.4.21 → not1mm-25.4.25}/not1mm/data/new_contest.ui

@@ -271,6 +271,11 @@
       <property name="text">
        <string>ARRL VHF SEP</string>
       </property>
+     </item>
+      <item>
+      <property name="text">
+       <string>VHF SPRINT</string>
+      </property>
      </item>
      <item>
       <property name="text">

{not1mm-25.4.21 → not1mm-25.4.25}/not1mm/lib/cat_interface.py

@@ -71,6 +71,7 @@ class CAT:
         self.host = host
         self.port = port
         self.online = False
+        self.rigctld_bw = "0"
         self.fake_radio = {
             "vfo": "14032000",
             "mode": "CW",
@@ -121,6 +122,7 @@ class CAT:
 
     def __initialize_rigctrld(self):
         try:
+            logger.debug("Connecting to rigctrld")
             self.rigctrlsocket = socket.socket()
             self.rigctrlsocket.settimeout(0.5)
             self.rigctrlsocket.connect((self.host, self.port))
@@ -154,7 +156,7 @@ class CAT:
         except (socket.error, UnicodeDecodeError):
             ...
         self.rigctrlsocket.settimeout(0.5)
-        logger.debug("%s", dump)
+        # logger.debug("%s", dump)
         return dump
 
     def sendvoicememory(self, memoryspot=1):
@@ -167,7 +169,8 @@ class CAT:
         try:
             self.online = True
             self.rigctrlsocket.send(bytes(f"+\\send_voice_mem {memoryspot}\n", "utf-8"))
-            _ = self.__get_serial_string()
+            info = self.__get_serial_string()
+            logger.debug("%s", info)
             return
         except socket.error as exception:
             self.online = False
@@ -189,7 +192,8 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(bytes(f"b{texttosend}\n", "utf-8"))
-                _ = self.__get_serial_string()
+                info = self.__get_serial_string()
+                logger.debug("%s", info)
                 return True
             except socket.error as exception:
                 self.online = False
@@ -205,7 +209,8 @@ class CAT:
             try:
                 self.online = True
                 self.rigctrlsocket.send(bytes(f"L KEYSPD {speed}\n", "utf-8"))
-                _ = self.__get_serial_string()
+                info = self.__get_serial_string()
+                logger.debug("%s", info)
                 return
             except socket.error as exception:
                 self.online = False
@@ -307,6 +312,7 @@ class CAT:
                 self.online = True
                 self.rigctrlsocket.send(b"|f\n")
                 report = self.__get_serial_string().strip()
+                logger.debug("%s", report)
                 if "get_freq:|" in report and "RPRT 0" in report:
                     seg_rpt = report.split("|")
                     return seg_rpt[1].split(" ")[1]
@@ -361,8 +367,10 @@ class CAT:
                 self.rigctrlsocket.send(b"|m\n")
                 # get_mode:|Mode: CW|Passband: 500|RPRT 0
                 report = self.__get_serial_string().strip()
+                logger.debug("%s", report)
                 if "get_mode:|" in report and "RPRT 0" in report:
                     seg_rpt = report.split("|")
+                    self.rigctld_bw = seg_rpt[2].split(" ")[1]
                     return seg_rpt[1].split(" ")[1]
             except IndexError as exception:
                 logger.debug("%s", f"{exception}")
@@ -404,25 +412,27 @@ class CAT:
 
     def __getbw_rigctld(self):
         """return bandwidth"""
-        if self.rigctrlsocket:
-            try:
-                self.online = True
-                self.rigctrlsocket.send(b"|m\n")
-                # get_mode:|Mode: CW|Passband: 500|RPRT 0
-                report = self.__get_serial_string().strip()
-                if "get_mode:|" in report and "RPRT 0" in report:
-                    seg_rpt = report.split("|")
-                    return seg_rpt[2].split(" ")[1]
-
-            except IndexError as exception:
-                logger.debug("%s", f"{exception}")
-            except socket.error as exception:
-                self.online = False
-                logger.debug("%s", f"{exception}")
-                self.rigctrlsocket = None
-            return ""
-        self.__initialize_rigctrld()
-        return ""
+        return self.rigctld_bw
+        # if self.rigctrlsocket:
+        #     try:
+        #         self.online = True
+        #         self.rigctrlsocket.send(b"|m\n")
+        #         # get_mode:|Mode: CW|Passband: 500|RPRT 0
+        #         report = self.__get_serial_string().strip()
+        #         logger.debug("%s", report)
+        #         if "get_mode:|" in report and "RPRT 0" in report:
+        #             seg_rpt = report.split("|")
+        #             return seg_rpt[2].split(" ")[1]
+
+        #     except IndexError as exception:
+        #         logger.debug("%s", f"{exception}")
+        #     except socket.error as exception:
+        #         self.online = False
+        #         logger.debug("%s", f"{exception}")
+        #         self.rigctrlsocket = None
+        #     return ""
+        # self.__initialize_rigctrld()
+        # return ""
 
     def get_power(self):
         """Get power level from rig"""
@@ -455,6 +465,7 @@ class CAT:
                 self.rigctrlsocket.send(b"|l RFPOWER\n")
                 # get_level: RFPOWER|0.000000|RPRT 0
                 report = self.__get_serial_string().strip()
+                logger.debug("%s", report)
                 if "get_level: RFPOWER|" in report and "RPRT 0" in report:
                     seg_rpt = report.split("|")
                     return int(float(seg_rpt[1]) * 100)
@@ -588,8 +599,9 @@ class CAT:
         if self.rigctrlsocket:
             try:
                 self.online = True
-                self.rigctrlsocket.send(bytes(f"F {freq}\n", "utf-8"))
-                _ = self.__get_serial_string()
+                self.rigctrlsocket.send(bytes(f"|F {freq}\n", "utf-8"))
+                info = self.__get_serial_string()
+                logger.debug("%s", info)
                 return True
             except socket.error as exception:
                 self.online = False
@@ -634,11 +646,12 @@ class CAT:
         if self.rigctrlsocket:
             try:
                 self.online = True
-                logger.debug(f"\nM {mode} 0\n")
-                self.rigctrlsocket.send(bytes(f"\nM {mode} 0\n", "utf-8"))
-                if self.__get_serial_string() != "RPRT 0\n":
-                    self.rigctrlsocket.send(bytes(f"\nM {mode} 0\n", "utf-8"))
-                _ = self.__get_serial_string()
+                # logger.debug(f"\nM {mode} 0\n")
+                self.rigctrlsocket.send(bytes(f"\n|M {mode} 0\n", "utf-8"))
+                # if self.__get_serial_string() != "RPRT 0\n":
+                #     self.rigctrlsocket.send(bytes(f"\n|M {mode} 0\n", "utf-8"))
+                info = self.__get_serial_string()
+                logger.debug("%s", info)
                 return True
             except socket.error as exception:
                 self.online = False
@@ -676,11 +689,12 @@ class CAT:
 
     def __setpower_rigctld(self, power):
         if power.isnumeric() and int(power) >= 1 and int(power) <= 100:
-            rig_cmd = bytes(f"L RFPOWER {str(float(power) / 100)}\n", "utf-8")
+            rig_cmd = bytes(f"|L RFPOWER {str(float(power) / 100)}\n", "utf-8")
             try:
                 self.online = True
                 self.rigctrlsocket.send(rig_cmd)
-                _ = self.__get_serial_string()
+                info = self.__get_serial_string()
+                logger.debug("%s", info)
             except socket.error:
                 self.online = False
                 self.rigctrlsocket = None
@@ -706,12 +720,13 @@ class CAT:
         # Get 'PTT' status.
         # Returns PTT as a value in set_ptt above.
 
-        rig_cmd = bytes("T 1\n", "utf-8")
+        rig_cmd = bytes("|T 1\n", "utf-8")
         logger.debug("%s", f"{rig_cmd}")
         try:
             self.online = True
             self.rigctrlsocket.send(rig_cmd)
-            _ = self.__get_serial_string()
+            info = self.__get_serial_string()
+            logger.debug("%s", info)
         except socket.error:
             self.online = False
             self.rigctrlsocket = None
@@ -745,12 +760,13 @@ class CAT:
 
     def __ptt_off_rigctld(self):
         """Toggle PTT state off"""
-        rig_cmd = bytes("T 0\n", "utf-8")
+        rig_cmd = bytes("|T 0\n", "utf-8")
         logger.debug("%s", f"{rig_cmd}")
         try:
             self.online = True
             self.rigctrlsocket.send(rig_cmd)
-            _ = self.__get_serial_string()
+            into = self.__get_serial_string()
+            logger.debug("%s", into)
         except socket.error:
             self.online = False
             self.rigctrlsocket = None

{not1mm-25.4.21 → not1mm-25.4.25}/not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "25.4.21"
+__version__ = "25.4.25"

{not1mm-25.4.21 → not1mm-25.4.25}/not1mm/plugins/arrl_vhf_jan.py

@@ -82,13 +82,13 @@ def init_contest(self):
 
 def interface(self):
     """Setup user interface"""
-    self.field1.show()
-    self.field2.show()
+    self.field1.hide()
+    self.field2.hide()
     self.field3.show()
     self.field4.show()
     self.snt_label.setText("SNT")
     self.field1.setAccessibleName("RST Sent")
-    self.other_label.setText("SentNR")
+    self.other_label.setText("Sent Grid")
     self.field3.setAccessibleName("Sent Grid")
     self.exch_label.setText("Grid")
     self.field4.setAccessibleName("Gridsquare")
@@ -101,9 +101,7 @@ def reset_label(self):
 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.callsign: self.other_1,
         self.other_1: self.other_2,
         self.other_2: self.callsign,
     }
@@ -113,10 +111,8 @@ 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,
+        self.other_1: self.callsign,
     }
 
 

{not1mm-25.4.21 → not1mm-25.4.25}/not1mm/plugins/arrl_vhf_jun.py

@@ -50,13 +50,13 @@ def init_contest(self):
 
 def interface(self):
     """Setup user interface"""
-    self.field1.show()
-    self.field2.show()
+    self.field1.hide()
+    self.field2.hide()
     self.field3.show()
     self.field4.show()
     self.snt_label.setText("SNT")
     self.field1.setAccessibleName("RST Sent")
-    self.other_label.setText("SentNR")
+    self.other_label.setText("Sent Grid")
     self.field3.setAccessibleName("Sent Grid")
     self.exch_label.setText("Grid")
     self.field4.setAccessibleName("Gridsquare")
@@ -69,9 +69,7 @@ def reset_label(self):
 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.callsign: self.other_1,
         self.other_1: self.other_2,
         self.other_2: self.callsign,
     }
@@ -81,10 +79,8 @@ 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,
+        self.other_1: self.callsign,
     }
 
 

{not1mm-25.4.21 → not1mm-25.4.25}/not1mm/plugins/arrl_vhf_sep.py

@@ -50,13 +50,13 @@ def init_contest(self):
 
 def interface(self):
     """Setup user interface"""
-    self.field1.show()
-    self.field2.show()
+    self.field1.hide()
+    self.field2.hide()
     self.field3.show()
     self.field4.show()
     self.snt_label.setText("SNT")
     self.field1.setAccessibleName("RST Sent")
-    self.other_label.setText("SentNR")
+    self.other_label.setText("Sent Grid")
     self.field3.setAccessibleName("Sent Grid")
     self.exch_label.setText("Grid")
     self.field4.setAccessibleName("Gridsquare")
@@ -69,9 +69,7 @@ def reset_label(self):
 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.callsign: self.other_1,
         self.other_1: self.other_2,
         self.other_2: self.callsign,
     }
@@ -81,10 +79,8 @@ 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,
+        self.other_1: self.callsign,
     }
 
 

{not1mm-25.4.21 → not1mm-25.4.25}/not1mm/plugins/cwt.py

@@ -11,10 +11,11 @@
 #  	Bands:	160, 80, 40, 20, 15, 10m
 #  	Classes:	Single Op (QRP/Low/High)
 #  	Max power:	HP: >100 watts
-# LP: 100 watts
-# QRP: 5 watts
-#  	Exchange:	Member: Name + Member No./"CWA"
-# non-Member: Name + (state/province/country)
+#   LP: 100 watts
+#   QRP: 5 watts
+#  	Exchange:
+#   Member: Name + Member No./"CWA"
+#   Non-Member: Name + (state/province/country)
 #  	Work stations:	Once per band
 #  	QSO Points:	1 point per QSO
 #  	Multipliers:	Each call once
@@ -72,16 +73,16 @@ def init_contest(self):
 
 def interface(self):
     """Setup user interface"""
-    self.field1.show()
-    self.field2.show()
+    self.field1.hide()
+    self.field2.hide()
     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("ST/DX/#")
-    self.field4.setAccessibleName("State D X or Number")
+    self.exch_label.setText("Number or State")
+    self.field4.setAccessibleName("Number or State")
 
 
 def reset_label(self):
@@ -91,9 +92,7 @@ def reset_label(self):
 def set_tab_next(self):
     """Set TAB Advances"""
     self.tab_next = {
-        self.callsign: self.sent,
-        self.sent: self.field2.findChild(QtWidgets.QLineEdit),
-        self.receive: self.other_1,
+        self.callsign: self.other_1,
         self.other_1: self.other_2,
         self.other_2: self.callsign,
     }
@@ -103,9 +102,7 @@ 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_1: self.callsign,
         self.other_2: self.other_1,
     }