Move some external files to external/ folder (#744)
It is lot easier to work with automatic formatters if we have external files in different folder. For some tools we can example just exclude external all together. Co-authored-by: Kari Argillander <kari.argillander@fidelix.com>
This commit is contained in:
@@ -402,7 +402,7 @@ showfuses:
|
|||||||
$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_READ_FUSES)
|
$(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_READ_FUSES)
|
||||||
|
|
||||||
bootloader:
|
bootloader:
|
||||||
make -C bootloader all
|
make -C external/bootloader all
|
||||||
|
|
||||||
## Clean target
|
## Clean target
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<!DOCTYPE CrossStudio_Project_File>
|
<!DOCTYPE CrossStudio_Project_File>
|
||||||
<solution Name="bacnet" version="2">
|
<solution Name="bacnet" version="2">
|
||||||
<project Name="bacnet">
|
<project Name="bacnet">
|
||||||
<configuration Name="Common" Platform="AVR" Target="ATmega644P" avr_architecture="V2E" avr_debug_interface="JTAG" avr_flash_size="128K" build_use_hardware_multiplier="Yes" c_preprocessor_definitions="BACDL_MSTP;MAX_APDU=128;MAX_TSM_TRANSACTIONS=0;MAX_CHARACTER_STRING_BYTES=64;MAX_OCTET_STRING_BYTES=64;BACAPP_BOOLEAN;BACAPP_REAL;BACAPP_OBJECT_ID;BACAPP_UNSIGNED;BACAPP_ENUMERATED;BACAPP_CHARACTER_STRING;BACAPP_OCTET_STRING;WRITE_PROPERTY" c_user_include_directories="$(ProjectDir);$(ProjectDir)/crossworks;$(ProjectDir)/../../include;$(ProjectDir)/../../src" linker_call_stack_size="1024" linker_memory_map_file="$(PackagesDir)/targets/avr/ATmega644P.xml" project_directory="" project_type="Executable"/>
|
<configuration Name="Common" Platform="AVR" Target="ATmega644P" avr_architecture="V2E" avr_debug_interface="JTAG" avr_flash_size="128K" build_use_hardware_multiplier="Yes" c_preprocessor_definitions="BACDL_MSTP;MAX_APDU=128;MAX_TSM_TRANSACTIONS=0;MAX_CHARACTER_STRING_BYTES=64;MAX_OCTET_STRING_BYTES=64;BACAPP_BOOLEAN;BACAPP_REAL;BACAPP_OBJECT_ID;BACAPP_UNSIGNED;BACAPP_ENUMERATED;BACAPP_CHARACTER_STRING;BACAPP_OCTET_STRING;WRITE_PROPERTY" c_user_include_directories="$(ProjectDir);$(ProjectDir)/external/crossworks;$(ProjectDir)/../../include;$(ProjectDir)/../../src" linker_call_stack_size="1024" linker_memory_map_file="$(PackagesDir)/targets/avr/ATmega644P.xml" project_directory="" project_type="Executable"/>
|
||||||
<folder Name="Source Files">
|
<folder Name="Source Files">
|
||||||
<configuration Name="Common" filter="c;h;s;asm;inc;s90"/>
|
<configuration Name="Common" filter="c;h;s;asm;inc;s90"/>
|
||||||
<file file_name="adc.c">
|
<file file_name="adc.c">
|
||||||
|
|||||||
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
@@ -99,10 +99,10 @@ endif()
|
|||||||
set(LIBRARY_BACNET_INC "${CMAKE_SOURCE_DIR}/../../src")
|
set(LIBRARY_BACNET_INC "${CMAKE_SOURCE_DIR}/../../src")
|
||||||
set(LIBRARY_BACNET_CORE "${CMAKE_SOURCE_DIR}/../../src/bacnet")
|
set(LIBRARY_BACNET_CORE "${CMAKE_SOURCE_DIR}/../../src/bacnet")
|
||||||
set(LIBRARY_BACNET_BASIC "${CMAKE_SOURCE_DIR}/../../src/bacnet/basic")
|
set(LIBRARY_BACNET_BASIC "${CMAKE_SOURCE_DIR}/../../src/bacnet/basic")
|
||||||
set(LIBRARY_STM32_SRC "${CMAKE_SOURCE_DIR}/drivers/src")
|
set(LIBRARY_STM32_SRC "${CMAKE_SOURCE_DIR}/external/drivers/src")
|
||||||
set(LIBRARY_STM32_INC "${CMAKE_SOURCE_DIR}/drivers/inc")
|
set(LIBRARY_STM32_INC "${CMAKE_SOURCE_DIR}/external/drivers/inc")
|
||||||
set(LIBRARY_CMSIS_INC "${CMAKE_SOURCE_DIR}/CMSIS")
|
set(LIBRARY_CMSIS_INC "${CMAKE_SOURCE_DIR}/external/CMSIS")
|
||||||
set(LIBRARY_CMSIS_GCC_INC "${CMAKE_SOURCE_DIR}/CMSIS/gcc_ride7")
|
set(LIBRARY_CMSIS_GCC_INC "${CMAKE_SOURCE_DIR}/external/CMSIS/gcc_ride7")
|
||||||
|
|
||||||
set(BACNET_PROJECT_SOURCE
|
set(BACNET_PROJECT_SOURCE
|
||||||
${LIBRARY_STM32_SRC}/stm32f10x_adc.c
|
${LIBRARY_STM32_SRC}/stm32f10x_adc.c
|
||||||
@@ -205,7 +205,7 @@ set(BACNET_PROJECT_SOURCE
|
|||||||
${LIBRARY_BACNET_CORE}/wp.c
|
${LIBRARY_BACNET_CORE}/wp.c
|
||||||
|
|
||||||
${LIBRARY_CMSIS_GCC_INC}/startup_stm32f10x_xl.s
|
${LIBRARY_CMSIS_GCC_INC}/startup_stm32f10x_xl.s
|
||||||
CMSIS/stm32f10x.h
|
${LIBRARY_CMSIS_INC}/stm32f10x.h
|
||||||
)
|
)
|
||||||
|
|
||||||
set(LINKER_SCRIPT ${CMAKE_SOURCE_DIR}/stm32f10x.ld)
|
set(LINKER_SCRIPT ${CMAKE_SOURCE_DIR}/stm32f10x.ld)
|
||||||
|
|||||||
@@ -9,9 +9,9 @@ BACNET_CORE := $(BACNET_SRC)/bacnet
|
|||||||
BACNET_BASIC := $(BACNET_CORE)/basic
|
BACNET_BASIC := $(BACNET_CORE)/basic
|
||||||
BACNET_INCLUDE := $(BACNET_SRC)
|
BACNET_INCLUDE := $(BACNET_SRC)
|
||||||
PLATFORM_DIR = .
|
PLATFORM_DIR = .
|
||||||
LIBRARY_STM32 = ./drivers/src
|
LIBRARY_STM32 = ./external/drivers/src
|
||||||
LIBRARY_STM32_INCLUDES = ./drivers/inc
|
LIBRARY_STM32_INCLUDES = ./external/drivers/inc
|
||||||
LIBRARY_CMSIS = ./CMSIS
|
LIBRARY_CMSIS = ./external/CMSIS
|
||||||
|
|
||||||
CSTACK_TOOL := $(BACNET_DIR)/tools/avstack/avstack.pl
|
CSTACK_TOOL := $(BACNET_DIR)/tools/avstack/avstack.pl
|
||||||
MEMAP_TOOL := $(BACNET_DIR)/tools/memap/memap.py
|
MEMAP_TOOL := $(BACNET_DIR)/tools/memap/memap.py
|
||||||
|
|||||||
+26
-26
@@ -356,8 +356,8 @@
|
|||||||
<name>CCIncludePath2</name>
|
<name>CCIncludePath2</name>
|
||||||
<state>$PROJ_DIR$</state>
|
<state>$PROJ_DIR$</state>
|
||||||
<state>$PROJ_DIR$\..\..\src</state>
|
<state>$PROJ_DIR$\..\..\src</state>
|
||||||
<state>$PROJ_DIR$\CMSIS\</state>
|
<state>$PROJ_DIR$\external\CMSIS\</state>
|
||||||
<state>$PROJ_DIR$\drivers\inc</state>
|
<state>$PROJ_DIR$\external\drivers\inc</state>
|
||||||
</option>
|
</option>
|
||||||
<option>
|
<option>
|
||||||
<name>CCStdIncCheck</name>
|
<name>CCStdIncCheck</name>
|
||||||
@@ -1212,79 +1212,79 @@
|
|||||||
<group>
|
<group>
|
||||||
<name>CMSIS</name>
|
<name>CMSIS</name>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\CMSIS\iar\startup_stm32f10x_xl.s</name>
|
<name>$PROJ_DIR$\external\CMSIS\iar\startup_stm32f10x_xl.s</name>
|
||||||
</file>
|
</file>
|
||||||
</group>
|
</group>
|
||||||
<group>
|
<group>
|
||||||
<name>STM32-Lib</name>
|
<name>STM32-Lib</name>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_adc.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_adc.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_bkp.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_bkp.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_can.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_can.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_cec.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_cec.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_crc.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_crc.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_dac.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_dac.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_dbgmcu.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_dbgmcu.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_dma.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_dma.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_exti.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_exti.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_flash.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_flash.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_fsmc.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_fsmc.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_gpio.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_gpio.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_i2c.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_i2c.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_iwdg.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_iwdg.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_misc.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_misc.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_pwr.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_pwr.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_rcc.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_rcc.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_rtc.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_rtc.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_sdio.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_sdio.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_spi.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_spi.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_tim.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_tim.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_usart.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_usart.c</name>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
<file>
|
||||||
<name>$PROJ_DIR$\drivers\src\stm32f10x_wwdg.c</name>
|
<name>$PROJ_DIR$\external\drivers\src\stm32f10x_wwdg.c</name>
|
||||||
</file>
|
</file>
|
||||||
</group>
|
</group>
|
||||||
<file>
|
<file>
|
||||||
|
|||||||
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Vendored
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user