not1mm 24.9.25__py3-none-any.whl → 24.9.28__py3-none-any.whl

not1mm/__main__.py

@@ -95,7 +95,7 @@ class MainWindow(QtWidgets.QMainWindow):
         "command_buttons": False,
         "cw_macros": True,
         "bands_modes": True,
-        "bands": ["160", "80", "40", "20", "15", "10"],
+        "bands": ["160", "80", "60", "40", "30", "20", "17", "15", "12", "10"],
         "current_database": "ham.db",
         "contest": "",
         "multicast_group": "239.1.1.1",
@@ -309,19 +309,32 @@ class MainWindow(QtWidgets.QMainWindow):
         self.cw_band_80.mousePressEvent = lambda x: self.change_to_band_and_mode(
             80, "CW"
         )
+        self.cw_band_60.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            60, "CW"
+        )
         self.cw_band_40.mousePressEvent = lambda x: self.change_to_band_and_mode(
             40, "CW"
         )
+        self.cw_band_30.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            30, "CW"
+        )
         self.cw_band_20.mousePressEvent = lambda x: self.change_to_band_and_mode(
             20, "CW"
         )
+        self.cw_band_17.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            17, "CW"
+        )
         self.cw_band_15.mousePressEvent = lambda x: self.change_to_band_and_mode(
             15, "CW"
         )
+        self.cw_band_12.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            12, "CW"
+        )
         self.cw_band_10.mousePressEvent = lambda x: self.change_to_band_and_mode(
             10, "CW"
         )
         self.cw_band_6.mousePressEvent = lambda x: self.change_to_band_and_mode(6, "CW")
+        self.cw_band_4.mousePressEvent = lambda x: self.change_to_band_and_mode(4, "CW")
         self.cw_band_2.mousePressEvent = lambda x: self.change_to_band_and_mode(2, "CW")
         self.cw_band_125.mousePressEvent = lambda x: self.change_to_band_and_mode(
             222, "CW"
@@ -342,21 +355,33 @@ class MainWindow(QtWidgets.QMainWindow):
         self.ssb_band_80.mousePressEvent = lambda x: self.change_to_band_and_mode(
             80, "SSB"
         )
+        self.ssb_band_60.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            60, "SSB"
+        )
         self.ssb_band_40.mousePressEvent = lambda x: self.change_to_band_and_mode(
             40, "SSB"
         )
         self.ssb_band_20.mousePressEvent = lambda x: self.change_to_band_and_mode(
             20, "SSB"
         )
+        self.ssb_band_17.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            17, "SSB"
+        )
         self.ssb_band_15.mousePressEvent = lambda x: self.change_to_band_and_mode(
             15, "SSB"
         )
+        self.ssb_band_12.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            12, "SSB"
+        )
         self.ssb_band_10.mousePressEvent = lambda x: self.change_to_band_and_mode(
             10, "SSB"
         )
         self.ssb_band_6.mousePressEvent = lambda x: self.change_to_band_and_mode(
             6, "SSB"
         )
+        self.ssb_band_4.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            4, "SSB"
+        )
         self.ssb_band_2.mousePressEvent = lambda x: self.change_to_band_and_mode(
             2, "SSB"
         )
@@ -379,21 +404,36 @@ class MainWindow(QtWidgets.QMainWindow):
         self.rtty_band_80.mousePressEvent = lambda x: self.change_to_band_and_mode(
             80, "RTTY"
         )
+        self.rtty_band_60.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            60, "RTTY"
+        )
         self.rtty_band_40.mousePressEvent = lambda x: self.change_to_band_and_mode(
             40, "RTTY"
         )
+        self.rtty_band_30.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            30, "RTTY"
+        )
         self.rtty_band_20.mousePressEvent = lambda x: self.change_to_band_and_mode(
             20, "RTTY"
         )
+        self.rtty_band_17.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            17, "RTTY"
+        )
         self.rtty_band_15.mousePressEvent = lambda x: self.change_to_band_and_mode(
             15, "RTTY"
         )
+        self.rtty_band_12.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            12, "RTTY"
+        )
         self.rtty_band_10.mousePressEvent = lambda x: self.change_to_band_and_mode(
             10, "RTTY"
         )
         self.rtty_band_6.mousePressEvent = lambda x: self.change_to_band_and_mode(
             6, "RTTY"
         )
+        self.rtty_band_4.mousePressEvent = lambda x: self.change_to_band_and_mode(
+            4, "RTTY"
+        )
         self.rtty_band_2.mousePressEvent = lambda x: self.change_to_band_and_mode(
             2, "RTTY"
         )
