sdev 0.6.2__tar.gz → 0.6.3__tar.gz

{sdev-0.6.2/sdev.egg-info → sdev-0.6.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdev
-Version: 0.6.2
+Version: 0.6.3
 Summary: 串口控制器工具包
 Home-page: https://github.com/klrc/sdev
 Author: klrc

{sdev-0.6.2 → sdev-0.6.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sdev"
-version = "0.6.2"
+version = "0.6.3"
 description = "串口控制器工具包"
 readme = "README.md"
 license = {text = "MIT"}

{sdev-0.6.2 → sdev-0.6.3}/sdev/__init__.py

@@ -10,7 +10,7 @@ from __future__ import annotations
 from .models import Demoboard
 from .remote import any_device
 
-__version__ = "0.6.2"
+__version__ = "0.6.3"
 __author__ = "klrc"
 __email__ = "1440698245@qq.com"
 

{sdev-0.6.2 → sdev-0.6.3}/sdev/cli/cli_wrapper.py

@@ -382,6 +382,8 @@ def cmd_shell(args: argparse.Namespace) -> int:
 
     # 若未显式指定 --timeout，则默认等待 60 秒，避免长命令过早被认为超时。
     effective_timeout: Optional[float] = args.timeout if args.timeout is not None else 60.0
+    # Ctrl-C / 超时后的「收尾」等待不需要这么久，单独使用较短的间隔。
+    interrupt_timeout: Optional[float] = min(effective_timeout, 5.0) if effective_timeout is not None else 5.0
 
     with Demoboard(port, baudrate, host=host) as board:
         try:
@@ -392,13 +394,19 @@ def cmd_shell(args: argparse.Namespace) -> int:
             try:
                 board.send_interrupt()
                 # 不再发送新命令，仅等待当前提示符出现作为“收尾”信号。
-                _ = board.execute_command(None, flag=args.flag, timeout=effective_timeout)
+                _ = board.execute_command(None, flag=args.flag, timeout=interrupt_timeout)
             except Exception:
                 pass
             print()  # 保证光标回到新行
             return 130  # 约定：被 Ctrl-C 中断
         except TimeoutError as e:
+            # 命令执行超时时，自动向板子发送一次 Ctrl-C，并尝试等提示符收尾。
             print(e, file=sys.stderr)
+            try:
+                board.send_interrupt()
+                _ = board.execute_command(None, flag=args.flag, timeout=interrupt_timeout)
+            except Exception:
+                pass
             return 1
         print()
         # sys.stdout.flush()

{sdev-0.6.2 → sdev-0.6.3/sdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdev
-Version: 0.6.2
+Version: 0.6.3
 Summary: 串口控制器工具包
 Home-page: https://github.com/klrc/sdev
 Author: klrc

{sdev-0.6.2 → sdev-0.6.3}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="sdev",
-    version="0.6.2",
+    version="0.6.3",
     author="klrc",
     author_email="144069824@qq.com",
     description="串口控制器工具包",