Normalize line endings (#126)

* add .gitattributes

* normalize line-endings
This commit is contained in:
Hans-Erik Floryd 2017-08-16 20:07:39 +02:00 committed by nakarlsson
parent da7d55e893
commit 3daefaea61
13 changed files with 131 additions and 114 deletions

17
.gitattributes vendored Normal file
View File

@ -0,0 +1,17 @@
# Set the default behavior, in case people don't have core.autocrlf set.
* text=auto
# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.c text
*.cpp text
*.h text
*.S text
*.txt text
*.md text
# Declare files that will always have LF line endings on checkout.
*.sh text eol=lf
# Denote all files that are truly binary and should not be modified.
*.lib binary

0
CMakeLists.txt Executable file → Normal file
View File

68
LICENSE
View File

@ -1,34 +1,34 @@
Simple Open EtherCAT Master Library Simple Open EtherCAT Master Library
Copyright (C) 2005-2017 Speciaal Machinefabriek Ketels v.o.f. Copyright (C) 2005-2017 Speciaal Machinefabriek Ketels v.o.f.
Copyright (C) 2005-2017 Arthur Ketels Copyright (C) 2005-2017 Arthur Ketels
Copyright (C) 2008-2009 TU/e Technische Universiteit Eindhoven Copyright (C) 2008-2009 TU/e Technische Universiteit Eindhoven
Copyright (C) 2009-2017 rt-labs AB, Sweden Copyright (C) 2009-2017 rt-labs AB, Sweden
SOEM is free software; you can redistribute it and/or modify it under the terms SOEM is free software; you can redistribute it and/or modify it under the terms
of the GNU General Public License version 2 as published by the Free Software of the GNU General Public License version 2 as published by the Free Software
Foundation. Foundation.
SOEM is distributed in the hope that it will be useful, but WITHOUT ANY SOEM is distributed in the hope that it will be useful, but WITHOUT ANY
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE. See the GNU General Public License for more details. PARTICULAR PURPOSE. See the GNU General Public License for more details.
As a special exception, if other files instantiate templates or use macros or As a special exception, if other files instantiate templates or use macros or
inline functions from this file, or you compile this file and link it with other inline functions from this file, or you compile this file and link it with other
works to produce a work based on this file, this file does not by itself cause works to produce a work based on this file, this file does not by itself cause
the resulting work to be covered by the GNU General Public License. However the the resulting work to be covered by the GNU General Public License. However the
source code for this file must still be made available in accordance with source code for this file must still be made available in accordance with
section (3) of the GNU General Public License. section (3) of the GNU General Public License.
This exception does not invalidate any other reasons why a work based on this This exception does not invalidate any other reasons why a work based on this
file might be covered by the GNU General Public License. file might be covered by the GNU General Public License.
The EtherCAT Technology, the trade name and logo "EtherCAT" are the intellectual The EtherCAT Technology, the trade name and logo "EtherCAT" are the intellectual
property of, and protected by Beckhoff Automation GmbH. You can use SOEM for the property of, and protected by Beckhoff Automation GmbH. You can use SOEM for the
sole purpose of creating, using and/or selling or otherwise distributing an sole purpose of creating, using and/or selling or otherwise distributing an
EtherCAT network master provided that an EtherCAT Master License is obtained EtherCAT network master provided that an EtherCAT Master License is obtained
from Beckhoff Automation GmbH. from Beckhoff Automation GmbH.
In case you did not receive a copy of the EtherCAT Master License along with In case you did not receive a copy of the EtherCAT Master License along with
SOEM write to Beckhoff Automation GmbH, Eiserstrasse 5, D-33415 Verl, Germany SOEM write to Beckhoff Automation GmbH, Eiserstrasse 5, D-33415 Verl, Germany
(www.beckhoff.com). (www.beckhoff.com).

View File

@ -1,13 +1,13 @@
message("rt-kernel-C.cmake") message("rt-kernel-C.cmake")
# Determine toolchain # Determine toolchain
include(CMakeForceCompiler) include(CMakeForceCompiler)
if(${ARCH} MATCHES "kinetis") if(${ARCH} MATCHES "kinetis")
cmake_force_c_compiler(arm-eabi-gcc GNU) cmake_force_c_compiler(arm-eabi-gcc GNU)
cmake_force_cxx_compiler(arm-eabi-g++ GNU) cmake_force_cxx_compiler(arm-eabi-g++ GNU)
elseif(${ARCH} MATCHES "bfin") elseif(${ARCH} MATCHES "bfin")
cmake_force_c_compiler(bfin-elf-gcc GNU) cmake_force_c_compiler(bfin-elf-gcc GNU)
cmake_force_cxx_compiler(bfin-elf-g++ GNU) cmake_force_cxx_compiler(bfin-elf-g++ GNU)
endif() endif()

View File

@ -1,3 +1,3 @@
set(MACHINE "-mcpu=bf537") set(MACHINE "-mcpu=bf537")
set(LDFLAGS "-T${RT_KERNEL_PATH}/bsp/${BSP}/${BSP}.ld") set(LDFLAGS "-T${RT_KERNEL_PATH}/bsp/${BSP}/${BSP}.ld")

View File

@ -1,7 +1,7 @@
message("rt-kernel-gcc-kinetis.cmake") message("rt-kernel-gcc-kinetis.cmake")
#SET_PROPERTY(GLOBAL PROPERTY ARCH kinetis) #SET_PROPERTY(GLOBAL PROPERTY ARCH kinetis)
#SET_PROPERTY(GLOBAL PROPERTY BSP twrk60) #SET_PROPERTY(GLOBAL PROPERTY BSP twrk60)
set(MACHINE "-mfpu=vfp -mcpu=cortex-m3 -mthumb") set(MACHINE "-mfpu=vfp -mcpu=cortex-m3 -mthumb")

View File

@ -1,19 +1,19 @@
message("rt-kernel-gcc.cmake") message("rt-kernel-gcc.cmake")
set(CMAKE_C_OUTPUT_EXTENSION .o) set(CMAKE_C_OUTPUT_EXTENSION .o)
set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE) set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
set(CFLAGS "${CFLAGS} -Wall -Wextra -Wno-unused-parameter -Werror") set(CFLAGS "${CFLAGS} -Wall -Wextra -Wno-unused-parameter -Werror")
set(CFLAGS "${CFLAGS} -fomit-frame-pointer -fno-strict-aliasing -fshort-wchar") set(CFLAGS "${CFLAGS} -fomit-frame-pointer -fno-strict-aliasing -fshort-wchar")
#set(CFLAGS" ${CFLAGS} -B$(GCC_PATH)/libexec/gcc") #set(CFLAGS" ${CFLAGS} -B$(GCC_PATH)/libexec/gcc")
set(CXXFLAGS "${CXXFLAGS} -fno-rtti -fno-exceptions") set(CXXFLAGS "${CXXFLAGS} -fno-rtti -fno-exceptions")
set(LDFLAGS "${LDFLAGS} -nostartfiles") set(LDFLAGS "${LDFLAGS} -nostartfiles")
set(CMAKE_C_FLAGS "${CFLAGS} ${MACHINE}" CACHE STRING "") set(CMAKE_C_FLAGS "${CFLAGS} ${MACHINE}" CACHE STRING "")
set(CMAKE_EXE_LINKER_FLAGS "${MACHINE} ${LDFLAGS}" CACHE STRING "") set(CMAKE_EXE_LINKER_FLAGS "${MACHINE} ${LDFLAGS}" CACHE STRING "")

