[BSP] xmc7100外设适配和RTDuino适配 #10824
[BSP] xmc7100外设适配和RTDuino适配 #10824
Conversation
|
👋 感谢您对 RT-Thread 的贡献！Thank you for your contribution to RT-Thread! 为确保代码符合 RT-Thread 的编码规范，请在你的仓库中执行以下步骤运行代码格式化工作流（如果格式化CI运行失败）。 🛠 操作步骤 | Steps
完成后，提交将自动更新至 如有问题欢迎联系我们，再次感谢您的贡献！💐 |
There was a problem hiding this comment.
Pull Request Overview
This PR adapts the XMC7100 BSP to support I2C and SPI peripherals, integrates RTduino (Arduino compatibility layer), adds RW007 Wi-Fi support, and fixes GPIO interrupt handling. It also updates configuration defaults (system workqueue, serial ring buffer) and adds Arduino pinout files and example.
- Add RTduino support and Arduino pin mapping with example sketch
- Integrate RW007 Wi-Fi over SPI and adjust SPI bus/pin mappings for XMC7100
- Fix and extend GPIO interrupt mappings; enable system workqueue and enlarge serial RX buffer
Reviewed Changes
Copilot reviewed 15 out of 15 changed files in this pull request and generated 9 comments.
Show a summary per file
| File | Description |
|---|---|
| bsp/Infineon/xmc7100d-f144k4160aa/rtconfig.h | Enable system workqueue, enlarge serial RB, enable I2C/SPI; adjust RT_NAME_MAX; toggle UART2 |
| bsp/Infineon/xmc7100d-f144k4160aa/board/ports/spi_flash_init.c | Attach SPI device to spi0 when RW007 enabled; select CS pin accordingly |
| bsp/Infineon/xmc7100d-f144k4160aa/board/ports/drv_rw007.c | Add RW007 Wi-Fi initialization, GPIO init, and IRQ hook |
| bsp/Infineon/xmc7100d-f144k4160aa/board/ports/SConscript | Build RW007 driver conditionally |
| bsp/Infineon/xmc7100d-f144k4160aa/board/Kconfig | Add RTduino and RW007 menus and options; add I2C2 and SPI0 toggles |
| bsp/Infineon/xmc7100d-f144k4160aa/applications/arduino_pinout/pins_arduino.h | Define Arduino digital pin macros, default I2C/SPI bus names |
| bsp/Infineon/xmc7100d-f144k4160aa/applications/arduino_pinout/pins_arduino.c | Map Arduino pins to RT-Thread pins and devices |
| bsp/Infineon/xmc7100d-f144k4160aa/applications/arduino_pinout/SConscript | Add RTduino pinout sources to build when RTduino enabled |
| bsp/Infineon/xmc7100d-f144k4160aa/applications/arduino_pinout/README.md | Add Arduino compatibility README (needs board-specific content) |
| bsp/Infineon/xmc7100d-f144k4160aa/applications/arduino_main.cpp | Add simple RTduino sketch using Serial |
| bsp/Infineon/xmc7100d-f144k4160aa/applications/SConscript | Auto-add Arduino example when RTduino is enabled |
| bsp/Infineon/xmc7100d-f144k4160aa/README.md | Update supported peripherals and usage instructions |
| bsp/Infineon/xmc7100d-f144k4160aa/.config | Sync with new config options (workqueue, SPI/I2C, etc.) |
| bsp/Infineon/libraries/HAL_Drivers/drv_spi.c | Add XMC7100-specific SPI0 pin mapping |
| bsp/Infineon/libraries/HAL_Drivers/drv_gpio.c | Add XMC7100 GPIO IRQ map and adjust IRQ enable path |
bsp/Infineon/xmc7100d-f144k4160aa/applications/arduino_pinout/SConscript
Outdated
Show resolved
Hide resolved
| #define D00 (0) | ||
| #define D01 (1) | ||
| #define D2 (2) | ||
| #define D3 (3) |
There was a problem hiding this comment.
English: Pin macro names are inconsistent with Arduino conventions (D0/D1 vs D00/D01), which can confuse users and libraries. Define D0 and D1 (and keep D00/D01 as aliases if needed) for consistency. Example: #define D0 0; #define D1 1; #define D00 D0; #define D01 D1. 中文：引脚宏命名与 Arduino 约定不一致（D0/D1 被命名为 D00/D01），容易误导用户与库。为保持一致性请定义 D0、D1（可保留 D00/D01 作为别名）。示例：#define D0 0; #define D1 1; #define D00 D0; #define D01 D1。
Copilot generated this review using guidance from repository custom instructions.
bsp/Infineon/xmc7100d-f144k4160aa/applications/arduino_pinout/pins_arduino.c
Outdated
Show resolved
Hide resolved
bsp/Infineon/xmc7100d-f144k4160aa/applications/arduino_pinout/README.md
Outdated
Show resolved
Hide resolved
bsp/Infineon/xmc7100d-f144k4160aa/applications/arduino_pinout/README.md
Outdated
Show resolved
Hide resolved
bsp/Infineon/xmc7100d-f144k4160aa/applications/arduino_pinout/README.md
Outdated
Show resolved
Hide resolved
bsp/Infineon/xmc7100d-f144k4160aa/applications/arduino_pinout/README.md
Outdated
Show resolved
Hide resolved
bsp/Infineon/xmc7100d-f144k4160aa/applications/arduino_pinout/SConscript
Outdated
Show resolved
Hide resolved
bsp/Infineon/xmc7100d-f144k4160aa/applications/arduino_pinout/pins_arduino.c
Outdated
Show resolved
Hide resolved
hydevcode
force-pushed
the
xmc7100
branch
3 times, most recently
from
0ad5949 to
e35b843
Compare
| "servertype": "jlink", | ||
| "device": "XMC7100-4160_CM7_0_tm", | ||
| "interface": "swd", | ||
| "serialNumber": "", |
| #define D00 (0) | ||
| #define D01 (1) | ||
| #define D2 (2) | ||
| #define D3 (3) | ||
| #define D4 (4) | ||
| #define D5 (5) | ||
| #define D6 (6) | ||
| #define D7 (7) |
There was a problem hiding this comment.
English: Arduino ecosystem typically uses D0 and D1 (not D00/D01). Using D00/D01 breaks compatibility with many Arduino libraries. Please rename to D0/D1 or add aliases to preserve compatibility, for example: #define D0 D00 and #define D1 D01.\n中文：Arduino 生态通常使用 D0 和 D1（而不是 D00/D01）。使用 D00/D01 会导致与大量 Arduino 库不兼容。请将其重命名为 D0/D1，或增加别名以兼容，例如：#define D0 D00 和 #define D1 D01。
Copilot uses AI. Check for mistakes.
| * Digital pins must NOT give the device name and channel. | ||
| * Analog pins MUST give the device name and channel(ADC, PWM or DAC). |
There was a problem hiding this comment.
English: The comment says digital pins must not include a device name/channel, but the mapping below adds device names for SPI/I2C/UART pins (e.g., D3–D7 and D00/D01). Please update the comment to reflect actual usage (digital pins may include device names for bus mapping), or adjust the table to match the documented rule.\n中文：注释说明数字引脚不应包含设备名/通道，但后续映射为 SPI/I2C/UART 引脚（如 D3–D7 和 D00/D01）添加了设备名。请修改注释以与实际用法一致（数字引脚可为总线映射包含设备名），或调整表项以符合当前注释规则。
| * Digital pins must NOT give the device name and channel. | |
| * Analog pins MUST give the device name and channel(ADC, PWM or DAC). | |
| * Digital pins may include the device name and channel for bus mapping (e.g., SPI, I2C, UART). | |
| * Analog pins MUST give the device name and channel (ADC, PWM or DAC). |
Copilot uses AI. Check for mistakes.
| {D00, GET_PIN(19, 0), "uart2"}, /* Serial2-RX */ | ||
| {D01, GET_PIN(19, 1), "uart2"}, /* Serial2-TX */ | ||
| {D2, GET_PIN(0, 3)}, /* SPI0_CS*/ | ||
| {D3, GET_PIN(1, 1), "spi0"}, /* SPI0_MOSI */ | ||
| {D4, GET_PIN(1, 0), "spi0"}, /* SPI0_MISO */ | ||
| {D5, GET_PIN(0, 2), "spi0"}, /* SPI_SCK */ | ||
| {D6, GET_PIN(0, 0), "i2c2"}, /* I2C-SDA (Soft Wire) */ | ||
| {D7, GET_PIN(0, 1), "i2c2"}, /* I2C-SCL (Soft Wire) */ |
There was a problem hiding this comment.
English: Please consider guarding UART2-based entries (D00/D01) behind the same Kconfig option that selects UART2 (e.g., BSP_USING_UART2) or assert the device existence at init time, to avoid runtime device lookup failures when UART2 is not enabled.\n中文：建议将基于 UART2 的条目（D00/D01）与选择 UART2 的 Kconfig 选项（如 BSP_USING_UART2）关联，或在初始化阶段断言设备存在，以避免在未启用 UART2 时运行期设备查找失败。
Copilot uses AI. Check for mistakes.
| rt_hw_spi_device_attach(IFX_RW007_SPI_BUS_NAME, "wspi", cs_pin); | ||
| rt_hw_wifi_init("wspi"); | ||
|
|
||
| rt_wlan_set_mode(RT_WLAN_DEVICE_STA_NAME, RT_WLAN_STATION); | ||
| rt_wlan_set_mode(RT_WLAN_DEVICE_AP_NAME, RT_WLAN_AP); |
There was a problem hiding this comment.
English: Missing return value checks. Please check and handle errors from rt_hw_spi_device_attach and rt_hw_wifi_init (and optionally rt_wlan_set_mode), returning a non-zero error code or logging failures to avoid silent misconfiguration.\n中文：缺少返回值检查。请对 rt_hw_spi_device_attach 与 rt_hw_wifi_init（以及可选的 rt_wlan_set_mode）进行错误检查并处理，必要时返回非零错误码或打印日志，以避免静默失败与错误配置。
| rt_hw_spi_device_attach(IFX_RW007_SPI_BUS_NAME, "wspi", cs_pin); | |
| rt_hw_wifi_init("wspi"); | |
| rt_wlan_set_mode(RT_WLAN_DEVICE_STA_NAME, RT_WLAN_STATION); | |
| rt_wlan_set_mode(RT_WLAN_DEVICE_AP_NAME, RT_WLAN_AP); | |
| if (rt_hw_spi_device_attach(IFX_RW007_SPI_BUS_NAME, "wspi", cs_pin) != RT_EOK) | |
| { | |
| LOG_E("Failed to attach SPI device for RW007."); | |
| return -1; | |
| } | |
| if (rt_hw_wifi_init("wspi") != RT_EOK) | |
| { | |
| LOG_E("Failed to initialize WiFi hardware (rw007)."); | |
| return -2; | |
| } | |
| if (rt_wlan_set_mode(RT_WLAN_DEVICE_STA_NAME, RT_WLAN_STATION) != RT_EOK) | |
| { | |
| LOG_E("Failed to set WLAN mode to STATION."); | |
| return -3; | |
| } | |
| if (rt_wlan_set_mode(RT_WLAN_DEVICE_AP_NAME, RT_WLAN_AP) != RT_EOK) | |
| { | |
| LOG_E("Failed to set WLAN mode to AP."); | |
| return -4; | |
| } |
Copilot uses AI. Check for mistakes.
|
|
||
| static void int_wifi_irq(void *p) | ||
| { | ||
| ((void)p); |
There was a problem hiding this comment.
English: Use a standard unused-parameter idiom for readability, e.g., (void)p; or RT_UNUSED(p); rather than ((void)p);.\n中文：为提升可读性，建议使用常见的未使用参数写法，例如 (void)p; 或 RT_UNUSED(p);，而不是 ((void)p);。
| ((void)p); | |
| (void)p; |
Copilot uses AI. Check for mistakes.
| #if !defined(BSP_USING_RW007) | ||
| rt_hw_spi_device_attach("spi5", "spi30", GET_PIN(7, 3)); | ||
| #else | ||
| rt_hw_spi_device_attach("spi0", "spi30", GET_PIN(20, 3)); | ||
| #endif |
There was a problem hiding this comment.
English: Hard-coding the bus/CS for 'spi30' based on BSP_USING_RW007 creates hidden coupling between SD/SPI device and Wi‑Fi selection. Consider exposing the bus name and CS pin via Kconfig (similar to IFX_RW007_* options) to make routing explicit and avoid conflicts.\n中文：根据 BSP_USING_RW007 直接硬编码 ‘spi30’ 的总线与 CS 会造成 SD/SPI 设备与 Wi‑Fi 选择间的隐式耦合。建议像 IFX_RW007_* 那样通过 Kconfig 暴露总线名与 CS 引脚，使资源路由更明确并避免潜在冲突。
Copilot uses AI. Check for mistakes.
| # board_default 开发板的Arduino生态兼容说明 | ||
|
|
||
| ## 1 RTduino - RT-Thread的Arduino生态兼容层 | ||
|
|
||
| board_default 开发板已经完整适配了[RTduino软件包](https://github.com/RTduino/RTduino)，即RT-Thread的Arduino生态兼容层。用户可以按照Arduino的编程习惯来操作该BSP，并且可以使用大量Arduino社区丰富的库，是对RT-Thread生态的极大增强。更多信息，请参见[RTduino软件包说明文档](https://github.com/RTduino/RTduino)。 |
There was a problem hiding this comment.
English: Replace the placeholder 'board_default' with the actual BSP name (xmc7100d-f144k4160aa) to avoid confusion.\n中文：请将占位符 ‘board_default’ 替换为实际 BSP 名称（xmc7100d-f144k4160aa），以免误导用户。
| # board_default 开发板的Arduino生态兼容说明 | |
| ## 1 RTduino - RT-Thread的Arduino生态兼容层 | |
| board_default 开发板已经完整适配了[RTduino软件包](https://github.com/RTduino/RTduino)，即RT-Thread的Arduino生态兼容层。用户可以按照Arduino的编程习惯来操作该BSP，并且可以使用大量Arduino社区丰富的库，是对RT-Thread生态的极大增强。更多信息，请参见[RTduino软件包说明文档](https://github.com/RTduino/RTduino)。 | |
| # xmc7100d-f144k4160aa 开发板的Arduino生态兼容说明 | |
| ## 1 RTduino - RT-Thread的Arduino生态兼容层 | |
| xmc7100d-f144k4160aa 开发板已经完整适配了[RTduino软件包](https://github.com/RTduino/RTduino)，即RT-Thread的Arduino生态兼容层。用户可以按照Arduino的编程习惯来操作该BSP，并且可以使用大量Arduino社区丰富的库，是对RT-Thread生态的极大增强。更多信息，请参见[RTduino软件包说明文档](https://github.com/RTduino/RTduino)。 |
Copilot uses AI. Check for mistakes.
| # board_default 开发板的Arduino生态兼容说明 | ||
|
|
||
| ## 1 RTduino - RT-Thread的Arduino生态兼容层 | ||
|
|
||
| board_default 开发板已经完整适配了[RTduino软件包](https://github.com/RTduino/RTduino)，即RT-Thread的Arduino生态兼容层。用户可以按照Arduino的编程习惯来操作该BSP，并且可以使用大量Arduino社区丰富的库，是对RT-Thread生态的极大增强。更多信息，请参见[RTduino软件包说明文档](https://github.com/RTduino/RTduino)。 |
There was a problem hiding this comment.
English: Replace the placeholder 'board_default' with the actual BSP name (xmc7100d-f144k4160aa) to avoid confusion.\n中文：请将占位符 ‘board_default’ 替换为实际 BSP 名称（xmc7100d-f144k4160aa），以免误导用户。
| # board_default 开发板的Arduino生态兼容说明 | |
| ## 1 RTduino - RT-Thread的Arduino生态兼容层 | |
| board_default 开发板已经完整适配了[RTduino软件包](https://github.com/RTduino/RTduino)，即RT-Thread的Arduino生态兼容层。用户可以按照Arduino的编程习惯来操作该BSP，并且可以使用大量Arduino社区丰富的库，是对RT-Thread生态的极大增强。更多信息，请参见[RTduino软件包说明文档](https://github.com/RTduino/RTduino)。 | |
| # xmc7100d-f144k4160aa 开发板的Arduino生态兼容说明 | |
| ## 1 RTduino - RT-Thread的Arduino生态兼容层 | |
| xmc7100d-f144k4160aa 开发板已经完整适配了[RTduino软件包](https://github.com/RTduino/RTduino)，即RT-Thread的Arduino生态兼容层。用户可以按照Arduino的编程习惯来操作该BSP，并且可以使用大量Arduino社区丰富的库，是对RT-Thread生态的极大增强。更多信息，请参见[RTduino软件包说明文档](https://github.com/RTduino/RTduino)。 |
Copilot uses AI. Check for mistakes.
| | Arduino引脚编号 | XMC7100引脚编号 | 5V容忍 | 备注 | | ||
| | ------------------- | --------- | ---- | ------------------------------------------------------------------------- | | ||
| | 0 (D0) | BSP_IO_PORT_19_PIN_00 | 否 | Serial2-RX,默认被RT-Thread的UART设备框架uart2接管 | |
There was a problem hiding this comment.
English: The table formatting in the doc uses inconsistent pipe prefixes earlier (lines show '||' in the diff). Please ensure standard Markdown table syntax with a single leading pipe in each row so it renders correctly.\n中文：文档中的表格前缀管道符在部分行出现了 ‘||’ 的不一致写法（见 diff）。请统一为标准 Markdown 表格语法（每行以单个 ‘|’ 开头），以保证正确渲染。
Copilot uses AI. Check for mistakes.
| /* i2c2 : P00.00-SDA P00.01-SCL */ | ||
| #define RTDUINO_DEFAULT_IIC_BUS_NAME "i2c2" | ||
|
|
||
| #define SS D2 /* Chip select pin of default spi */ |
There was a problem hiding this comment.
English: Consider also defining standard Arduino pin aliases for SPI (MOSI/MISO/SCK) consistent with your mapping (D3/D4/D5), e.g., #define MOSI D3, #define MISO D4, #define SCK D5, to improve library compatibility.\n中文：建议同时为 SPI 定义标准 Arduino 引脚别名（MOSI/MISO/SCK），与当前映射（D3/D4/D5）保持一致，例如：#define MOSI D3、#define MISO D4、#define SCK D5，以提升库兼容性。
| #define SS D2 /* Chip select pin of default spi */ | |
| #define SS D2 /* Chip select pin of default spi */ | |
| #define MOSI D3 | |
| #define MISO D4 | |
| #define SCK D5 |
Copilot uses AI. Check for mistakes.
There was a problem hiding this comment.
Pull Request Overview
Copilot reviewed 16 out of 16 changed files in this pull request and generated no new comments.
Comments suppressed due to low confidence (3)
bsp/Infineon/libraries/HAL_Drivers/drv_gpio.c:95
- pin_irq_map is indexed by gpio_port (see usage with &pin_irq_map[gpio_port]), so the initializer must provide one entry per port in index order without duplicates. This appended XMC7100 block reintroduces ports 22–32 that were already initialized above, which breaks the index-to-port alignment and can lead to incorrect IRQ lookups. Fix by defining a single, per-SOC complete table in strict port order (0..__IFX_PORT_MAX), or use designated initializers to bind entries to their exact indices and remove duplicates.
#if defined(SOC_XMC7100D_F144K4160AA)
{CYHAL_PORT_15, ioss_interrupts_gpio_15_IRQn},
{CYHAL_PORT_16, ioss_interrupts_gpio_16_IRQn},
{CYHAL_PORT_17, ioss_interrupts_gpio_17_IRQn},
{CYHAL_PORT_18, ioss_interrupts_gpio_18_IRQn},
{CYHAL_PORT_19, ioss_interrupts_gpio_19_IRQn},
{CYHAL_PORT_20, ioss_interrupts_gpio_20_IRQn},
{CYHAL_PORT_21, ioss_interrupts_gpio_21_IRQn},
{CYHAL_PORT_22, ioss_interrupts_gpio_22_IRQn},
{CYHAL_PORT_23, ioss_interrupts_gpio_23_IRQn},
{CYHAL_PORT_24, ioss_interrupts_gpio_24_IRQn},
{CYHAL_PORT_25, ioss_interrupts_gpio_25_IRQn},
{CYHAL_PORT_26, ioss_interrupts_gpio_26_IRQn},
{CYHAL_PORT_27, ioss_interrupts_gpio_27_IRQn},
{CYHAL_PORT_28, ioss_interrupts_gpio_28_IRQn},
{CYHAL_PORT_29, ioss_interrupts_gpio_29_IRQn},
{CYHAL_PORT_30, ioss_interrupts_gpio_30_IRQn},
{CYHAL_PORT_31, ioss_interrupts_gpio_31_IRQn},
{CYHAL_PORT_32, ioss_interrupts_gpio_32_IRQn},
#endif
bsp/Infineon/xmc7100d-f144k4160aa/applications/arduino_pinout/pins_arduino.h:22
- Macro names D00 and D01 are inconsistent with the standard Arduino convention D0/D1 that many RTduino libraries and sketches rely on, which may break compatibility. Rename D00/D01 to D0/D1 and update references in pins_arduino.c to align with Arduino naming.
#define D00 (0)
#define D01 (1)
#define D2 (2)
#define D3 (3)
#define D4 (4)
#define D5 (5)
#define D6 (6)
#define D7 (7)
bsp/Infineon/xmc7100d-f144k4160aa/applications/arduino_pinout/README.md:30
- Markdown table syntax in this section is incorrect earlier in the file (extra leading pipes cause rendering issues). Use a single leading and trailing pipe per row as shown here, and ensure the header separator line matches the number of columns.
| Arduino引脚编号 | XMC7100引脚编号 | 5V容忍 | 备注 |
| ------------------- | --------- | ---- | ------------------------------------------------------------------------- |
| 0 (D0) | BSP_IO_PORT_19_PIN_00 | 否 | Serial2-RX,默认被RT-Thread的UART设备框架uart2接管 |
| 1 (D1) | BSP_IO_PORT_19_PIN_01 | 否 | Serial2-TX,默认被RT-Thread的UART设备框架uart2接管 |
| 2 (D2) | BSP_IO_PORT_00_PIN_03 | 否 | SPI0-CS |
| 3 (D3) | BSP_IO_PORT_01_PIN_01 | 否 | SPI0-MOSI,默认被RT-Thread的SPI设备框架spi0接管 |
| 4 (D4) | BSP_IO_PORT_01_PIN_00 | 否 | SPI0-MISO,默认被RT-Thread的SPI设备框架spi0接管 |
| 5 (D5) | BSP_IO_PORT_00_PIN_02 | 否 | SPI0-SCK,默认被RT-Thread的SPI设备框架spi0接管 |
| 6 (D6) | BSP_IO_PORT_00_PIN_00 | 否 | I2C2-SDA,默认被RT-Thread的I2C设备框架i2c2接管 |
| 7 (D7) | BSP_IO_PORT_00_PIN_01 | 否 | I2C2-SCL,默认被RT-Thread的I2C设备框架i2c2接管 |
3 participants
拉取/合并请求描述：(PR description)
[
为什么提交这份PR (why to submit this PR)
适配XMC7100的I2C和SPI，以及RTDuino,RW007,修复GPIO中断问题
你的解决方案是什么 (what is your solution)
请提供验证的bsp和config (provide the config and bsp)
]
当前拉取/合并请求的状态 Intent for your PR
必须选择一项 Choose one (Mandatory):
代码质量 Code Quality：
我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:
#if 0代码，不包含已经被注释了的代码 All redundant code is removed and cleaned up