Skip to content

fix(ymodem): 修正发送 ACK 重试并统一异常清理 与串口V2在控制台下使用SY失败问题 #11162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wdfk-prog wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(ymodem): 修正发送 ACK 重试并统一异常清理 与串口V2在控制台下使用SY失败问题 #11162

wdfk-prog wants to merge 2 commits into from
+153 −45

Conversation

@wdfk-prog
Copy link
Contributor

@wdfk-prog wdfk-prog commented Feb 1, 2026

拉取/合并请求描述：(PR description)

[

为什么提交这份PR (why to submit this PR)

本 PR 主要修复/增强 YMODEM 发送与会话清理流程，并调整串口 poll tx 的 CRLF 行为：

你的解决方案是什么 (what is your solution)

  • YMODEM 发送：改为循环读取文件数据，正确处理短读/EOF

  • YMODEM 会话：新增 begin/end 回调状态并统一 cleanup，避免 buf 泄漏

  • YMODEM 发送：增加 ACK 错误计数与重试逻辑

  • 串口：poll tx 不再对 console 设备做额外 CR 插入，仅在 STREAM 模式下转换

    • 此修改为了解决sy函数使用ymodem协议发送文件失败问题
    • 由于串口V2驱动框架,强制判断发送设置是控制台设备时,识别当前发送字符为\n优化发送一帧\r;导致sy 一帧1024的数据包长度超出标准协议与CRC校验失败

请提供验证的bsp和config (provide the config and bsp)

  • BSP:
  • .config:
  • action:
  1. YMODEM Send：
    • sy file_path [uartX] 发送大文件与小文件各一次
    • 对端故意返回 NAK/延迟 ACK，验证是否会重发并最终完成或超时退出
  2. YMODEM Recv：
    • ry file_path [uartX] 接收，验证异常中断后资源释放/文件句柄关闭是否正常
  3. Console 换行：
    • 在 console 输出含 \n 的日志，验证终端是否仍显示正常换行（确认 console open_flag 是否含 STREAM）

]

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality：

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确，包括缩进空格，命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码，代码尽量精简，不包含#if 0代码，不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的，并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 代码是高质量的 Code in this PR is of high quality
  • 已经使用formatting 等源码格式化工具确保格式符合RT-Thread代码规范 This PR complies with RT-Thread code specification
  • 如果是新增bsp, 已经添加ci检查到.github/ALL_BSP_COMPILE.json 详细请参考链接BSP自查

@github-actions
Copy link

github-actions bot commented Feb 1, 2026

👋 感谢您对 RT-Thread 的贡献！Thank you for your contribution to RT-Thread!

为确保代码符合 RT-Thread 的编码规范，请在你的仓库中执行以下步骤运行代码格式化工作流（如果格式化CI运行失败）。
To ensure your code complies with RT-Thread's coding style, please run the code formatting workflow by following the steps below (If the formatting of CI fails to run).

🛠 操作步骤 | Steps

  1. 前往 Actions 页面 | Go to the Actions page
    点击进入工作流 → | Click to open workflow →

  2. 点击 Run workflow | Click Run workflow

  • 设置需排除的文件/目录（目录请以"/"结尾）
    Set files/directories to exclude (directories should end with "/")
  • 将目标分支设置为 \ Set the target branch to：ymodem
  • 设置PR number为 \ Set the PR number to：11162
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将自动推送至你的分支。
    The formatted code will be automatically pushed to your branch.

完成后，提交将自动更新至 ymodem 分支，关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the ymodem branch automatically, and the related Pull Request will be updated.

如有问题欢迎联系我们，再次感谢您的贡献！💐
If you have any questions, feel free to reach out. Thanks again for your contribution!

@github-actions
Copy link

github-actions bot commented Feb 1, 2026 •
edited
Loading

📌 Code Review Assignment

🏷️ Tag: components

Reviewers: Maihuanyi

Changed Files (Click to expand)
  • components/drivers/serial/dev_serial_v2.c
  • components/utilities/ymodem/ry_sy.c
  • components/utilities/ymodem/ymodem.c
  • components/utilities/ymodem/ymodem.h

🏷️ Tag: components_driver_serial_v2

Reviewers: Ryan-CW-Code

Changed Files (Click to expand)
  • components/drivers/serial/dev_serial_v2.c

🏷️ Tag: components_utilities_ymodem

Reviewers: wdfk-prog

Changed Files (Click to expand)
  • components/utilities/ymodem/ry_sy.c
  • components/utilities/ymodem/ymodem.c
  • components/utilities/ymodem/ymodem.h

📊 Current Review Status (Last Updated: 2026-02-01 17:06 CST)

  • ⌛ Maihuanyi Pending Review
  • ⌛ Ryan-CW-Code Pending Review
  • ⌛ wdfk-prog Pending Review

📝 Review Instructions

  1. 维护者可以通过单击此处来刷新审查状态: 🔄 刷新状态
    Maintainers can refresh the review status by clicking here: 🔄 Refresh Status

  2. 确认审核通过后评论 LGTM/lgtm
    Comment LGTM/lgtm after confirming approval

  3. PR合并前需至少一位维护者确认
    PR must be confirmed by at least one maintainer before merging

ℹ️ 刷新CI状态操作需要具备仓库写入权限。
ℹ️ Refresh CI status operation requires repository Write permission.

@wdfk-prog
fix(ymodem): improve send read loop and unify session cleanup
881daf2 
- Accumulate short reads, mark finishing on EOF
- Track begin/end callback states and cleanup on error paths
- Add ACK handling with retry/error counting in send flow
@wdfk-prog wdfk-prog changed the title fix(ymodem): 修正发送 ACK 重试并统一异常清理 fix(ymodem): 修正发送 ACK 重试并统一异常清理 与串口V2在控制台下使用SY失败问题 Feb 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

component: drivers/serial component: drivers Component

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@wdfk-prog