@@ -413,11 +453,16 @@ class MainWindow(QtWidgets.QMainWindow):
         self.band_indicators_cw = {
             "160": self.cw_band_160,
             "80": self.cw_band_80,
+            "60": self.cw_band_60,
             "40": self.cw_band_40,
+            "30": self.cw_band_30,
             "20": self.cw_band_20,
+            "17": self.cw_band_17,
             "15": self.cw_band_15,
+            "12": self.cw_band_12,
             "10": self.cw_band_10,
             "6": self.cw_band_6,
+            "4": self.cw_band_4,
             "2": self.cw_band_2,
             "1.25": self.cw_band_125,
             "70cm": self.cw_band_70cm,
@@ -428,11 +473,15 @@ class MainWindow(QtWidgets.QMainWindow):
         self.band_indicators_ssb = {
             "160": self.ssb_band_160,
             "80": self.ssb_band_80,
+            "60": self.ssb_band_60,
             "40": self.ssb_band_40,
             "20": self.ssb_band_20,
+            "17": self.ssb_band_17,
             "15": self.ssb_band_15,
+            "12": self.ssb_band_12,
             "10": self.ssb_band_10,
             "6": self.ssb_band_6,
+            "4": self.ssb_band_4,
             "2": self.ssb_band_2,
             "1.25": self.ssb_band_125,
             "70cm": self.ssb_band_70cm,
@@ -443,11 +492,16 @@ class MainWindow(QtWidgets.QMainWindow):
         self.band_indicators_rtty = {
             "160": self.rtty_band_160,
             "80": self.rtty_band_80,
+            "60": self.rtty_band_60,
             "40": self.rtty_band_40,
+            "30": self.rtty_band_30,
             "20": self.rtty_band_20,
+            "17": self.rtty_band_17,
             "15": self.rtty_band_15,
+            "12": self.rtty_band_12,
             "10": self.rtty_band_10,
             "6": self.rtty_band_6,
+            "4": self.rtty_band_4,
             "2": self.rtty_band_2,
             "1.25": self.rtty_band_125,
             "70cm": self.rtty_band_70cm,
@@ -2432,19 +2486,6 @@ class MainWindow(QtWidgets.QMainWindow):
         except (IOError, TypeError, ValueError) as exception:
             logger.critical("Error: %s", exception)
 
-        # self.look_up = None
-        # if self.pref.get("useqrz"):
-        #     self.look_up = QRZlookup(
-        #         self.pref.get("lookupusername"),
-        #         self.pref.get("lookuppassword"),
-        #     )
-
-        # if self.pref.get("usehamqth"):
-        #     self.look_up = HamQTH(
-        #         self.pref.get("lookupusername"),
-        #         self.pref.get("lookuppassword"),
-        #     )
-
         if self.pref.get("run_state"):
             self.radioButton_run.setChecked(True)
         else:
@@ -2493,6 +2534,7 @@ class MainWindow(QtWidgets.QMainWindow):
         except (RuntimeError, AttributeError):
             ...
 
+        self.rig_control = None
         self.fldigi_util = FlDigi_Comm()
 
         if self.pref.get("useflrig", False):
@@ -2563,7 +2605,18 @@ class MainWindow(QtWidgets.QMainWindow):
 
         # If bands list is empty fill it with HF.
         if self.pref.get("bands", []) == []:
-            self.pref["bands"] = ["160", "80", "40", "20", "15", "10"]
+            self.pref["bands"] = [
+                "160",
+                "80",
+                "60",
+                "40",
+                "30",
+                "20",
+                "17",
+                "15",
+                "12",
+                "10",
+            ]
 
         # Hide all the bands and then show only the wanted bands.
         for _indicator in [
@@ -2981,13 +3034,12 @@ 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:
-                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)
+            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)
             band = getband(str(self.radio_state.get("vfoa", "0.0")))
             self.set_band_indicator(band)
             self.set_window_title()
@@ -2996,11 +3048,10 @@ class MainWindow(QtWidgets.QMainWindow):
             return
         if mode == "RTTY":
             self.setmode("RTTY")
-            if self.rig_control:
-                if self.rig_control.online:
-                    self.rig_control.set_mode("RTTY")
-                else:
-                    self.radio_state["mode"] = "RTTY"
+            if self.rig_control and self.rig_control.online:
+                self.rig_control.set_mode("RTTY")
+            else:
+                self.radio_state["mode"] = "RTTY"
             band = getband(str(self.radio_state.get("vfoa", "0.0")))
             self.set_band_indicator(band)
             self.set_window_title()
@@ -3220,9 +3271,8 @@ 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.rig_control and self.rig_control.online:
+            self.rig_control.get_modes()
 
         if self.radio_state.get("mode") != mode:
             info_dirty = True
@@ -3236,7 +3286,19 @@ class MainWindow(QtWidgets.QMainWindow):
             self.setmode(mode)
         if mode == "LSB" or mode == "USB":
             self.setmode("SSB")
-        if mode == "RTTY":
+        if mode in (
+            "RTTY",
+            "RTTY-R",
+            "LSB-D",
+            "USB-D",
+            "AM-D",
+            "FM-D",
+            "DIGI-U",
+            "DIGI-L",
+            "RTTYR",
+            "PKTLSB",
+            "PKTUSB",
+        ):
             self.setmode("RTTY")
 
         if info_dirty:

not1mm/data/configuration.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>703</width>
-    <height>395</height>
+    <height>443</height>
    </rect>
   </property>
   <property name="font">
@@ -41,7 +41,7 @@
       <enum>Qt::LayoutDirection::LeftToRight</enum>
      </property>
      <property name="orientation">
-      <enum>Qt::Orientation::Horizontal</enum>
+      <enum>Qt::Horizontal</enum>
      </property>
      <property name="standardButtons">
       <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Save</set>
@@ -300,7 +300,7 @@
        <item row="2" column="0">
         <spacer name="horizontalSpacer">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -313,7 +313,7 @@
        <item row="2" column="6">
         <spacer name="horizontalSpacer_2">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -343,7 +343,7 @@
        <item row="3" column="0">
         <spacer name="verticalSpacer_4">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -379,7 +379,7 @@
        <item row="0" column="0">
         <spacer name="verticalSpacer_5">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -432,7 +432,7 @@
          <item>
           <spacer name="horizontalSpacer_4">
            <property name="orientation">
-            <enum>Qt::Orientation::Horizontal</enum>
+            <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -527,7 +527,7 @@
          <item>
           <spacer name="horizontalSpacer_3">
            <property name="orientation">
-            <enum>Qt::Orientation::Horizontal</enum>
+            <enum>Qt::Horizontal</enum>
            </property>
            <property name="sizeHint" stdset="0">
             <size>
@@ -542,7 +542,7 @@
        <item row="2" column="1" colspan="3">
         <spacer name="verticalSpacer_2">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -573,7 +573,7 @@
        <item row="0" column="2">
         <spacer name="verticalSpacer">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -604,7 +604,7 @@
        <item row="4" column="0" colspan="4">
         <spacer name="verticalSpacer_3">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -695,7 +695,7 @@
        <item row="2" column="0">
         <spacer name="horizontalSpacer_5">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -805,7 +805,7 @@
        <item row="2" column="4">
         <spacer name="horizontalSpacer_6">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -825,7 +825,7 @@
        <item row="5" column="0">
         <spacer name="horizontalSpacer_7">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -838,7 +838,7 @@
        <item row="6" column="1">
         <spacer name="verticalSpacer_7">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -851,7 +851,7 @@
        <item row="5" column="4">
         <spacer name="horizontalSpacer_11">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -864,7 +864,7 @@
        <item row="5" column="3">
         <spacer name="horizontalSpacer_9">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -877,7 +877,7 @@
        <item row="5" column="5">
         <spacer name="horizontalSpacer_10">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -890,7 +890,7 @@
        <item row="5" column="1">
         <spacer name="horizontalSpacer_8">
          <property name="orientation">
-          <enum>Qt::Orientation::Horizontal</enum>
+          <enum>Qt::Horizontal</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -903,7 +903,7 @@
        <item row="0" column="1">
         <spacer name="verticalSpacer_6">
          <property name="orientation">
-          <enum>Qt::Orientation::Vertical</enum>
+          <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
@@ -1499,84 +1499,119 @@
        <string>Bands</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_9">
-       <item row="1" column="1">
-        <widget class="QCheckBox" name="activate_2m">
+       <item row="0" column="0">
+        <widget class="QCheckBox" name="activate_160m">
          <property name="text">
-          <string>2M</string>
+          <string>160M</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="1">
-        <widget class="QCheckBox" name="activate_1dot25">
+       <item row="1" column="0">
+        <widget class="QCheckBox" name="activate_80m">
          <property name="text">
-          <string>1.25M</string>
+          <string>80M</string>
          </property>
         </widget>
        </item>
        <item row="2" column="0">
-        <widget class="QCheckBox" name="activate_40m">
+        <widget class="QCheckBox" name="activate_60m">
          <property name="text">
-          <string>40M</string>
+          <string>60M</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QCheckBox" name="activate_80m">
+       <item row="3" column="0">
+        <widget class="QCheckBox" name="activate_40m">
          <property name="text">
-          <string>80M</string>
+          <string>40M</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="0">
-        <widget class="QCheckBox" name="activate_160m">
+       <item row="4" column="0">
+        <widget class="QCheckBox" name="activate_30m">
          <property name="text">
-          <string>160M</string>
+          <string>30M</string>
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
-        <widget class="QCheckBox" name="activate_6m">
+       <item row="5" column="0">
+        <widget class="QCheckBox" name="activate_20m">
          <property name="text">
-          <string>6M</string>
+          <string>20M</string>
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QCheckBox" name="activate_20m">
+       <item row="6" column="0">
+        <widget class="QCheckBox" name="activate_17m">
          <property name="text">
-          <string>20M</string>
+          <string>17M</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="0">
+       <item row="7" column="0">
         <widget class="QCheckBox" name="activate_15m">
          <property name="text">
           <string>15M</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="0">
+       <item row="9" column="0">
+        <widget class="QCheckBox" name="activate_12m">
+         <property name="text">
+          <string>12M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
         <widget class="QCheckBox" name="activate_10m">
          <property name="text">
           <string>10M</string>
          </property>
         </widget>
        </item>
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="activate_6m">
+         <property name="text">
+          <string>6M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1">
+        <widget class="QCheckBox" name="activate_4m">
+         <property name="text">
+          <string>4M</string>
+         </property>
+        </widget>
+       </item>
        <item row="3" column="1">
+        <widget class="QCheckBox" name="activate_2m">
+         <property name="text">
+          <string>2M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="1">
+        <widget class="QCheckBox" name="activate_1dot25">
+         <property name="text">
+          <string>1.25M</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="1">
         <widget class="QCheckBox" name="activate_70cm">
          <property name="text">
           <string>70cm</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="1">
+       <item row="6" column="1">
         <widget class="QCheckBox" name="activate_33cm">
          <property name="text">
           <string>33cm</string>
          </property>
         </widget>
        </item>
-       <item row="5" column="1">
+       <item row="7" column="1">
         <widget class="QCheckBox" name="activate_23cm">
          <property name="text">
           <string>23cm</string>

not1mm/data/main.ui

@@ -99,7 +99,7 @@
            <item>
             <widget class="QLabel" name="cw_band_160">
              <property name="accessibleName">
-              <string>160 c w</string>
+              <string>160</string>
              </property>
              <property name="text">
               <string>160</string>
@@ -119,6 +119,16 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="cw_band_60">
+             <property name="text">
+              <string>60</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignmentFlag::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QLabel" name="cw_band_40">
              <property name="text">
@@ -129,6 +139,16 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="cw_band_30">
+             <property name="text">
+              <string>30</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignmentFlag::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QLabel" name="cw_band_20">
              <property name="text">
@@ -139,6 +159,16 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="cw_band_17">
+             <property name="text">
+              <string>17</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignmentFlag::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QLabel" name="cw_band_15">
              <property name="text">
@@ -149,6 +179,16 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="cw_band_12">
+             <property name="text">
+              <string>12</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignmentFlag::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QLabel" name="cw_band_10">
              <property name="text">
@@ -169,6 +209,16 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="cw_band_4">
+             <property name="text">
+              <string>4</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignmentFlag::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QLabel" name="cw_band_2">
              <property name="text">
@@ -292,6 +342,16 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="ssb_band_60">
+             <property name="text">
+              <string>60</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignmentFlag::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QLabel" name="ssb_band_40">
              <property name="text">
@@ -312,6 +372,16 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="ssb_band_17">
+             <property name="text">
+              <string>17</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignmentFlag::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QLabel" name="ssb_band_15">
              <property name="text">
@@ -322,6 +392,16 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="ssb_band_12">
+             <property name="text">
+              <string>12</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignmentFlag::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QLabel" name="ssb_band_10">
              <property name="text">
@@ -342,6 +422,16 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="ssb_band_4">
+             <property name="text">
+              <string>4</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignmentFlag::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QLabel" name="ssb_band_2">
              <property name="text">
@@ -465,6 +555,16 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="rtty_band_60">
+             <property name="text">
+              <string>60</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignmentFlag::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QLabel" name="rtty_band_40">
              <property name="text">
@@ -475,6 +575,16 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="rtty_band_30">
+             <property name="text">
+              <string>30</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignmentFlag::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QLabel" name="rtty_band_20">
              <property name="text">
@@ -485,6 +595,16 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="rtty_band_17">
+             <property name="text">
+              <string>17</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignmentFlag::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QLabel" name="rtty_band_15">
              <property name="text">
@@ -495,6 +615,16 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="rtty_band_12">
+             <property name="text">
+              <string>12</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignmentFlag::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QLabel" name="rtty_band_10">
              <property name="text">
@@ -515,6 +645,16 @@
              </property>
             </widget>
            </item>
+           <item>
+            <widget class="QLabel" name="rtty_band_4">
+             <property name="text">
+              <string>4</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignmentFlag::AlignCenter</set>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QLabel" name="rtty_band_2">
              <property name="text">
@@ -638,6 +778,12 @@
                </item>
                <item>
                 <widget class="QLineEdit" name="sent">
+                 <property name="minimumSize">
+                  <size>
+                   <width>60</width>
+                   <height>0</height>
+                  </size>
+                 </property>
                  <property name="font">
                   <font>
                    <family>JetBrains Mono ExtraLight</family>
@@ -673,6 +819,12 @@
                </item>
                <item>
                 <widget class="QLineEdit" name="receive">
+                 <property name="minimumSize">
+                  <size>
+                   <width>60</width>
+                   <height>0</height>
+                  </size>
+                 </property>
                  <property name="font">
                   <font>
                    <family>JetBrains Mono ExtraLight</family>

not1mm/lib/ham_utility.py

@@ -99,6 +99,8 @@ def getband(freq: str) -> str:
             return "10"
         if 54000000 > frequency > 50000000:
             return "6"
+        if 70500000 > frequency > 70000000:
+            return "4"
         if 148000000 > frequency > 144000000:
             return "2"
         if 225000000 > frequency > 222000000:
@@ -143,6 +145,8 @@ def get_logged_band(freq: str) -> str:
             return "28"
         if 54000000 > frequency > 50000000:
             return "50"
+        if 70500000 > frequency > 70000000:
+            return "70"
         if 148000000 > frequency > 144000000:
             return "144"
         if 225000000 > frequency > 222000000:
@@ -249,6 +253,7 @@ def fakefreq(band: str, mode: str) -> str:
         "12": ["24911", "24920", "24970"],
         "10": ["28065", "28070", "28400"],
         "6": ["50030", "50300", "50125"],
+        "4": ["70030", "70300", "70125"],
         "2": ["144030", "144144", "144250"],
         "222": ["222100", "222070", "222100"],
         "432": ["432070", "432200", "432100"],

not1mm/lib/settings.py

@@ -79,9 +79,7 @@ class Settings(QtWidgets.QDialog):
         self.n1mm_lookupport.setText(str(self.preference.get("n1mm_lookupport", "")))
         self.n1mm_scoreport.setText(str(self.preference.get("n1mm_scoreport", "")))
         self.send_n1mm_radio.setChecked(bool(self.preference.get("send_n1mm_radio")))
-        self.send_n1mm_contact.setChecked(
-            bool(self.preference.get("send_n1mm_contact"))
-        )
+        self.send_n1mm_contact.setChecked(bool(self.preference.get("send_n1mm_contact")))
         self.send_n1mm_lookup.setChecked(bool(self.preference.get("send_n1mm_lookup")))
         self.send_n1mm_score.setChecked(bool(self.preference.get("send_n1mm_score")))
 
@@ -96,15 +94,18 @@ class Settings(QtWidgets.QDialog):
             self.cluster_mode.setCurrentIndex(index)
         self.activate_160m.setChecked(bool("160" in self.preference.get("bands", [])))
         self.activate_80m.setChecked(bool("80" in self.preference.get("bands", [])))
+        self.activate_60m.setChecked(bool("60" in self.preference.get("bands", [])))
         self.activate_40m.setChecked(bool("40" in self.preference.get("bands", [])))
+        self.activate_30m.setChecked(bool("30" in self.preference.get("bands", [])))
         self.activate_20m.setChecked(bool("20" in self.preference.get("bands", [])))
+        self.activate_17m.setChecked(bool("17" in self.preference.get("bands", [])))
         self.activate_15m.setChecked(bool("15" in self.preference.get("bands", [])))
+        self.activate_12m.setChecked(bool("12" in self.preference.get("bands", [])))
         self.activate_10m.setChecked(bool("10" in self.preference.get("bands", [])))
         self.activate_6m.setChecked(bool("6" in self.preference.get("bands", [])))
+        self.activate_4m.setChecked(bool("4" in self.preference.get("bands", [])))
         self.activate_2m.setChecked(bool("2" in self.preference.get("bands", [])))
-        self.activate_1dot25.setChecked(
-            bool("1.25" in self.preference.get("bands", []))
-        )
+        self.activate_1dot25.setChecked(bool("1.25" in self.preference.get("bands", [])))
         self.activate_70cm.setChecked(bool("70cm" in self.preference.get("bands", [])))
         self.activate_33cm.setChecked(bool("33cm" in self.preference.get("bands", [])))
         self.activate_23cm.setChecked(bool("23cm" in self.preference.get("bands", [])))
@@ -166,16 +167,26 @@ class Settings(QtWidgets.QDialog):
             bandlist.append("160")
         if self.activate_80m.isChecked():
             bandlist.append("80")
+        if self.activate_60m.isChecked():
+            bandlist.append("60")
         if self.activate_40m.isChecked():
             bandlist.append("40")
+        if self.activate_30m.isChecked():
+            bandlist.append("30")
         if self.activate_20m.isChecked():
             bandlist.append("20")
+        if self.activate_17m.isChecked():
+            bandlist.append("17")
         if self.activate_15m.isChecked():
             bandlist.append("15")
+        if self.activate_12m.isChecked():
+            bandlist.append("12")
         if self.activate_10m.isChecked():
             bandlist.append("10")
         if self.activate_6m.isChecked():
             bandlist.append("6")
+        if self.activate_4m.isChecked():
+            bandlist.append("4")
         if self.activate_2m.isChecked():
             bandlist.append("2")
         if self.activate_1dot25.isChecked():

not1mm/lib/version.py

@@ -1,3 +1,3 @@
 """It's the version"""
 
-__version__ = "24.9.25"
+__version__ = "24.9.28"

not1mm/plugins/general_logging.py

@@ -19,6 +19,7 @@ columns = [
     "YYYY-MM-DD HH:MM:SS",
     "Call",
     "Freq",
+    "Mode",
     "Snt",
     "Rcv",
     "Name",

not1mm/radio.py

@@ -90,30 +90,39 @@ class Radio(QObject):
             self.cat.sendcw(texttosend)
 
     def set_vfo(self, vfo):
+        self.vfoa = vfo
+
         if self.cat:
             self.cat.set_vfo(vfo)
-        self.vfoa = vfo
-        self.poll_callback.emit(
-            {
-                "vfoa": self.vfoa,
-                "mode": self.mode,
-                "bw": self.bw,
-                "online": self.online,
-            }
-        )
+        try:
+            self.poll_callback.emit(
+                {
+                    "vfoa": self.vfoa,
+                    "mode": self.mode,
+                    "bw": self.bw,
+                    "online": self.online,
+                }
+            )
+        except RuntimeError:
+            ...
 
     def set_mode(self, mode):
+        self.mode = mode
+
         if self.cat:
             self.cat.set_mode(mode)
-        self.mode = mode
-        self.poll_callback.emit(
-            {
-                "vfoa": self.vfoa,
-                "mode": self.mode,
-                "bw": self.bw,
-                "online": self.online,
-            }
-        )
+
+        try:
+            self.poll_callback.emit(
+                {
+                    "vfoa": self.vfoa,
+                    "mode": self.mode,
+                    "bw": self.bw,
+                    "online": self.online,
+                }
+            )
+        except RuntimeError:
+            ...
 
     def get_modes(self):
         return self.modes

not1mm/test.py

@@ -31,10 +31,17 @@
 # from not1mm.radio import Radio
 from not1mm.lib.cat_interface import CAT
 
+rig_control = None
+
+print(f"{rig_control and rig_control.online}")
+
 rig_control = CAT("rigctld", "127.0.0.1", 4532)
 
+print(f"{rig_control and rig_control.online}")
+
 modes = rig_control.get_mode_list()
+mode = rig_control.get_mode()
 vfo = rig_control.get_vfo()
 
 print(f"{modes=}\n")
-print(f"{vfo=}")
+print(f"{vfo=} {mode=}")

{not1mm-24.9.25.dist-info → not1mm-24.9.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: not1mm
-Version: 24.9.25
+Version: 24.9.28
 Summary: NOT1MM Logger
 Author-email: Michael Bridak <michael.bridak@gmail.com>
 Project-URL: Homepage, https://github.com/mbridak/not1mm
@@ -230,6 +230,8 @@ generated, 'cause I'm lazy, list of those who've submitted PR's.
 
 ## Recent Changes
 
+- [24-9-28] Fixed crash with CAT None, Display tweek. Refactored a couple conditionals.
+- [24-9-25-1] Added WARC and 4M bands.
 - [24-9-25] Fix QRZ lookup crash on non-existant call.
 - [24-9-24] Correct crash in CWT.
 - [24-9-23] Improved serial interface to rigctld. Send RTTY macros to fldigi when radio modes are RTTY, USB-D, LSB-D, PKTLSB, PKTUSB, DIGI-U, DIGI-L.

{not1mm-24.9.25.dist-info → not1mm-24.9.28.dist-info}/RECORD

@@ -1,12 +1,12 @@
 not1mm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-not1mm/__main__.py,sha256=Gcdrf7vz0HMZqw8aZ__NTBb-grl3nzzApXcu1TlsR-g,127162
+not1mm/__main__.py,sha256=OfJVg-K9ej-huBPzrTaY0wcRBNiLnvzhjelFx0T7nEY,129231
 not1mm/bandmap.py,sha256=1b5tXCfGTnpqqn6hPNt7zRA8SmuwSXzSwNHZXhCRt70,31434
 not1mm/checkwindow.py,sha256=aI-nr8OF90IWV7R_XRdmitvBJ9M85evCs72HoU3Jnvc,10374
 not1mm/fsutils.py,sha256=ukHKxKTeNKxKwqRaJjtzRShL4X5Xl0jRBbADyy3Ifp8,1701
 not1mm/logwindow.py,sha256=pwhiwolmGnW01LF4sjlu3ywLsgfxL6KuGuKuYKYmgeY,44403
 not1mm/lookupservice.py,sha256=jsFg5tsB9cVnahLP-hI3CMwbjlEpMx944O8RLWntAy4,3342
-not1mm/radio.py,sha256=x2Oz1688uTPrq3YOwUiY3eMc4XUkkAZJpEajCKJEbwM,3479
-not1mm/test.py,sha256=b9Ro2bRdf4HOmiKQsLRk_dTm-CQLvpmnEEZq768v-ro,2299
+not1mm/radio.py,sha256=3X38i3jzZG9D1QN7p4pYZpMzRz6xyuWuN8rxLK3UNik,3662
+not1mm/test.py,sha256=HI1lUcKncR-5QXpBuepliRc4HYSSOcwZJWXrP6yjXb8,2453
 not1mm/vfo.py,sha256=IvmUQYMIPzLJw_BHQGis4J_IEW-vlBtdfxZLXPh7OzI,12335
 not1mm/voice_keying.py,sha256=sA3gw5_k7kShTg2qhG7HkKDM5M6KheJVRkAc_C7mxDk,3006
 not1mm/data/JetBrainsMono-ExtraLight.ttf,sha256=g5Hn7BPounWMGDj1a8zZcyKMz03HSqW__pUluRR7Evg,274144
@@ -16,7 +16,7 @@ not1mm/data/alpha bravo charlie delta.txt,sha256=d5QMmSWEUAe4Rj1XbNjTPLa_5Be4Se6
 not1mm/data/bandmap.ui,sha256=hvovf1YKyfUVVbKl6Ib2zU4RdUrFsQwm-255wVeKXZE,7180
 not1mm/data/check.png,sha256=UvFOLr8V-79qnjW8wUaGItXk_OSP8m8hqPevs8NDlFY,387
 not1mm/data/checkwindow.ui,sha256=Ux5EgO-JalGB9qx3M6tmMpGHO0RmuuY1w0XEbuwd1xk,4658
-not1mm/data/configuration.ui,sha256=qe6QeDmzhhAg2PuUgFZv1mINKFcuMXSMVK53o8mTcDo,52712
+not1mm/data/configuration.ui,sha256=L3gZPd_qaAntVIojUktJXSj6dAAs9NNWLgzxdaWEZBE,53488
 not1mm/data/contests.sql,sha256=4hmJCDvrbxnA_Y5S4T5o52TZieeFk6QUwFerwlFePNA,89307
 not1mm/data/cty.json,sha256=sBIN1raQOKeVIO5dRaWn0Yqq8XZKpM_VCzS3kMlcwp4,4871545
 not1mm/data/cwmacros.txt,sha256=PvJ7TxGILq-ErHb6Gbrm-08x76BbCdXb8AY8a7st5mg,451
@@ -30,7 +30,7 @@ not1mm/data/k6gte.not1mm-32.png,sha256=XdTsCa3xqwTfn26Ga7RwO_Vlbg_77RKkSc8bMxVcC
 not1mm/data/k6gte.not1mm-64.png,sha256=6ku45Gq1g5ezh04F07osoKRtanb3e4kbx5XdIEh3N90,2925
 not1mm/data/logwindow.ui,sha256=f7vULj96tHIQuR1nJMyvPHHcmVgzkhv9D1isyojsnFU,1458
 not1mm/data/logwindowx.ui,sha256=CwpI-h7cI1yqyldH9quKftsdHL5lTyL9ABOcf80nfqc,1632
-not1mm/data/main.ui,sha256=EcOuLDTjI5PKbMy2hNthdC5Xnle5mWPncimiakQRulE,56858
+not1mm/data/main.ui,sha256=IOrAJfJDhG30bWi08pLBGzDKjBvjKfPNI9-GNpvu0vI,61886
 not1mm/data/new_contest.ui,sha256=jR_bQMvsKgqD3az9iNS2fvPSs3WTf_phs5JXp1Ra8nA,23008
 not1mm/data/not1mm.html,sha256=c9-mfjMwDt4f5pySUruz2gREW33CQ2_rCddM2z5CZQo,23273
 not1mm/data/opon.ui,sha256=QDicqAk2lORG2UWsHa6jHlsGn6uzrrI2R4HSAocpPes,2258
@@ -104,7 +104,7 @@ not1mm/lib/edit_station.py,sha256=doL21Hs6jzIE43ohAopdFt_iqnRJZHFcqzcnCS0-iio,19
 not1mm/lib/fldigi_sendstring.py,sha256=EeXSBRKgyUEzNyHBjMtHiFe-iOU3TcWcCCX77t0ur_I,602
 not1mm/lib/fldigi_watcher.py,sha256=reZz3fZLDoJVVZhJD9nIssk2aczCzadDSQTVu-5mTCM,919
 not1mm/lib/ft8_watcher.py,sha256=BFmVIsnbwuRMWoe-dIBybuCgi0WFmr8Km0O9l4eiwMM,4624
-not1mm/lib/ham_utility.py,sha256=uRErxCxZr8dfxzekPyett0e_BABDVOCvSUUTzXq6ctE,11790
+not1mm/lib/ham_utility.py,sha256=WMmYLDI_fJHHsn0wkpGVit2Hv8fo6r9ybexXROia8Cg,11967
 not1mm/lib/lookup.py,sha256=_Awt1HjiuSrhLTrwoF8EoFQC_bYYH1vqfAo_HSaMb00,10838
 not1mm/lib/multicast.py,sha256=bnFUNHyy82GmIb3_88EPBVVssj7-HzkJPaH671cK8Qw,3249
 not1mm/lib/n1mm.py,sha256=H54mpgJF0GAmKavM-nb5OAq2SJFWYkux4eMWWiSRxJc,6288
@@ -112,9 +112,9 @@ not1mm/lib/new_contest.py,sha256=IznTDMq7yXHB6zBoGUEC_WDYPCPpsSZW4wwMJi16zK0,816
 not1mm/lib/playsound.py,sha256=kxkcitBFbZCXJ2wxQ1lxg4rBwfxiSpuNpJSXHOPCoXA,9241
 not1mm/lib/plugin_common.py,sha256=HbphFFzU1XIIHgsCHOb_tCAnQyqT-nYnxoiz1oZ2_cg,9623
 not1mm/lib/select_contest.py,sha256=WsptLuwkouIHeocJL3oZ6-eUfEnhpwdc-x7eMZ_TIVM,359
-not1mm/lib/settings.py,sha256=MWiKXbasaFbzeHTjfzTaTqbCBrIijudP_-0a5jNmUAA,9265
+not1mm/lib/settings.py,sha256=0Su8BQM4haVhc_P74q8UhzRZxtgWhM40UmVtQdMJQeM,10022
 not1mm/lib/super_check_partial.py,sha256=p5l3u2ZOCBtlWgbvskC50FpuoaIpR07tfC6zTdRWbh4,2334
-not1mm/lib/version.py,sha256=3IDWkTF3EBhk8uoghldqAuHwDQBEMQO5xxZ1pNr6ifQ,48
+not1mm/lib/version.py,sha256=xJwA0FCG5-fYglNvxnhp4t5R1Y5yj0T8ddodCCyOGME,48
 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
@@ -140,7 +140,7 @@ not1mm/plugins/cq_ww_cw.py,sha256=m4Xkqb_qFyXWEgkxqbanvtiCTvI8NNPKNXzHgFZzhnE,12
 not1mm/plugins/cq_ww_rtty.py,sha256=RK7xmZN3f_7Pk1bFKXvqEQd1NAsoJFO-xuhLrtp0qhw,16279
 not1mm/plugins/cq_ww_ssb.py,sha256=hZwG88-hPLmwIGXHX_S_ty8Nhn1kIuPjSuTRpCWoN9g,12631
 not1mm/plugins/cwt.py,sha256=k5yX_2Ma_arVxzDP2E9mwA08LUVFLOk8vUpHwHt2aGA,12777
-not1mm/plugins/general_logging.py,sha256=t02xtJs601qRICGdrvLs3G9y4GCG9H4AgQNkgA18CYs,3467
+not1mm/plugins/general_logging.py,sha256=n-2es7erqK1ptwq_wwIKIwktptKN7ra2eWjAQlpXUac,3479
 not1mm/plugins/helvetia.py,sha256=6aOO4uiLzFFgHA-A3xz6IRdCJpqPOAm0egKxP5Y_Ie0,15432
 not1mm/plugins/iaru_fieldday_r1_cw.py,sha256=B_kh8d8LkC0va_iIiIzImOKAT8724yf9ceF-2eQdx1w,13301
 not1mm/plugins/iaru_fieldday_r1_ssb.py,sha256=5hIL60cfGBzVlb70XFtI3OeGZT2966LoryTgKK6kDEc,13306
@@ -156,9 +156,9 @@ not1mm/plugins/ref_cw.py,sha256=aWjHHkqIKutjRUtzh09y5haFfnZK9poRQDWRQMDRxxU,1632
 not1mm/plugins/stew_perry_topband.py,sha256=CKBQbYl4ETxhXJd2dma4fg_C5pag_s7Nf61SCztZtqE,10668
 not1mm/plugins/weekly_rtty.py,sha256=DQcy3SY0Zn56EdlYGf3NxrRhTnkNa5IqRQPRQdKDSPs,14255
 not1mm/plugins/winter_field_day.py,sha256=4rcfRtobwjHO6BNL3WOTHzBmyyeuX79BNGBG8PfjrI8,10238
-not1mm-24.9.25.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-not1mm-24.9.25.dist-info/METADATA,sha256=Z196wUpIUL2P5x2CyP62QeliPUba55Bj9o-USjdddRk,31512
-not1mm-24.9.25.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-not1mm-24.9.25.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
-not1mm-24.9.25.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
-not1mm-24.9.25.dist-info/RECORD,,
+not1mm-24.9.28.dist-info/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+not1mm-24.9.28.dist-info/METADATA,sha256=DFYxDeIDI6L48rN6I73typUeVY5aRBh2ryaSTbvSwTo,31639
+not1mm-24.9.28.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+not1mm-24.9.28.dist-info/entry_points.txt,sha256=pMcZk_0dxFgLkcUkF0Q874ojpwOmF3OL6EKw9LgvocM,47
+not1mm-24.9.28.dist-info/top_level.txt,sha256=0YmTxEcDzQlzXub-lXASvoLpg_mt1c2thb5cVkDf5J4,7
+not1mm-24.9.28.dist-info/RECORD,,