View File

@ -1,20 +1,20 @@
if(__RTK_CMAKE_INCLUDED) if(__RTK_CMAKE_INCLUDED)
return() return()
endif() endif()
set(__RTK_CMAKE_INCLUDED TRUE) set(__RTK_CMAKE_INCLUDED TRUE)
message("rt-kernel.cmake") message("rt-kernel.cmake")
include_directories( include_directories(
${RT_KERNEL_PATH}/include ${RT_KERNEL_PATH}/include
${RT_KERNEL_PATH}/include/kern ${RT_KERNEL_PATH}/include/kern
${RT_KERNEL_PATH}/kern ${RT_KERNEL_PATH}/kern
${RT_KERNEL_PATH}/include/drivers ${RT_KERNEL_PATH}/include/drivers
${RT_KERNEL_PATH}/include/arch/${ARCH} ${RT_KERNEL_PATH}/include/arch/${ARCH}
${RT_KERNEL_PATH}/bsp/${BSP}/include ${RT_KERNEL_PATH}/bsp/${BSP}/include
${RT_KERNEL_PATH}/lwip/src/include ${RT_KERNEL_PATH}/lwip/src/include
${RT_KERNEL_PATH}/lwip/src/include/ipv4 ${RT_KERNEL_PATH}/lwip/src/include/ipv4
) )
link_directories( link_directories(
${RT_KERNEL_PATH}/lib/${ARCH} ${RT_KERNEL_PATH}/lib/${ARCH}
) )

View File

@ -1,9 +1,9 @@
message("rt-kernel-kinetis.cmake") message("rt-kernel-kinetis.cmake")
set(CMAKE_SYSTEM_NAME rt-kernel) set(CMAKE_SYSTEM_NAME rt-kernel)
set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_VERSION 1)
set(CMAKE_SYSTEM_PROCESSOR bfin) set(CMAKE_SYSTEM_PROCESSOR bfin)
set(ARCH bfin CACHE STRING "Architecture") set(ARCH bfin CACHE STRING "Architecture")
set(BSP stamp537 CACHE STRING "Board") set(BSP stamp537 CACHE STRING "Board")

View File

@ -1,9 +1,9 @@
message("rt-kernel-kinetis.cmake") message("rt-kernel-kinetis.cmake")
set(CMAKE_SYSTEM_NAME rt-kernel) set(CMAKE_SYSTEM_NAME rt-kernel)
set(CMAKE_SYSTEM_VERSION 1) set(CMAKE_SYSTEM_VERSION 1)
set(CMAKE_SYSTEM_PROCESSOR kinetis) set(CMAKE_SYSTEM_PROCESSOR kinetis)
set(ARCH kinetis CACHE STRING "Architecture") set(ARCH kinetis CACHE STRING "Architecture")
set(BSP twrk60 CACHE STRING "Board") set(BSP twrk60 CACHE STRING "Board")

0
osal/linux/osal.c Executable file → Normal file
View File

0
soem/ethercatmain.h Executable file → Normal file
View File

0
test/linux/slaveinfo/CMakeLists.txt Executable file → Normal file
View File