This repository is currently being migrated. It's locked while the migration is in progress.
forked from orocos/soem
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5 from tokoro10g/2021.11.17-gitai-patch
Sync with upstream
- Loading branch information
Showing
409 changed files
with
31,529 additions
and
67,717 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
| Changelog for package soem | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
|
|
||
| 1.4.1003 (2020-08-03) | ||
| --------------------- | ||
| * fixes `#40 <https://github.com/mgruhler/soem/issues/40>`_: export include directories properly | ||
| * Contributors: Matthias Gruhler | ||
|
|
||
| 1.4.1002 (2020-06-24) | ||
| --------------------- | ||
| * Merge pull request `#39 <https://github.com/mgruhler/soem/issues/39>`_ from mgruhler/fix/warnings_as_errors_focal | ||
| remove -Werror flag for linux | ||
| * remove -Werror flag for linux | ||
| * Contributors: Matthias Gruhler | ||
|
|
||
| 1.4.1001 (2020-06-19) | ||
| --------------------- | ||
| * remove package upgrade message | ||
| * Contributors: Matthias Gruhler | ||
|
|
||
| 1.4.1000 (2020-06-19) | ||
| --------------------- | ||
| * fix formatting of README | ||
| * remove stale bot | ||
| * change version number policy and bump to 1.4.1000 | ||
| * bump cmake_minimum to 3.0.2 | ||
| * Merge pull request `#33 <https://github.com/mgruhler/soem/issues/33>`_ from seanyen/windows | ||
| [master] Enable Windows build. | ||
| * undef WIN32_LEAN_AND_MEAN instead of touching SOEM code. | ||
| * Enable Windows build. | ||
| * Contributors: Matthias Gruhler, seanyen | ||
|
|
||
| 1.4.0 (2019-09-19) | ||
| ------------------ | ||
| * Merge pull request `#24 <https://github.com/mgruhler/soem/issues/24>`_ from mgruhler/upstream_soem_via_subtree | ||
| Upstream soem release 1.4.0 via subtree | ||
| * explicitely export pthread dependency, reported in `#30 <https://github.com/mgruhler/soem/issues/30>`_ | ||
| * install all headers in osal and oshw | ||
| * fixes `#29 <https://github.com/mgruhler/soem/issues/29>`_: provides issue templates | ||
| provides three templates | ||
| - bug report | ||
| - feature request | ||
| - question | ||
| * fixes `#28 <https://github.com/mgruhler/soem/issues/28>`_: adds note about ethercat_grant to README | ||
| * fix readme justification | ||
| * Merge branch 'master' into upstream_soem_via_subtree | ||
| * Merge pull request `#25 <https://github.com/mgruhler/soem/issues/25>`_ from mgruhler/upgrade_announcement | ||
| add upgrade announcement | ||
| * add upgrade announcement | ||
| * change deprecation message | ||
| * switch from type DEPRECATION to type <none> | ||
| * minor formatting and typo fixes | ||
| * make new integration backwards compatible | ||
| - add deprecation warning of workaround to CMakeLists.txt | ||
| - change order of include directories in cfg extras file | ||
| * restore version number and relevant package.xml contents | ||
| * update docs | ||
| * fix description in package.xml | ||
| * update README | ||
| * setup ROS build instructions for upstream SOEM as subtree | ||
| - add new package.xml and CMakeLists.txt | ||
| - add -fPIC definition and comment ROS specific "hacks" | ||
| - copy headers to develspace instead of src space | ||
| - provide cmake extras file to set include directories | ||
| - fix cmake_minimum_required for using add_compile_options | ||
| - ignore catkin_lint errors for SOEM CMakeLists.txt | ||
| * Merge commit 'd471a3878b20d650a6d80a487625324392a23906' as 'SOEM' | ||
| * Squashed 'SOEM/' content from commit abbf0d4 | ||
| git-subtree-dir: SOEM | ||
| git-subtree-split: abbf0d42e38d6cfbaa4c1e9e8e07ace651c386fd | ||
| * remove old SOEM state | ||
| * State release into ROS melodic in README.md | ||
| * Add close comment and extend daysUntilClose in stale.yaml | ||
| * Update README.md: clarify Usage section | ||
| add note to either use from apt or followed development section | ||
| * add stale.yml for Stale Probot | ||
| * add README.md: | ||
| * clarifying what this package is about | ||
| * adding sections about installation, usage and development | ||
| * update description in package.xml | ||
| - more explicitely explain what this package is about | ||
| - link more directly to upstream by noting what this is actually based upon | ||
| * update description and URLs in package.xml | ||
| * update maintainer | ||
|
|
||
| 1.3.0 (2015-01-26) | ||
| ------------------- | ||
| * Update soem version number | ||
| Signed-off-by: Ruben Smits <ruben.smits@intermodalics.eu> | ||
| * cmake: remove erroneous linking to pq | ||
| Signed-off-by: Ruben Smits <ruben.smits@intermodalics.eu> | ||
| * cmake: use non-capitalised project name in cmake config file | ||
| Signed-off-by: Ruben Smits <ruben.smits@intermodalics.eu> | ||
| * Merge pull request `#3 <https://github.com/mgruhler/soem/issues/3>`_ from meyerj/cmake-fixes | ||
| Some more cmake fixes required for installation | ||
| * osal: added missing header installation | ||
| * cmake: fixed exported cmake config | ||
| * Merge pull request `#1 <https://github.com/mgruhler/soem/issues/1>`_ from meyerj/patch-1 | ||
| Fixed header installation in oshw | ||
| * Fixed header installation in oshw | ||
| * add missing CMakeLists.txt for oshw dir | ||
| Signed-off-by: Ruben Smits <ruben.smits@intermodalics.eu> | ||
| * finalized cmake build system for 1.3.0 | ||
| Signed-off-by: Ruben Smits <ruben.smits@intermodalics.eu> | ||
| * Import upstream release 1.3.0 | ||
| Signed-off-by: Ruben Smits <ruben.smits@intermodalics.eu> | ||
| * move src to soem directory to prepare 1.3.0 upgrade | ||
| Signed-off-by: Ruben Smits <ruben.smits@intermodalics.eu> | ||
| * Added install rule for package.xml | ||
| Signed-off-by: Ruben Smits <ruben.smits@intermodalics.eu> | ||
|
|
||
| 1.2.5 (2013-03-06) | ||
| ------------------- | ||
| * add cmake build system | ||
| Signed-off-by: Ruben Smits <ruben.smits@intermodalics.eu> | ||
| * Upstream SOEM 1.2.5 | ||
| Signed-off-by: Ruben Smits <ruben.smits@intermodalics.eu> | ||
| * Contributors: Johannes Meyer, Matthias Gruhler, Ruben Smits |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,68 +1,79 @@ | ||
| cmake_minimum_required(VERSION 2.6.4) | ||
|
|
||
| cmake_minimum_required(VERSION 3.0.2) | ||
| project(soem) | ||
|
|
||
| message([=[ | ||
| ===================================== | ||
| SOEM ROS Package Upgrade Announcement | ||
| ===================================== | ||
| To any consumers of the SOEM ROS package: | ||
|
|
||
| This package will be upgraded to the new Release of the upstream SOEM repo v1.4.0. | ||
| The upgrade via this PR on GitHub https://github.com/mgruhler/soem/pull/24 will happen on the | ||
|
|
||
| =================== | ||
| 31st of August 2019 | ||
| =================== | ||
| find_package(catkin REQUIRED) | ||
|
|
||
| This upgrade will bring not only the new release, but also changes to the `catkin` plumbing. | ||
| This allows you to use soem from within your regular ROS workspace. No more jumping through | ||
| the hoops required, that are described in the Usage section of the Readme: https://github.com/mgruhler/soem#usage. | ||
| # set-up destination variables | ||
| catkin_destinations() | ||
|
|
||
| The changes to the build system are backwards compatible. | ||
| # create directory during CMake build system creation step | ||
| file(MAKE_DIRECTORY ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_INCLUDE_DESTINATION}) | ||
|
|
||
| Changes in upstream SOEM, however, might not be! Please test the above linked PR and provide | ||
| feedback until the merge deadline, if you are a heavy user of this library. | ||
|
|
||
| The current state of the SOEM ROS package has been tagged with v1.3.0 if you cannot use the new version. | ||
| ]=]) | ||
|
|
||
| find_package(catkin QUIET) | ||
| if(catkin_FOUND) | ||
| catkin_package( INCLUDE_DIRS soem osal oshw/linux | ||
| LIBRARIES soem osal oshw | ||
| ) | ||
| if(WIN32) | ||
| set(OS "win32") | ||
| else() | ||
| set(OS "linux") | ||
| endif() | ||
|
|
||
| include_directories(${CMAKE_CURRENT_SOURCE_DIR} | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/osal | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/oshw/linux | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/soem ) | ||
|
|
||
| add_definitions(-DEC_VER1) | ||
| add_subdirectory(osal) | ||
| add_subdirectory(oshw) | ||
| add_subdirectory(soem) | ||
| add_subdirectory(test) | ||
|
|
||
| install(FILES package.xml DESTINATION share/soem) | ||
|
|
||
| # Add all targets to the build-tree export set | ||
| export(TARGETS soem osal oshw simple_test red_test slaveinfo eepromtool ebox firm_update FILE "${PROJECT_BINARY_DIR}/SoemTargets.cmake") | ||
|
|
||
| # Export the package for use from the build-tree | ||
| # (this registers the build-tree with a global CMake-registry) | ||
| export(PACKAGE soem) | ||
|
|
||
|
|
||
| configure_file(soem-config.cmake.in ${PROJECT_BINARY_DIR}/soem-config.cmake @ONLY) | ||
| configure_file(soem-config-version.cmake.in ${PROJECT_BINARY_DIR}/soem-config-version.cmake @ONLY) | ||
|
|
||
| install(FILES ${PROJECT_BINARY_DIR}/soem-config.cmake ${PROJECT_BINARY_DIR}/soem-config-version.cmake | ||
| DESTINATION share/soem) | ||
|
|
||
| # Install the export set for use with the install-tree | ||
| install(EXPORT SoemTargets DESTINATION share/soem) | ||
|
|
||
| file(GLOB SOEM_COMMON_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/SOEM/soem/*.h") | ||
| file(GLOB SOEM_OSAL_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/SOEM/osal/${OS}/*.h") | ||
| file(GLOB SOEM_OSHW_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/SOEM/oshw/${OS}/*.h") | ||
|
|
||
| # Copy header to ROS-standard location in devel space to satisfy catkin_package | ||
| add_custom_target(CopyHeaders ALL | ||
| COMMAND ${CMAKE_COMMAND} -E copy_if_different | ||
| ${SOEM_COMMON_HEADERS} | ||
| ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_INCLUDE_DESTINATION} | ||
| COMMAND ${CMAKE_COMMAND} -E copy_if_different | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/SOEM/osal/osal.h | ||
| ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_INCLUDE_DESTINATION} | ||
| COMMAND ${CMAKE_COMMAND} -E copy_if_different | ||
| ${SOEM_OSAL_HEADERS} | ||
| ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_INCLUDE_DESTINATION} | ||
| COMMAND ${CMAKE_COMMAND} -E copy_if_different | ||
| ${SOEM_OSHW_HEADERS} | ||
| ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_INCLUDE_DESTINATION} | ||
| COMMENT "Copying SOEM headers to ROS-standard in devel space location.") | ||
|
|
||
| if(WIN32) | ||
| add_custom_target(CopyWpcapHeaders ALL | ||
| COMMAND ${CMAKE_COMMAND} -E copy_directory | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/SOEM/oshw/${OS}/wpcap/Include/ | ||
| ${CATKIN_DEVEL_PREFIX}/${CATKIN_PACKAGE_INCLUDE_DESTINATION} | ||
| COMMENT "Copying Wpcap headers to ROS-standard in devel space location.") | ||
| endif() | ||
|
|
||
| # explicitely find pthread to be able to explicitely export the pthread dependency via catkin_package | ||
| # see https://github.com/ros/ros_comm/issues/135 | ||
| set(PTHREAD_LIB "") | ||
| find_package(Threads) | ||
| if(CMAKE_THREAD_LIBS_INIT) | ||
| string(LENGTH ${CMAKE_THREAD_LIBS_INIT} _length) | ||
| if(_length GREATER 2) | ||
| string(SUBSTRING ${CMAKE_THREAD_LIBS_INIT} 0 2 _prefix) | ||
| if(${_prefix} STREQUAL "-l") | ||
| math(EXPR _rest_len "${_length} - 2") | ||
| string(SUBSTRING ${CMAKE_THREAD_LIBS_INIT} 2 ${_rest_len} PTHREAD_LIB) | ||
| endif() | ||
| endif() | ||
| endif() | ||
|
|
||
| # export dependencies and targets to catkin | ||
| # explicitely export pthread, as stated above | ||
| catkin_package( | ||
| CFG_EXTRAS soem-ros-extras.cmake | ||
| LIBRARIES soem ${PTHREAD_LIB} | ||
| ) | ||
|
|
||
| # SOEM is, by default, built with position-dependent code as a static library. | ||
| # To be able to include SOEM in a dynamic library (default ROS convention), | ||
| # it needs to be built with position-independent code. | ||
| # Thus, we add -fPIC here. | ||
| # This allows us to still include this in any shared libraries we create. | ||
| add_compile_options(-fPIC) | ||
| # removed any pre-defined `WIN32_LEAN_AND_MEAN`. | ||
| # Otherwise, many symbols will be reported as missing. | ||
| remove_definitions(-DWIN32_LEAN_AND_MEAN) | ||
| #catkin_lint: ignore duplicate_cmd | ||
| #catkin_lint: ignore subproject | ||
| add_subdirectory(SOEM) |
Oops, something went wrong.