diff options
| author | guo <[email protected]> | 2021-12-24 15:28:33 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-24 15:28:33 +0800 |
| commit | d16ca48f902ee0cdc467f166a219e6e2c8af57c7 (patch) | |
| tree | b098173b10c6fb376aad49a46d6d7cf65842156d | |
| parent | dcce9886e976318a981efb84b08376ceac306051 (diff) | |
| parent | 787b854f271daaac842029b52c6a4bfcd1e070e7 (diff) | |
Merge pull request #5427 from mysterywolf/l475
[bsp][stm32l475] move arduino to application
| -rw-r--r-- | bsp/stm32/stm32l475-atk-pandora/applications/SConscript | 3 | ||||
| -rw-r--r-- | bsp/stm32/stm32l475-atk-pandora/applications/arduino/SConscript (renamed from bsp/stm32/stm32l475-atk-pandora/board/ports/arduino/SConscript) | 3 | ||||
| -rw-r--r-- | bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_main.cpp (renamed from bsp/stm32/stm32l475-atk-pandora/applications/arduino_main.cpp) | 0 | ||||
| -rw-r--r-- | bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_pinout.c (renamed from bsp/stm32/stm32l475-atk-pandora/board/ports/arduino/arduino_pinout.c) | 0 | ||||
| -rw-r--r-- | bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_pinout.h (renamed from bsp/stm32/stm32l475-atk-pandora/board/ports/arduino/arduino_pinout.h) | 0 |
5 files changed, 3 insertions, 3 deletions
diff --git a/bsp/stm32/stm32l475-atk-pandora/applications/SConscript b/bsp/stm32/stm32l475-atk-pandora/applications/SConscript index bfa9a40db9..2d88e1d248 100644 --- a/bsp/stm32/stm32l475-atk-pandora/applications/SConscript +++ b/bsp/stm32/stm32l475-atk-pandora/applications/SConscript @@ -8,9 +8,6 @@ src = ['main.c'] if GetDepend(['PKG_USING_NRF24L01']): src += ['nrf24l01_init.c'] -if GetDepend(['RT_USING_ARDUINO']): - src += ['arduino_main.cpp'] - CPPPATH = [cwd] group = DefineGroup('Applications', src, depend = [''], CPPPATH = CPPPATH) diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/arduino/SConscript b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/SConscript index 2c5b27d9d2..b3d32f3717 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/ports/arduino/SConscript +++ b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/SConscript @@ -6,4 +6,7 @@ inc = [cwd] group = DefineGroup('Arduino', src, depend = ['RT_USING_ARDUINO'], CPPPATH = inc) +src = ['arduino_main.cpp'] +group = DefineGroup('Applications', src, depend = ['RT_USING_ARDUINO']) + Return('group') diff --git a/bsp/stm32/stm32l475-atk-pandora/applications/arduino_main.cpp b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_main.cpp index 455e8b8492..455e8b8492 100644 --- a/bsp/stm32/stm32l475-atk-pandora/applications/arduino_main.cpp +++ b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_main.cpp diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/arduino/arduino_pinout.c b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_pinout.c index bf9eb45c84..bf9eb45c84 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/ports/arduino/arduino_pinout.c +++ b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_pinout.c diff --git a/bsp/stm32/stm32l475-atk-pandora/board/ports/arduino/arduino_pinout.h b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_pinout.h index e3b7b8a47a..e3b7b8a47a 100644 --- a/bsp/stm32/stm32l475-atk-pandora/board/ports/arduino/arduino_pinout.h +++ b/bsp/stm32/stm32l475-atk-pandora/applications/arduino/arduino_pinout.h |