Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2020fengziyang
rt-thread
提交
96dd783f
R
rt-thread
项目概览
2020fengziyang
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
96dd783f
编写于
5月 06, 2022
作者:
mysterywolf
提交者:
guo
5月 09, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[cmsis] avoid conflict between cmsis5 and bsp cmsis
上级
4171fcbb
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
68 addition
and
46 deletion
+68
-46
bsp/stm32/libraries/STM32F0xx_HAL/SConscript
bsp/stm32/libraries/STM32F0xx_HAL/SConscript
+4
-2
bsp/stm32/libraries/STM32F1xx_HAL/SConscript
bsp/stm32/libraries/STM32F1xx_HAL/SConscript
+4
-2
bsp/stm32/libraries/STM32F2xx_HAL/SConscript
bsp/stm32/libraries/STM32F2xx_HAL/SConscript
+4
-2
bsp/stm32/libraries/STM32F3xx_HAL/SConscript
bsp/stm32/libraries/STM32F3xx_HAL/SConscript
+4
-2
bsp/stm32/libraries/STM32F4xx_HAL/SConscript
bsp/stm32/libraries/STM32F4xx_HAL/SConscript
+4
-2
bsp/stm32/libraries/STM32F7xx_HAL/SConscript
bsp/stm32/libraries/STM32F7xx_HAL/SConscript
+4
-2
bsp/stm32/libraries/STM32G0xx_HAL/SConscript
bsp/stm32/libraries/STM32G0xx_HAL/SConscript
+4
-2
bsp/stm32/libraries/STM32G4xx_HAL/SConscript
bsp/stm32/libraries/STM32G4xx_HAL/SConscript
+4
-2
bsp/stm32/libraries/STM32H7xx_HAL/SConscript
bsp/stm32/libraries/STM32H7xx_HAL/SConscript
+4
-2
bsp/stm32/libraries/STM32L0xx_HAL/SConscript
bsp/stm32/libraries/STM32L0xx_HAL/SConscript
+4
-2
bsp/stm32/libraries/STM32L1xx_HAL/SConscript
bsp/stm32/libraries/STM32L1xx_HAL/SConscript
+4
-4
bsp/stm32/libraries/STM32L4xx_HAL/SConscript
bsp/stm32/libraries/STM32L4xx_HAL/SConscript
+4
-4
bsp/stm32/libraries/STM32L5xx_HAL/SConscript
bsp/stm32/libraries/STM32L5xx_HAL/SConscript
+4
-4
bsp/stm32/libraries/STM32MPxx_HAL/SConscript
bsp/stm32/libraries/STM32MPxx_HAL/SConscript
+4
-3
bsp/stm32/libraries/STM32U5xx_HAL/SConscript
bsp/stm32/libraries/STM32U5xx_HAL/SConscript
+4
-4
bsp/stm32/libraries/STM32WBxx_HAL/SConscript
bsp/stm32/libraries/STM32WBxx_HAL/SConscript
+4
-5
bsp/stm32/libraries/STM32WLxx_HAL/SConscript
bsp/stm32/libraries/STM32WLxx_HAL/SConscript
+4
-2
未找到文件。
bsp/stm32/libraries/STM32F0xx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -77,8 +77,10 @@ if GetDepend(['BSP_USING_ON_CHIP_FLASH']):
src
+=
[
'STM32F0xx_HAL_Driver/Src/stm32f0xx_hal_flash_ex.c'
]
path
=
[
cwd
+
'/CMSIS/Device/ST/STM32F0xx/Include'
,
cwd
+
'/STM32F0xx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/STM32F0xx_HAL_Driver/Inc'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/stm32/libraries/STM32F1xx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -83,8 +83,10 @@ if GetDepend(['BSP_USING_ON_CHIP_FLASH']):
src
+=
[
'STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c'
]
path
=
[
cwd
+
'/CMSIS/Device/ST/STM32F1xx/Include'
,
cwd
+
'/STM32F1xx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/STM32F1xx_HAL_Driver/Inc'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/stm32/libraries/STM32F2xx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -78,8 +78,10 @@ if GetDepend(['BSP_USING_ON_CHIP_FLASH']):
src
+=
[
'STM32F2xx_HAL_Driver/Src/stm32f2xx_hal_flash_ex.c'
]
path
=
[
cwd
+
'/CMSIS/Device/ST/STM32F2xx/Include'
,
cwd
+
'/STM32F2xx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/STM32F2xx_HAL_Driver/Inc'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/stm32/libraries/STM32F3xx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -81,8 +81,10 @@ if GetDepend(['BSP_USING_ON_CHIP_FLASH']):
src
+=
[
'STM32F3xx_HAL_Driver/Src/stm32f3xx_hal_flash_ex.c'
]
path
=
[
cwd
+
'/STM32F3xx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Device/ST/STM32F3xx/Include'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/CMSIS/Device/ST/STM32F3xx/Include'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/stm32/libraries/STM32F4xx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -109,8 +109,10 @@ if GetDepend(['BSP_USING_LTDC']):
src
+=
[
'STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_dsi.c'
]
path
=
[
cwd
+
'/STM32F4xx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Device/ST/STM32F4xx/Include'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/CMSIS/Device/ST/STM32F4xx/Include'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/stm32/libraries/STM32F7xx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -102,8 +102,10 @@ if GetDepend(['BSP_USING_LTDC']):
src
+=
[
'STM32F7xx_HAL_Driver/Src/stm32f7xx_hal_dsi.c'
]
path
=
[
cwd
+
'/STM32F7xx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Device/ST/STM32F7xx/Include'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/CMSIS/Device/ST/STM32F7xx/Include'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/stm32/libraries/STM32G0xx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -56,8 +56,10 @@ if GetDepend(['RT_USING_RTC']):
src
+=
[
'STM32G0xx_HAL_Driver/Src/stm32g0xx_ll_rtc.c'
]
path
=
[
cwd
+
'/STM32G0xx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Device/ST/STM32G0xx/Include'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/CMSIS/Device/ST/STM32G0xx/Include'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/stm32/libraries/STM32G4xx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -106,8 +106,10 @@ if GetDepend(['BSP_USING_LTDC']):
src
+=
[
'STM32G4xx_HAL_Driver/Src/stm32g4xx_hal_dsi.c'
]
path
=
[
cwd
+
'/STM32G4xx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Device/ST/STM32G4xx/Include'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/CMSIS/Device/ST/STM32G4xx/Include'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/stm32/libraries/STM32H7xx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -108,8 +108,10 @@ if GetDepend(['BSP_USING_DCMI']):
src
+=
[
'STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_dcmi.c'
]
path
=
[
cwd
+
'/STM32H7xx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Device/ST/STM32H7xx/Include'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/CMSIS/Device/ST/STM32H7xx/Include'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/stm32/libraries/STM32L0xx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -84,8 +84,10 @@ if GetDepend(['BSP_USING_ON_CHIP_FLASH']):
src
+=
[
'STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_flash_ramfunc.c'
]
path
=
[
cwd
+
'/STM32L0xx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Device/ST/STM32L0xx/Include'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/CMSIS/Device/ST/STM32L0xx/Include'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/stm32/libraries/STM32L1xx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -66,15 +66,15 @@ if GetDepend(['RT_USING_SDIO']):
if
GetDepend
([
'RT_USING_AUDIO'
]):
src
+=
[
'STM32L1xx_HAL_Driver/Src/stm32L1xx_hal_i2s.c'
]
if
GetDepend
([
'BSP_USING_ON_CHIP_FLASH'
]):
src
+=
[
'STM32L1xx_HAL_Driver/Src/stm32L1xx_hal_flash.c'
]
src
+=
[
'STM32L1xx_HAL_Driver/Src/stm32L1xx_hal_flash_ex.c'
]
path
=
[
cwd
+
'/CMSIS/Device/ST/STM32L1xx/Include'
,
cwd
+
'/STM32L1xx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/STM32L1xx_HAL_Driver/Inc'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/stm32/libraries/STM32L4xx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -109,12 +109,12 @@ if GetDepend(['BSP_USING_DSI']):
if
GetDepend
([
'BSP_USING_SRAM'
]):
src
+=
[
'STM32L4xx_HAL_Driver/Src/stm32l4xx_hal_sram.c'
]
path
=
[
cwd
+
'/STM32L4xx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Device/ST/STM32L4xx/Include'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/CMSIS/Device/ST/STM32L4xx/Include'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/stm32/libraries/STM32L5xx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -109,12 +109,12 @@ if GetDepend(['BSP_USING_DSI']):
if
GetDepend
([
'BSP_USING_SRAM'
]):
src
+=
[
'STM32L5xx_HAL_Driver/Src/stm32l5xx_hal_sram.c'
]
path
=
[
cwd
+
'/STM32L5xx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Device/ST/STM32L5xx/Include'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/CMSIS/Device/ST/STM32L5xx/Include'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/stm32/libraries/STM32MPxx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -124,9 +124,10 @@ if GetDepend(['BSP_USING_RTC']):
src
+=
[
'STM32MP1xx_HAL_Driver/Src/stm32mp1xx_hal_rtc_ex.c'
]
path
=
[
cwd
+
'/STM32MP1xx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Device/ST/STM32MP1xx/Include'
,
cwd
+
'/CMSIS/Core/Include'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/CMSIS/Device/ST/STM32MP1xx/Include'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/stm32/libraries/STM32U5xx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -111,11 +111,11 @@ if GetDepend(['BSP_USING_DSI']):
if
GetDepend
([
'BSP_USING_SRAM'
]):
src
+=
[
'STM32U5xx_HAL_Driver/Src/stm32u5xx_hal_sram.c'
]
path
=
[
cwd
+
'/STM32U5xx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Device/ST/STM32U5xx/Include'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/CMSIS/Device/ST/STM32U5xx/Include'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/stm32/libraries/STM32WBxx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -76,13 +76,12 @@ if GetDepend(['BSP_USING_ON_CHIP_FLASH']):
src
+=
[
'STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash.c'
]
src
+=
[
'STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ex.c'
]
# src += ['STM32WBxx_HAL_Driver/Src/stm32wbxx_hal_flash_ramfunc.c']
path
=
[
cwd
+
'/STM32WBxx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Device/ST/STM32WBxx/Include'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/CMSIS/Device/ST/STM32WBxx/Include'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'Libraries'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
bsp/stm32/libraries/STM32WLxx_HAL/SConscript
浏览文件 @
96dd783f
...
...
@@ -69,8 +69,10 @@ if GetDepend(['BSP_USING_SUBGHZ']):
src
+=
[
'STM32WLxx_HAL_Driver/Src/stm32wlxx_hal_subghz.c'
]
path
=
[
cwd
+
'/STM32WLxx_HAL_Driver/Inc'
,
cwd
+
'/CMSIS/Device/ST/STM32WLxx/Include'
,
cwd
+
'/CMSIS/Include'
]
cwd
+
'/CMSIS/Device/ST/STM32WLxx/Include'
]
if
not
GetDepend
(
'PKG_CMSIS_CORE'
):
path
+=
[
cwd
+
'/CMSIS/Include'
]
CPPDEFINES
=
[
'USE_HAL_DRIVER'
]
group
=
DefineGroup
(
'STM32_HAL'
,
src
,
depend
=
[
''
],
CPPPATH
=
path
,
CPPDEFINES
=
CPPDEFINES
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录