sdev 0.4.1__tar.gz → 0.4.2__tar.gz

{sdev-0.4.1/sdev.egg-info → sdev-0.4.2}/PKG-INFO

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

{sdev-0.4.1 → sdev-0.4.2}/pyproject.toml

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

{sdev-0.4.1 → sdev-0.4.2}/sdev/__init__.py

@@ -14,7 +14,7 @@ from typing import Literal
 from .core import SerialDevice
 from .class_wrapper import Demoboard, Relay
 
-__version__ = "0.4.1"
+__version__ = "0.4.2"
 __author__ = "klrc"
 __email__ = "1440698245@qq.com"
 

{sdev-0.4.1 → sdev-0.4.2}/sdev/class_wrapper.py

@@ -21,6 +21,10 @@ class Demoboard(SerialDevice):
     - 提供 shell() / check_alive() 等高层方法。
     """
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.check_alive()
+
     def shell(
         self,
         cmd: str,
@@ -35,20 +39,14 @@ class Demoboard(SerialDevice):
         self,
         *,
         uboot_flag: str = "uboot#",
-        awaken_flag: str = "Process",
         prompt_flag: str = " #",
-        ctrl_c_timeout: float = 5.0,
-        reboot_timeout: float = 120.0,
-        prompt_timeout: float = 60.0,
+        response_timeout: float = 3,
     ) -> None:
         _check_alive_func(
             self,
             uboot_flag=uboot_flag,
-            awaken_flag=awaken_flag,
             prompt_flag=prompt_flag,
-            ctrl_c_timeout=ctrl_c_timeout,
-            reboot_timeout=reboot_timeout,
-            prompt_timeout=prompt_timeout,
+            response_timeout=response_timeout,
         )
 
 
@@ -64,3 +62,4 @@ class Relay(SerialDevice):
 
 
 __all__ = ["Demoboard", "Relay"]
+

{sdev-0.4.1 → sdev-0.4.2}/sdev/demoboard/functional.py

@@ -85,13 +85,9 @@ def shell(
 
 def check_alive(
     device: SerialDevice,
-    *,
     uboot_flag: str = "uboot#",
-    awaken_flag: str = "Process",
     prompt_flag: str = " #",
-    ctrl_c_timeout: float = 5.0,
-    reboot_timeout: float = 120.0,
-    prompt_timeout: float = 60.0,
+    response_timeout: float = 3,    
 ) -> None:
     """
     检查 demoboard 是否「醒着」且有 shell 提示符。
@@ -102,33 +98,41 @@ def check_alive(
     2. 若在 U-Boot：
        - 发送 "reboot"；
        - 等待 awaken_flag（如 "Process ... done" 中的 "Process"）出现，超时则抛 TimeoutError；
-    3. 最后，无论是否经过 reboot，统一等待 shell 提示符 prompt_flag（如 " #"），超时抛 TimeoutError。
+    3. 最后，无论是否经过 reboot，统一等待 shell 提示符 prompt_flag（如 "#"），超时抛 TimeoutError。
     """
-    # 1. 发送 Ctrl-C 探测状态
-    try:
-        # 尝试通过 Ctrl-C 获取响应
-        lines = shell(device, CTRL_C, prompt_flag=prompt_flag, timeout=ctrl_c_timeout)
-    except TimeoutError:
-        # 如果超时，说明可能正在启动或者完全没响应，尝试盲发 Ctrl-C 并等待
-        device.send(CTRL_C)
-        lines = list(device.scan(end_flag=None, timeout=ctrl_c_timeout))
-
-    # 2. 检查是否在 U-Boot
-    is_uboot = any(uboot_flag in line for line in lines)
-    if is_uboot:
-        logger.warning(f"Device is in U-Boot (matched {uboot_flag!r}), rebooting...")
-        device.send("reboot")
-        # 等待系统开始启动（出现 awaken_flag）
-        list(device.scan(end_flag=awaken_flag, timeout=reboot_timeout))
-        logger.info("Reboot signal detected, waiting for system to boot...")
-
-    # 3. 统一等待最终提示符
+
+    # 1. Ctrl-C，判定控制台是否响应
+    under_reboot = False
     try:
-        list(device.scan(end_flag=prompt_flag, timeout=prompt_timeout))
-        logger.info(f"Device is alive (matched prompt {prompt_flag!r})")
+        lines = shell(device, CTRL_C, prompt_flag, timeout=response_timeout)
     except TimeoutError:
-        logger.error(f"Timed out waiting for prompt {prompt_flag!r}")
-        raise
+        wait_iter = 0
+        while True:
+            device.send(CTRL_C)
+            lines = shell(device, None, None, timeout=response_timeout, clear=False)
+            if len(lines) > 0:
+                under_reboot = True
+                break
+            wait_iter += 1
+            if wait_iter > 5:
+                logger.warning("CTRL-C test failed, please check the connection")
+                break
+
+    # 2. 检查是否被中止进入uboot
+    for line in lines:
+        if uboot_flag in line:
+            logger.warning("uboot flag found, rebooting")
+            device.send("reboot")
+            under_reboot = True
+            break
+
+    # 3. 进入启动流程
+    if under_reboot:
+        try:
+            lines = shell(device, None, None, timeout=response_timeout)
+        except TimeoutError:
+            pass  # 等待启动彻底完成
+        return check_alive(device, uboot_flag, prompt_flag, response_timeout)
 
 
 if __name__ == "__main__":

{sdev-0.4.1 → sdev-0.4.2/sdev.egg-info}/PKG-INFO

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

{sdev-0.4.1 → sdev-0.4.2}/setup.py

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