libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/RT-Thread/rt-thread

This commit is contained in:
Bernard Xiong 2016-04-05 14:41:29 +08:00
parent 49b1172b8d 121f290fbd
commit a128dcc6ea
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bsp/stm32f10x/applications/SConscript
View File

@ -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)

4
bsp/stm32f10x/drivers/SConscript
View File

@ -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']

2
bsp/stm32f10x/drivers/bxcan.c
View File

@ -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*/

2
bsp/stm32f10x/rtconfig.h
View File

@ -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