提交 e35ad3e6 编写于 作者: G gbcwbz

fix initialization error in bsp/stm32f10x

temporarily disable canapp initialization.
上级 2a9f80d9
...@@ -2,8 +2,16 @@ Import('RTT_ROOT') ...@@ -2,8 +2,16 @@ Import('RTT_ROOT')
Import('rtconfig') Import('rtconfig')
from building import * from building import *
cwd = os.path.join(str(Dir('#')), 'applications') cwd = os.path.join(str(Dir('#')), 'applications')
src = Glob('*.c')
src = Split("""
application.c
startup.c
""")
if GetDepend('RT_USING_CAN'):
src += ['canapp.c']
CPPPATH = [cwd, str(Dir('#'))] CPPPATH = [cwd, str(Dir('#'))]
group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH) group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH)
......
...@@ -12,6 +12,10 @@ led.c ...@@ -12,6 +12,10 @@ led.c
usart.c usart.c
""") """)
# add canbus driver.
if GetDepend('RT_USING_CAN'):
src += ['bxcan.c']
# add Ethernet drivers. # add Ethernet drivers.
if GetDepend('RT_USING_LWIP'): if GetDepend('RT_USING_LWIP'):
src += ['dm9000a.c'] src += ['dm9000a.c']
......
...@@ -1575,4 +1575,4 @@ int stm32_bxcan_init(void) ...@@ -1575,4 +1575,4 @@ int stm32_bxcan_init(void)
} }
INIT_BOARD_EXPORT(stm32_bxcan_init); INIT_BOARD_EXPORT(stm32_bxcan_init);
#endif /*RT_USING_CAN2*/ #endif /*RT_USING_CAN*/
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
#define RT_USING_PIN #define RT_USING_PIN
#define RT_USING_CAN //#define RT_USING_CAN
#define RT_CAN_USING_BUS_HOOK #define RT_CAN_USING_BUS_HOOK
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册