Remove broken use_timeout checkbox in serial options (#1793)

Author: mkrnr

doc/api/config.md

@@ -213,8 +213,7 @@ The number of stop bits for serial connections. 1 by default.
 ```
 
 ```{describe} timeout
-The read timeout for serial connections in seconds, may be ``None`` to
-disable read timeouts altogether. 2.0 (2 seconds) by default.
+The read timeout for serial connections in seconds. 2.0 (2 seconds) by default.
 ```
 
 ```{describe} xonxoff

news.d/bugfix/1793.ui.md

@@ -0,0 +1 @@
+Remove broken use_timeout checkbox in serial options.

plover/gui_qt/config_serial_widget.ui

@@ -237,7 +237,7 @@
            </sizepolicy>
           </property>
           <property name="text">
-           <string>Duration</string>
+           <string>Duration (s)</string>
           </property>
           <property name="buddy">
            <cstring>timeout</cstring>
@@ -266,19 +266,6 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="0" colspan="2">
-         <widget class="QCheckBox" name="use_timeout">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Use timeout</string>
-          </property>
-         </widget>
-        </item>
        </layout>
       </widget>
      </item>
@@ -419,22 +406,6 @@
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>use_timeout</sender>
-   <signal>clicked(bool)</signal>
-   <receiver>SerialWidget</receiver>
-   <slot>update_use_timeout(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>76</x>
-     <y>271</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>140</x>
-     <y>180</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>xonxoff</sender>
    <signal>clicked(bool)</signal>
@@ -491,7 +462,6 @@
   <slot>update_bytesize(QString)</slot>
   <slot>update_stopbits(QString)</slot>
   <slot>update_parity(QString)</slot>
-  <slot>update_use_timeout(bool)</slot>
   <slot>update_rtscts(bool)</slot>
   <slot>update_timeout(double)</slot>
   <slot>update_xonxoff(bool)</slot>

plover/gui_qt/machine_options.py

@@ -89,7 +89,6 @@ def _format_port(self, index):
             if not details:
                 return
             cursor.insertFrame(self._details_frame_format)
-            details_list = cursor.createList(self._details_list_format)
             for n, part in enumerate(details):
                 if n:
                     cursor.insertBlock()
@@ -140,15 +139,7 @@ def setValue(self, value):
         self.parity.setCurrentText(value["parity"])
         self.stopbits.addItems(map(str, Serial.STOPBITS))
         self.stopbits.setCurrentText(str(value["stopbits"]))
-        timeout = value["timeout"]
-        if timeout is None:
-            self.use_timeout.setChecked(False)
-            self.timeout.setValue(0.0)
-            self.timeout.setEnabled(False)
-        else:
-            self.use_timeout.setChecked(True)
-            self.timeout.setValue(timeout)
-            self.timeout.setEnabled(True)
+        self.timeout.setValue(value["timeout"])
         for setting in ("xonxoff", "rtscts"):
             widget = getattr(self, setting)
             if setting in value:
@@ -188,15 +179,6 @@ def update_stopbits(self, value):
     def update_timeout(self, value):
         self._update("timeout", value)
 
-    @Slot(bool)
-    def update_use_timeout(self, value):
-        if value:
-            timeout = self.timeout.value()
-        else:
-            timeout = None
-        self.timeout.setEnabled(value)
-        self._update("timeout", timeout)
-
     @Slot(bool)
     def update_xonxoff(self, value):
         self._update("xonxoff", value)

plover/machine/base.py

@@ -282,8 +282,15 @@ def _iter_packets(self, packet_size):
         - an incomplete packet will only be discarded if one of
           those reads return no data (but not on short read)
         """
+        if not self.serial_port:
+            log.warning("Serial port not initialized")
+            return
+
+        configured_timeout = self.serial_params.get(
+            "timeout", self.SERIAL_PARAMS["timeout"]
+        )
         self.serial_port.timeout = max(
-            self.serial_params.get("timeout", 1.0) / packet_size,
+            configured_timeout / packet_size,
             0.01,
         )
         packet = b""