not1mm 24.10.17__tar.gz → 24.10.17.1__tar.gz

{not1mm-24.10.17 → not1mm-24.10.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.10.17
+Version: 24.10.17.1
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -231,6 +231,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-10-17-1] Fix dupe check. Reordered change mode and interface update sequence. Resend mode if rigctld does not report back `RPRT 0`
 - [24-10-17] Increased max CW speed to 99, 'cause people be crazy. Trying smaller timeout for the rigctlsocket. Not having the checkwindow process events while not visible since it's a resource hog.
 - [24-10-15-1] Fix callsigns with a slash failing check during ESM.
 - [24-10-15] Add NAQP RTTY, Added ESM to NAQP.

{not1mm-24.10.17 → not1mm-24.10.17.1}/README.md

@@ -200,6 +200,7 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-10-17-1] Fix dupe check. Reordered change mode and interface update sequence. Resend mode if rigctld does not report back `RPRT 0`
 - [24-10-17] Increased max CW speed to 99, 'cause people be crazy. Trying smaller timeout for the rigctlsocket. Not having the checkwindow process events while not visible since it's a resource hog.
 - [24-10-15-1] Fix callsigns with a slash failing check during ESM.
 - [24-10-15] Add NAQP RTTY, Added ESM to NAQP.

{not1mm-24.10.17 → not1mm-24.10.17.1}/not1mm/__main__.py

@@ -3051,7 +3051,6 @@ class MainWindow(QtWidgets.QMainWindow):
         -------
         None
         """
-
         text = self.callsign.text()
         text = text.upper()
         position = self.callsign.cursorPosition()
@@ -3090,11 +3089,6 @@ class MainWindow(QtWidgets.QMainWindow):
                 self.change_freq(stripped_text)
                 return
 
-            self.check_callsign(stripped_text)
-            if self.check_dupe(stripped_text):
-                self.dupe_indicator.show()
-            else:
-                self.dupe_indicator.hide()
             cmd = {}
             cmd["cmd"] = "LOOKUP_CALL"
             cmd["station"] = platform.node()
@@ -3108,6 +3102,10 @@ class MainWindow(QtWidgets.QMainWindow):
         cmd["call"] = stripped_text
         self.multicast_interface.send_as_json(cmd)
         self.check_callsign(stripped_text)
+        if self.check_dupe(stripped_text):
+            self.dupe_indicator.show()
+        else:
+            self.dupe_indicator.hide()
 
     def change_freq(self, stripped_text: str) -> None:
         """
@@ -3163,14 +3161,14 @@ class MainWindow(QtWidgets.QMainWindow):
         """
 
         if mode in ("CW", "CW-U", "CW-L", "CWR"):
-            self.setmode("CW")
-            self.radio_state["mode"] = "CW"
             if self.rig_control and 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)
+            self.setmode("CW")
+            self.radio_state["mode"] = "CW"
             band = getband(str(self.radio_state.get("vfoa", "0.0")))
             self.set_band_indicator(band)
             self.set_window_title()
@@ -3178,11 +3176,11 @@ class MainWindow(QtWidgets.QMainWindow):
             self.read_cw_macros()
             return
         if mode == "RTTY":
-            self.setmode("RTTY")
             if self.rig_control and self.rig_control.online:
                 self.rig_control.set_mode("RTTY")
             else:
                 self.radio_state["mode"] = "RTTY"
+            self.setmode("RTTY")
             band = getband(str(self.radio_state.get("vfoa", "0.0")))
             self.set_band_indicator(band)
             self.set_window_title()
@@ -3190,16 +3188,16 @@ class MainWindow(QtWidgets.QMainWindow):
             self.read_cw_macros()
             return
         if mode == "SSB":
-            self.setmode("SSB")
             if int(self.radio_state.get("vfoa", 0)) > 10000000:
                 self.radio_state["mode"] = "USB"
             else:
                 self.radio_state["mode"] = "LSB"
+            if self.rig_control:
+                self.rig_control.set_mode(self.radio_state.get("mode"))
+            self.setmode("SSB")
             band = getband(str(self.radio_state.get("vfoa", "0.0")))
             self.set_band_indicator(band)
             self.set_window_title()
-            if self.rig_control:
-                self.rig_control.set_mode(self.radio_state.get("mode"))
             self.clearinputs()
             self.read_cw_macros()