Revert "调整目录结构，把peripheral、lua和bspMCU三个模块收敛到内部"

This reverts commit 505523665d.
1 week ago · 52bb8290c2
95 changed files with 6 additions and 6 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -117,9 +117,9 @@ add_module(common library/common ON OFF)
 add_module(log library/log OFF OFF)
 add_module(list library/list OFF OFF)
 add_module(ringbuffer library/ringbuffer OFF OFF)
-add_module(peripheral library/peripheral OFF ON)
-add_module(lua library/lua OFF ON)
-add_module(bspMCU library/bspMCU OFF OFF)
+add_module(peripheral peripheral OFF ON)
+add_module(lua lua OFF ON)
+add_module(bspMCU bspMCU OFF OFF)
 add_module(RBcore RBcore OFF OFF)
 add_module(motor motor OFF OFF)
 add_module(optional optional OFF OFF)
--- a/library/bspMCU/CMakeLists.txt
+++ b/library/bspMCU/CMakeLists.txt
@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)

-set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt")
+set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../library/CMakeLists.txt")

 if(EXISTS ${COMMON_CMAKE_PATH})
    include(${COMMON_CMAKE_PATH})
--- a/library/bspMCU/My_Lwip.c
+++ b/library/bspMCU/My_Lwip.c
--- a/library/bspMCU/My_freeRTOS.c
+++ b/library/bspMCU/My_freeRTOS.c
--- a/library/bspMCU/My_print.c
+++ b/library/bspMCU/My_print.c
--- a/library/bspMCU/bsp_CAN.c
+++ b/library/bspMCU/bsp_CAN.c
--- a/library/bspMCU/bsp_cap.c
+++ b/library/bspMCU/bsp_cap.c
--- a/library/bspMCU/bsp_i2c.c
+++ b/library/bspMCU/bsp_i2c.c
--- a/library/bspMCU/bsp_pin.c
+++ b/library/bspMCU/bsp_pin.c
--- a/library/bspMCU/bsp_uart.c
+++ b/library/bspMCU/bsp_uart.c
--- a/library/bspMCU/bsp_usb.c
+++ b/library/bspMCU/bsp_usb.c
--- a/library/bspMCU/include/bsp_CAN.h
+++ b/library/bspMCU/include/bsp_CAN.h
--- a/library/bspMCU/include/bsp_cap.h
+++ b/library/bspMCU/include/bsp_cap.h
--- a/library/bspMCU/include/bsp_i2c.h
+++ b/library/bspMCU/include/bsp_i2c.h
--- a/library/bspMCU/include/bsp_pin.h
+++ b/library/bspMCU/include/bsp_pin.h
--- a/library/bspMCU/include/bsp_uart.h
+++ b/library/bspMCU/include/bsp_uart.h
--- a/library/bspMCU/include/bsp_usb.h
+++ b/library/bspMCU/include/bsp_usb.h
--- a/library/bspMCU/include/stmflash.h
+++ b/library/bspMCU/include/stmflash.h
--- a/library/bspMCU/l_can.c
+++ b/library/bspMCU/l_can.c
--- a/library/bspMCU/l_stm32.c
+++ b/library/bspMCU/l_stm32.c
--- a/library/bspMCU/l_uart.c
+++ b/library/bspMCU/l_uart.c
--- a/library/bspMCU/stmflash.c
+++ b/library/bspMCU/stmflash.c
--- a/library/lua/CMakeLists.txt
+++ b/library/lua/CMakeLists.txt
@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)

-set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt")
+set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../library/CMakeLists.txt")

 if(EXISTS ${COMMON_CMAKE_PATH})
    include(${COMMON_CMAKE_PATH})
