not1mm 25.4.22__tar.gz → 25.4.25__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: not1mm
-Version: 25.4.22
+Version: 25.4.25
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 License: GPL-3.0-or-later
@@ -256,6 +256,7 @@ 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.

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

@@ -224,6 +224,7 @@ 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.

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

@@ -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:
-        #         print(f"{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

{not1mm-25.4.22 → 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.22 → not1mm-25.4.25}/not1mm/lib/version.py

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

{not1mm-25.4.22 → 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.22 → 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.22 → 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.22 → 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,
     }