diff --git a/CMakeLists.txt b/CMakeLists.txt index e9f56de..bef24da 100644 --- 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) diff --git a/library/bspMCU/CMakeLists.txt b/bspMCU/CMakeLists.txt similarity index 91% rename from library/bspMCU/CMakeLists.txt rename to bspMCU/CMakeLists.txt index 84dfdc3..b340db1 100644 --- a/library/bspMCU/CMakeLists.txt +++ b/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}) diff --git a/library/bspMCU/My_Lwip.c b/bspMCU/My_Lwip.c similarity index 100% rename from library/bspMCU/My_Lwip.c rename to bspMCU/My_Lwip.c diff --git a/library/bspMCU/My_freeRTOS.c b/bspMCU/My_freeRTOS.c similarity index 100% rename from library/bspMCU/My_freeRTOS.c rename to bspMCU/My_freeRTOS.c diff --git a/library/bspMCU/My_print.c b/bspMCU/My_print.c similarity index 100% rename from library/bspMCU/My_print.c rename to bspMCU/My_print.c diff --git a/library/bspMCU/bsp_CAN.c b/bspMCU/bsp_CAN.c similarity index 100% rename from library/bspMCU/bsp_CAN.c rename to bspMCU/bsp_CAN.c diff --git a/library/bspMCU/bsp_cap.c b/bspMCU/bsp_cap.c similarity index 100% rename from library/bspMCU/bsp_cap.c rename to bspMCU/bsp_cap.c diff --git a/library/bspMCU/bsp_i2c.c b/bspMCU/bsp_i2c.c similarity index 100% rename from library/bspMCU/bsp_i2c.c rename to bspMCU/bsp_i2c.c diff --git a/library/bspMCU/bsp_pin.c b/bspMCU/bsp_pin.c similarity index 100% rename from library/bspMCU/bsp_pin.c rename to bspMCU/bsp_pin.c diff --git a/library/bspMCU/bsp_uart.c b/bspMCU/bsp_uart.c similarity index 100% rename from library/bspMCU/bsp_uart.c rename to bspMCU/bsp_uart.c diff --git a/library/bspMCU/bsp_usb.c b/bspMCU/bsp_usb.c similarity index 100% rename from library/bspMCU/bsp_usb.c rename to bspMCU/bsp_usb.c diff --git a/library/bspMCU/include/bsp_CAN.h b/bspMCU/include/bsp_CAN.h similarity index 100% rename from library/bspMCU/include/bsp_CAN.h rename to bspMCU/include/bsp_CAN.h diff --git a/library/bspMCU/include/bsp_cap.h b/bspMCU/include/bsp_cap.h similarity index 100% rename from library/bspMCU/include/bsp_cap.h rename to bspMCU/include/bsp_cap.h diff --git a/library/bspMCU/include/bsp_i2c.h b/bspMCU/include/bsp_i2c.h similarity index 100% rename from library/bspMCU/include/bsp_i2c.h rename to bspMCU/include/bsp_i2c.h diff --git a/library/bspMCU/include/bsp_pin.h b/bspMCU/include/bsp_pin.h similarity index 100% rename from library/bspMCU/include/bsp_pin.h rename to bspMCU/include/bsp_pin.h diff --git a/library/bspMCU/include/bsp_uart.h b/bspMCU/include/bsp_uart.h similarity index 100% rename from library/bspMCU/include/bsp_uart.h rename to bspMCU/include/bsp_uart.h diff --git a/library/bspMCU/include/bsp_usb.h b/bspMCU/include/bsp_usb.h similarity index 100% rename from library/bspMCU/include/bsp_usb.h rename to bspMCU/include/bsp_usb.h diff --git a/library/bspMCU/include/stmflash.h b/bspMCU/include/stmflash.h similarity index 100% rename from library/bspMCU/include/stmflash.h rename to bspMCU/include/stmflash.h diff --git a/library/bspMCU/l_can.c b/bspMCU/l_can.c similarity index 100% rename from library/bspMCU/l_can.c rename to bspMCU/l_can.c diff --git a/library/bspMCU/l_stm32.c b/bspMCU/l_stm32.c similarity index 100% rename from library/bspMCU/l_stm32.c rename to bspMCU/l_stm32.c diff --git a/library/bspMCU/l_uart.c b/bspMCU/l_uart.c similarity index 100% rename from library/bspMCU/l_uart.c rename to bspMCU/l_uart.c diff --git a/library/bspMCU/stmflash.c b/bspMCU/stmflash.c similarity index 100% rename from library/bspMCU/stmflash.c rename to bspMCU/stmflash.c diff --git a/library/lua/CMakeLists.txt b/lua/CMakeLists.txt similarity index 85% rename from library/lua/CMakeLists.txt rename to lua/CMakeLists.txt index 3c5cd7d..ee42bc6 100644 --- a/library/lua/CMakeLists.txt +++ b/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}) diff --git a/library/lua/lapi.c b/lua/lapi.c similarity index 100% rename from library/lua/lapi.c rename to lua/lapi.c diff --git a/library/lua/lapi.h b/lua/lapi.h similarity index 100% rename from library/lua/lapi.h rename to lua/lapi.h diff --git a/library/lua/lauxlib.c b/lua/lauxlib.c similarity index 100% rename from library/lua/lauxlib.c rename to lua/lauxlib.c diff --git a/library/lua/lauxlib.h b/lua/lauxlib.h similarity index 100% rename from library/lua/lauxlib.h rename to lua/lauxlib.h diff --git a/library/lua/lbaselib.c b/lua/lbaselib.c similarity index 100% rename from library/lua/lbaselib.c rename to lua/lbaselib.c diff --git a/library/lua/lcode.c b/lua/lcode.c similarity index 100% rename from library/lua/lcode.c rename to lua/lcode.c diff --git a/library/lua/lcode.h b/lua/lcode.h similarity index 100% rename from library/lua/lcode.h rename to lua/lcode.h diff --git a/library/lua/lcorolib.c b/lua/lcorolib.c similarity index 100% rename from library/lua/lcorolib.c rename to lua/lcorolib.c diff --git a/library/lua/lctype.c b/lua/lctype.c similarity index 100% rename from library/lua/lctype.c rename to lua/lctype.c diff --git a/library/lua/lctype.h b/lua/lctype.h similarity index 100% rename from library/lua/lctype.h rename to lua/lctype.h diff --git a/library/lua/ldblib.c b/lua/ldblib.c similarity index 100% rename from library/lua/ldblib.c rename to lua/ldblib.c diff --git a/library/lua/ldebug.c b/lua/ldebug.c similarity index 100% rename from library/lua/ldebug.c rename to lua/ldebug.c diff --git a/library/lua/ldebug.h b/lua/ldebug.h similarity index 100% rename from library/lua/ldebug.h rename to lua/ldebug.h diff --git a/library/lua/ldo.c b/lua/ldo.c similarity index 100% rename from library/lua/ldo.c rename to lua/ldo.c diff --git a/library/lua/ldo.h b/lua/ldo.h similarity index 100% rename from library/lua/ldo.h rename to lua/ldo.h diff --git a/library/lua/ldump.c b/lua/ldump.c similarity index 100% rename from library/lua/ldump.c rename to lua/ldump.c diff --git a/library/lua/lfunc.c b/lua/lfunc.c similarity index 100% rename from library/lua/lfunc.c rename to lua/lfunc.c diff --git a/library/lua/lfunc.h b/lua/lfunc.h similarity index 100% rename from library/lua/lfunc.h rename to lua/lfunc.h diff --git a/library/lua/lgc.c b/lua/lgc.c similarity index 100% rename from library/lua/lgc.c rename to lua/lgc.c diff --git a/library/lua/lgc.h b/lua/lgc.h similarity index 100% rename from library/lua/lgc.h rename to lua/lgc.h diff --git a/library/lua/linit.c b/lua/linit.c similarity index 100% rename from library/lua/linit.c rename to lua/linit.c diff --git a/library/lua/liolib.c b/lua/liolib.c similarity index 100% rename from library/lua/liolib.c rename to lua/liolib.c diff --git a/library/lua/ljumptab.h b/lua/ljumptab.h similarity index 100% rename from library/lua/ljumptab.h rename to lua/ljumptab.h diff --git a/library/lua/llex.c b/lua/llex.c similarity index 100% rename from library/lua/llex.c rename to lua/llex.c diff --git a/library/lua/llex.h b/lua/llex.h similarity index 100% rename from library/lua/llex.h rename to lua/llex.h diff --git a/library/lua/llimits.h b/lua/llimits.h similarity index 100% rename from library/lua/llimits.h rename to lua/llimits.h diff --git a/library/lua/lmathlib.c b/lua/lmathlib.c similarity index 100% rename from library/lua/lmathlib.c rename to lua/lmathlib.c diff --git a/library/lua/lmem.c b/lua/lmem.c similarity index 100% rename from library/lua/lmem.c rename to lua/lmem.c diff --git a/library/lua/lmem.h b/lua/lmem.h similarity index 100% rename from library/lua/lmem.h rename to lua/lmem.h diff --git a/library/lua/loadlib.c b/lua/loadlib.c similarity index 100% rename from library/lua/loadlib.c rename to lua/loadlib.c diff --git a/library/lua/lobject.c b/lua/lobject.c similarity index 100% rename from library/lua/lobject.c rename to lua/lobject.c diff --git a/library/lua/lobject.h b/lua/lobject.h similarity index 100% rename from library/lua/lobject.h rename to lua/lobject.h diff --git a/library/lua/lopcodes.c b/lua/lopcodes.c similarity index 100% rename from library/lua/lopcodes.c rename to lua/lopcodes.c diff --git a/library/lua/lopcodes.h b/lua/lopcodes.h similarity index 100% rename from library/lua/lopcodes.h rename to lua/lopcodes.h diff --git a/library/lua/lopnames.h b/lua/lopnames.h similarity index 100% rename from library/lua/lopnames.h rename to lua/lopnames.h diff --git a/library/lua/loslib.c b/lua/loslib.c similarity index 100% rename from library/lua/loslib.c rename to lua/loslib.c diff --git a/library/lua/lparser.c b/lua/lparser.c similarity index 100% rename from library/lua/lparser.c rename to lua/lparser.c diff --git a/library/lua/lparser.h b/lua/lparser.h similarity index 100% rename from library/lua/lparser.h rename to lua/lparser.h diff --git a/library/lua/lprefix.h b/lua/lprefix.h similarity index 100% rename from library/lua/lprefix.h rename to lua/lprefix.h diff --git a/library/lua/lstate.c b/lua/lstate.c similarity index 100% rename from library/lua/lstate.c rename to lua/lstate.c diff --git a/library/lua/lstate.h b/lua/lstate.h similarity index 100% rename from library/lua/lstate.h rename to lua/lstate.h diff --git a/library/lua/lstring.c b/lua/lstring.c similarity index 100% rename from library/lua/lstring.c rename to lua/lstring.c diff --git a/library/lua/lstring.h b/lua/lstring.h similarity index 100% rename from library/lua/lstring.h rename to lua/lstring.h diff --git a/library/lua/lstrlib.c b/lua/lstrlib.c similarity index 100% rename from library/lua/lstrlib.c rename to lua/lstrlib.c diff --git a/library/lua/ltable.c b/lua/ltable.c similarity index 100% rename from library/lua/ltable.c rename to lua/ltable.c diff --git a/library/lua/ltable.h b/lua/ltable.h similarity index 100% rename from library/lua/ltable.h rename to lua/ltable.h diff --git a/library/lua/ltablib.c b/lua/ltablib.c similarity index 100% rename from library/lua/ltablib.c rename to lua/ltablib.c diff --git a/library/lua/ltm.c b/lua/ltm.c similarity index 100% rename from library/lua/ltm.c rename to lua/ltm.c diff --git a/library/lua/ltm.h b/lua/ltm.h similarity index 100% rename from library/lua/ltm.h rename to lua/ltm.h diff --git a/library/lua/lua.c b/lua/lua.c similarity index 100% rename from library/lua/lua.c rename to lua/lua.c diff --git a/library/lua/lua.h b/lua/lua.h similarity index 100% rename from library/lua/lua.h rename to lua/lua.h diff --git a/library/lua/lua.hpp b/lua/lua.hpp similarity index 100% rename from library/lua/lua.hpp rename to lua/lua.hpp diff --git a/library/lua/lua_base.h b/lua/lua_base.h similarity index 100% rename from library/lua/lua_base.h rename to lua/lua_base.h diff --git a/library/lua/luaconf.h b/lua/luaconf.h similarity index 100% rename from library/lua/luaconf.h rename to lua/luaconf.h diff --git a/library/lua/lualib.h b/lua/lualib.h similarity index 100% rename from library/lua/lualib.h rename to lua/lualib.h diff --git a/library/lua/lundump.c b/lua/lundump.c similarity index 100% rename from library/lua/lundump.c rename to lua/lundump.c diff --git a/library/lua/lundump.h b/lua/lundump.h similarity index 100% rename from library/lua/lundump.h rename to lua/lundump.h diff --git a/library/lua/lutf8lib.c b/lua/lutf8lib.c similarity index 100% rename from library/lua/lutf8lib.c rename to lua/lutf8lib.c diff --git a/library/lua/lvm.c b/lua/lvm.c similarity index 100% rename from library/lua/lvm.c rename to lua/lvm.c diff --git a/library/lua/lvm.h b/lua/lvm.h similarity index 100% rename from library/lua/lvm.h rename to lua/lvm.h diff --git a/library/lua/lzio.c b/lua/lzio.c similarity index 100% rename from library/lua/lzio.c rename to lua/lzio.c diff --git a/library/lua/lzio.h b/lua/lzio.h similarity index 100% rename from library/lua/lzio.h rename to lua/lzio.h diff --git a/library/peripheral/ATParser.c b/peripheral/ATParser.c similarity index 100% rename from library/peripheral/ATParser.c rename to peripheral/ATParser.c diff --git a/library/peripheral/CMakeLists.txt b/peripheral/CMakeLists.txt similarity index 91% rename from library/peripheral/CMakeLists.txt rename to peripheral/CMakeLists.txt index 118ad48..afc9af4 100644 --- a/library/peripheral/CMakeLists.txt +++ b/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}) diff --git a/library/peripheral/button.c b/peripheral/button.c similarity index 100% rename from library/peripheral/button.c rename to peripheral/button.c diff --git a/library/peripheral/com.c b/peripheral/com.c similarity index 100% rename from library/peripheral/com.c rename to peripheral/com.c diff --git a/library/peripheral/include/ATParser.h b/peripheral/include/ATParser.h similarity index 100% rename from library/peripheral/include/ATParser.h rename to peripheral/include/ATParser.h diff --git a/library/peripheral/include/button.h b/peripheral/include/button.h similarity index 100% rename from library/peripheral/include/button.h rename to peripheral/include/button.h diff --git a/library/peripheral/include/com.h b/peripheral/include/com.h similarity index 100% rename from library/peripheral/include/com.h rename to peripheral/include/com.h diff --git a/library/peripheral/include/led.h b/peripheral/include/led.h similarity index 100% rename from library/peripheral/include/led.h rename to peripheral/include/led.h diff --git a/library/peripheral/led.c b/peripheral/led.c similarity index 100% rename from library/peripheral/led.c rename to peripheral/led.c diff --git a/library/peripheral/peripheral.c b/peripheral/peripheral.c similarity index 100% rename from library/peripheral/peripheral.c rename to peripheral/peripheral.c