--- a/library/lua/lapi.c
+++ b/library/lua/lapi.c
--- a/library/lua/lapi.h
+++ b/library/lua/lapi.h
--- a/library/lua/lauxlib.c
+++ b/library/lua/lauxlib.c
--- a/library/lua/lauxlib.h
+++ b/library/lua/lauxlib.h
--- a/library/lua/lbaselib.c
+++ b/library/lua/lbaselib.c
--- a/library/lua/lcode.c
+++ b/library/lua/lcode.c
--- a/library/lua/lcode.h
+++ b/library/lua/lcode.h
--- a/library/lua/lcorolib.c
+++ b/library/lua/lcorolib.c
--- a/library/lua/lctype.c
+++ b/library/lua/lctype.c
--- a/library/lua/lctype.h
+++ b/library/lua/lctype.h
--- a/library/lua/ldblib.c
+++ b/library/lua/ldblib.c
--- a/library/lua/ldebug.c
+++ b/library/lua/ldebug.c
--- a/library/lua/ldebug.h
+++ b/library/lua/ldebug.h
--- a/library/lua/ldo.c
+++ b/library/lua/ldo.c
--- a/library/lua/ldo.h
+++ b/library/lua/ldo.h
--- a/library/lua/ldump.c
+++ b/library/lua/ldump.c
--- a/library/lua/lfunc.c
+++ b/library/lua/lfunc.c
--- a/library/lua/lfunc.h
+++ b/library/lua/lfunc.h
--- a/library/lua/lgc.c
+++ b/library/lua/lgc.c
--- a/library/lua/lgc.h
+++ b/library/lua/lgc.h
--- a/library/lua/linit.c
+++ b/library/lua/linit.c
--- a/library/lua/liolib.c
+++ b/library/lua/liolib.c
--- a/library/lua/ljumptab.h
+++ b/library/lua/ljumptab.h
--- a/library/lua/llex.c
+++ b/library/lua/llex.c
--- a/library/lua/llex.h
+++ b/library/lua/llex.h
--- a/library/lua/llimits.h
+++ b/library/lua/llimits.h
--- a/library/lua/lmathlib.c
+++ b/library/lua/lmathlib.c
--- a/library/lua/lmem.c
+++ b/library/lua/lmem.c
--- a/library/lua/lmem.h
+++ b/library/lua/lmem.h
--- a/library/lua/loadlib.c
+++ b/library/lua/loadlib.c
--- a/library/lua/lobject.c
+++ b/library/lua/lobject.c
--- a/library/lua/lobject.h
+++ b/library/lua/lobject.h
--- a/library/lua/lopcodes.c
+++ b/library/lua/lopcodes.c
--- a/library/lua/lopcodes.h
+++ b/library/lua/lopcodes.h
--- a/library/lua/lopnames.h
+++ b/library/lua/lopnames.h
--- a/library/lua/loslib.c
+++ b/library/lua/loslib.c
--- a/library/lua/lparser.c
+++ b/library/lua/lparser.c
--- a/library/lua/lparser.h
+++ b/library/lua/lparser.h
--- a/library/lua/lprefix.h
+++ b/library/lua/lprefix.h
--- a/library/lua/lstate.c
+++ b/library/lua/lstate.c
--- a/library/lua/lstate.h
+++ b/library/lua/lstate.h
--- a/library/lua/lstring.c
+++ b/library/lua/lstring.c
--- a/library/lua/lstring.h
+++ b/library/lua/lstring.h
--- a/library/lua/lstrlib.c
+++ b/library/lua/lstrlib.c
--- a/library/lua/ltable.c
+++ b/library/lua/ltable.c
--- a/library/lua/ltable.h
+++ b/library/lua/ltable.h
--- a/library/lua/ltablib.c
+++ b/library/lua/ltablib.c
--- a/library/lua/ltm.c
+++ b/library/lua/ltm.c
--- a/library/lua/ltm.h
+++ b/library/lua/ltm.h
--- a/library/lua/lua.c
+++ b/library/lua/lua.c
--- a/library/lua/lua.h
+++ b/library/lua/lua.h
--- a/library/lua/lua.hpp
+++ b/library/lua/lua.hpp
--- a/library/lua/lua_base.h
+++ b/library/lua/lua_base.h
--- a/library/lua/luaconf.h
+++ b/library/lua/luaconf.h
--- a/library/lua/lualib.h
+++ b/library/lua/lualib.h
--- a/library/lua/lundump.c
+++ b/library/lua/lundump.c
--- a/library/lua/lundump.h
+++ b/library/lua/lundump.h
--- a/library/lua/lutf8lib.c
+++ b/library/lua/lutf8lib.c
--- a/library/lua/lvm.c
+++ b/library/lua/lvm.c
--- a/library/lua/lvm.h
+++ b/library/lua/lvm.h
--- a/library/lua/lzio.c
+++ b/library/lua/lzio.c
--- a/library/lua/lzio.h
+++ b/library/lua/lzio.h
--- a/library/peripheral/ATParser.c
+++ b/library/peripheral/ATParser.c
--- a/library/peripheral/CMakeLists.txt
+++ b/library/peripheral/CMakeLists.txt
@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10)

 get_filename_component(TARGET_NAME "${CMAKE_CURRENT_SOURCE_DIR}" NAME)
-set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt")
+set(COMMON_CMAKE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../library/CMakeLists.txt")

 if(EXISTS ${COMMON_CMAKE_PATH})
    include(${COMMON_CMAKE_PATH})
--- a/library/peripheral/button.c
+++ b/library/peripheral/button.c
--- a/library/peripheral/com.c
+++ b/library/peripheral/com.c
--- a/library/peripheral/include/ATParser.h
+++ b/library/peripheral/include/ATParser.h
--- a/library/peripheral/include/button.h
+++ b/library/peripheral/include/button.h
--- a/library/peripheral/include/com.h
+++ b/library/peripheral/include/com.h
--- a/library/peripheral/include/led.h
+++ b/library/peripheral/include/led.h
--- a/library/peripheral/led.c
+++ b/library/peripheral/led.c
--- a/library/peripheral/peripheral.c
+++ b/library/peripheral/peripheral.c