sdev 0.3.2__tar.gz → 0.3.4__tar.gz

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

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

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

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

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

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

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

@@ -49,8 +49,8 @@ class SerialDevice:
         self._display = True
         self._check_alive = check_alive
 
-        self._reboot_timeout = 20  # check_alive 时 wait_for_flag 等稳定提示符的最大秒数
-        self._check_alive_timeout = 0.5
+        self._reboot_timeout = 60  # check_alive 时 wait_for_flag 等稳定提示符的最大秒数
+        self._check_alive_timeout = 1
         self._scan_timeout = 0.1
 
     def _serial_reader(self) -> None:
@@ -131,12 +131,20 @@ class SerialDevice:
     def _echo_flag(self, line: str) -> None:
         print(f"{_GREEN}{line}{_RESET}", end="", flush=True)
 
-    def scan(self, end_flag: str, timeout: Optional[float] = None, replace_with_acc=False):
+    def scan(self, end_flag: Optional[str], timeout: Optional[float] = None, replace_with_acc=False):
         """
         从 _buffer 逐行 yield，直到出现 end_flag 或超时/None。
+        end_flag 为 None 时改为读到 timeout 就结束，此时 TimeoutError 视为正常结束（return）。
         逻辑：用 acc_cache 保留最近几行，拼成 acc_line（无换行），避免设备折行把 flag 拆到两行导致 in 判不到；
         命中时若 replace_with_acc 则 yield 整段 acc_line 加换行，否则逐行 yield cache 后 break。CTRL_C 按 _content_contains_ctrl_c 判。
         """
+        if end_flag is None:
+            try:
+                for line in self._scan(timeout):
+                    yield line
+            except TimeoutError:
+                pass
+            return
         acc_cache = []
         for line in self._scan(timeout):
             acc_cache.append(line)
@@ -152,21 +160,26 @@ class SerialDevice:
                         yield x
                 break
 
-    def scan_and_display(self, flag: str, flag_type: Literal["end_flag", "prompt"], timeout: Optional[float] = None, replace_with_acc=False):
-        """对 scan(flag) 的每一行按 flag_type 回显（end_flag 绿、prompt 青、其余灰）并 yield 该行；超时重抛。"""
+    def scan_and_display(self, flag: Optional[str], flag_type: Optional[Literal["end_flag", "prompt"]] = None, timeout: Optional[float] = None, replace_with_acc=False):
+        """对 scan(flag) 的每一行按 flag_type 回显（end_flag 绿、prompt 青、其余灰）并 yield 该行；flag/flag_type 为 None 时只灰显，flag 为 None 时超时视为正常结束。"""
         try:
             for line in self.scan(flag, timeout=timeout, replace_with_acc=replace_with_acc):
                 if self._display:
-                    find_flag = _line_matches_flag(line, flag)
-                    if find_flag:
-                        if flag_type == "end_flag":
-                            self._echo_flag(line)
-                        elif flag_type == "prompt":
-                            self._echo_prompt(line)
-                    else:
+                    if flag is None or flag_type is None:
                         self._echo_normal(line)
+                    else:
+                        find_flag = _line_matches_flag(line, flag)
+                        if find_flag:
+                            if flag_type == "end_flag":
+                                self._echo_flag(line)
+                            elif flag_type == "prompt":
+                                self._echo_prompt(line)
+                        else:
+                            self._echo_normal(line)
                 yield line
         except TimeoutError:
+            if flag is None:
+                return
             t = f"{timeout}s" if timeout is not None else "None"
             raise TimeoutError(f"scan_and_display timeout: flag={flag!r}, flag_type={flag_type!r}, timeout={t}")
 
@@ -213,26 +226,32 @@ 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
+        print("check_alive")
+        while self.is_breathing():
+            gen = self.scan_and_display(None, timeout=self._check_alive_timeout)
+            _ = list(gen)
 
-        # 测试是否能够接收ctrlc信号，若无反应, wait for boot
+        # 测试是否能够接收ctrlc信号，若无反应，等待转生
+        print("send_interrupt")
         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
+            print("wait for breathing")
+            while not self.is_breathing():
+                pass
+            print("check_alive again")
+            self.check_alive(stable_flag)
 
     def __enter__(self):
         self.connect()

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

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

{sdev-0.3.2 → sdev-0.3.4}/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.4",
     author="klrc",
     author_email="144069824@qq.com",
     description="串口控制器工具包",