Skip to content
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.

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

replaced the judgement of RT_USING_XXX with BSP_USING, and add some… #6554

Merged
merged 4 commits into from
Oct 24, 2022

Conversation

linshire
Copy link
Contributor

… tips in Konfig about soft_i2c

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

[
在驱动文件随后被包含,使用BSP_USING进行判断,替换掉了原来的RT_USING判断,并且修改了Kconfig文件,使得在menuconfig的BSP_USING_I2C1配置名称由Enable I2C1 Bus变为Enable I2C1 Bus (software simulation),并且BSP_USING_I2C2也是如此,已测试过使用此配置能够正常添加驱动文件
]

以下的内容不应该在提交PR时的message修改,修改下述message,PR会被直接关闭。请在提交PR后,浏览器查看PR并对以下检查项逐项check,没问题后逐条在页面上打钩。
The following content must not be changed in the submitted PR message. Otherwise, the PR will be closed immediately. After submitted PR, please use a web browser to visit PR, and check items one by one, and ticked them if no problem.

当前拉取/合并请求的状态 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

@@ -11,7 +11,7 @@
#include <board.h>
#include "drv_soft_spi.h"

#if defined(RT_USING_SPI) && defined(RT_USING_SPI_BITOPS) && defined(RT_USING_PIN)
#if defined(BSP_USING_I2C1) || defined(BSP_USING_I2C2)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#if defined(BSP_USING_I2C1) || defined(BSP_USING_I2C2)
#ifdef BSP_USING_SOFT_I2C

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

本文件的最后一行也需要修改,你看一下其他你修改的地方,应该也有这样的结尾标志注释,如果没有的话请加上

@@ -11,7 +11,7 @@
#include <board.h>
#include "drv_soft_spi.h"

#if defined(BSP_USING_I2C1) || defined(BSP_USING_I2C2)
#if defined(BSP_USING_SOFT_I2C)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#if defined(BSP_USING_SOFT_I2C)
#ifdef BSP_USING_SOFT_I2C

@mysterywolf mysterywolf merged commit fd6cfa3 into RT-Thread:master Oct 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants