sdev 0.3.2__tar.gz → 0.3.3__tar.gz

{sdev-0.3.2/sdev.egg-info → sdev-0.3.3}/PKG-INFO

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

{sdev-0.3.2 → sdev-0.3.3}/pyproject.toml

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

{sdev-0.3.2 → sdev-0.3.3}/sdev/__init__.py

@@ -6,7 +6,7 @@ Demoboard：串口连接、后台异步读、发送、按行/按 flag 读、回
 
 from .core import SerialDevice
 
-__version__ = "0.3.2"
+__version__ = "0.3.3"
 __author__ = "klrc"
 __email__ = "1440698245@qq.com"
 

{sdev-0.3.2 → sdev-0.3.3}/sdev/core.py

@@ -213,26 +213,27 @@ class SerialDevice:
         gen = self.scan_and_display(flag, "end_flag", timeout=timeout)
         _ = list(gen)
 
+    def is_breathing(self) -> bool:
+        """检查板子是否呼吸。"""
+        time.sleep(self._check_alive_timeout)
+        return self._has_output_in_buffer()
+
     def check_alive(self, stable_flag: str):
         """
         确认板子存活：有输出则 wait_for_flag(stable_flag) 后 return；否则 send_interrupt，成功则 return。
         若 send_interrupt 超时则打 warning 并轮询 _has_output_in_buffer()，有数据再 wait_for_flag 后 return；未接串口会一直循环。
         """
-        time.sleep(self._check_alive_timeout)
-        if self._has_output_in_buffer():  # 可能正在启动，等待稳定标志
-            self.wait_for_flag(stable_flag, self._reboot_timeout)
-            return
+        while self.is_breathing():
+            pass
 
-        # 测试是否能够接收ctrlc信号，若无反应, wait for boot
+        # 测试是否能够接收ctrlc信号，若无反应，等待转生
         try:
             self.send_interrupt(self._check_alive_timeout, stable_flag)
         except TimeoutError:
             logger.warning(f"请接入串口")
-            while True:
-                time.sleep(self._check_alive_timeout)
-                if self._has_output_in_buffer():
-                    self.wait_for_flag(stable_flag, self._reboot_timeout)
-                    return
+            while not self.is_breathing():
+                pass
+            self.check_alive(stable_flag)
 
     def __enter__(self):
         self.connect()

{sdev-0.3.2 → sdev-0.3.3/sdev.egg-info}/PKG-INFO

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

{sdev-0.3.2 → sdev-0.3.3}/setup.py

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