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.

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

[bsp][ESP32] add spi custom configuration function and enhance muti object initliz… #9643

Merged
merged 10 commits into from
Nov 14, 2024
Merged

[bsp][ESP32] add spi custom configuration function and enhance muti object initliz… #9643

merged 10 commits into from
Nov 14, 2024

Conversation

1078249029
Copy link
Contributor

…ation and setting

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

[

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

#5941

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

improve spi driver

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

  • BSP: bsp/ESP32_C3
  • .config:
  • action:

]

当前拉取/合并请求的状态 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/workflows/bsp_buildings.yml 详细请参考链接BSP自查

@CLAassistant
Copy link

CLAassistant commented Nov 13, 2024 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added the BSP label Nov 13, 2024
@supperthomas
Copy link
Member

可否参考：
https://github.com/RT-Thread/rt-thread/blob/master/bsp/nrf5x/nrf52832/.ci/attachconfig/ci.attachconfig.yml
添加yml文件，提供CI测试。

@1078249029
Copy link
Contributor Author

esp32原来的bsp只能ble，wifi功能二选一，我这里分两个ci文件做测试，我看stm就是这个逻辑，但他们不是yaml文件并且写法有些不同。我不清楚ci写的对不对。下面是stm的ci代码：

# scons: --strict

CONFIG_PKG_USING_AT_DEVICE=y

# Quectel M26/MC20
CONFIG_AT_DEVICE_USING_M26=y
CONFIG_AT_DEVICE_M26_INIT_ASYN=y

# Quectel EC20
CONFIG_AT_DEVICE_USING_EC20=y
CONFIG_AT_DEVICE_EC20_INIT_ASYN=y

# Espressif ESP32
CONFIG_AT_DEVICE_USING_ESP32=y
CONFIG_AT_DEVICE_ESP32_INIT_ASYN=y

@supperthomas
Copy link
Member

改下后缀为yml

@supperthomas
Copy link
Member

=n不用特别添加

@supperthomas
Copy link
Member

后缀.attachconfig.yml全部要匹配

@1078249029
Copy link
Contributor Author

formatting工具貌似不能格式化endline空行？

@supperthomas
Copy link
Member

supperthomas commented Nov 13, 2024 •
edited
Loading

请使用验证过的config放到yml文件中，这个PR只需要放下面这个配置即可。其他的请验证过再放。

devices.spi:
    kconfig:
      - CONFIG_RT_USING_SPI=y
      - CONFIG_BSP_USING_SPI=y
      - CONFIG_BSP_USING_SPI2=y

确保yml中的配置是期望的配置。

yml只要放一个即可，确保名字不重复。yaml文件请删除。

@BernardXiong
Copy link
Member

CLA assistant check Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.You have signed the CLA already but the status is still pending? Let us recheck it.

还请签署下CLA，谢谢

@supperthomas
Copy link
Member

请统一放到一个文件中 .ci/attachconfig/ci.attachconfig.yml

@1078249029
Copy link
Contributor Author

1078249029 commented Nov 14, 2024 •
edited
Loading

请统一放到一个文件中 .ci/attachconfig/ci.attachconfig.yml

目前bsp的ble驱动与wifi驱动有冲突，我想分别进行组件测试，如果放到一一个文件里的话需要修改bsp的workflow，考虑后期维护方便还是分开放比较好？

@1078249029
Copy link
Contributor Author

根据 #5941 (comment) 发现开启ble编译有问题，需要添加空的app_main函数

supperthomas
supperthomas requested changes Nov 14, 2024
View reviewed changes
bsp/ESP32_C3/.ci/attachconfig/ble.attachconfig.yml Outdated
@@ -0,0 +1,6 @@
scons.args: &scons
scons_arg:
Copy link
Member

Choose a reason for hiding this comment

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

这个soncs.args没用到可以删了。

bsp/ESP32_C3/.ci/attachconfig/ble.attachconfig.yml Outdated
scons.args: &scons
scons_arg:
- '--strict'
devices.ble:
Copy link
Member

Choose a reason for hiding this comment

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

这个放到ci.attachconfig.yml文件内。

bsp/ESP32_C3/.ci/attachconfig/wifi.attachconfig.yml Outdated
- '--strict'
devices.wifi:
kconfig:
- CONFIG_BSP_USING_WIFI=y
Copy link
Member

Choose a reason for hiding this comment

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

这个放到ci.attachconfig.yml内

@supperthomas
Copy link
Member

感谢贡献

@supperthomas supperthomas merged commit 908dc68 into RT-Thread:master Nov 14, 2024
46 checks passed
GuEe-GUI pushed a commit to GuEe-GUI/rt-thread that referenced this pull request Nov 20, 2024
@1078249029 @GuEe-GUI
[bsp][ESP32] add spi custom configuration function and enhance muti o…
12080d4 
…bject initliz… (RT-Thread#9643)

* add spi custom configuration function and enhance muti object initlization and setting

* update changelog

* submit ci files

* fix ci file

* update

* formatting

* delete yaml files

* fix ble ci file

* fix undefined reference to app_main error

* update
@1078249029 1078249029 mentioned this pull request Dec 8, 2024
Merged
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@supperthomas supperthomas supperthomas approved these changes

Assignees
No one assigned
Labels
BSP
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@1078249029 @CLAassistant @supperthomas @BernardXiong