Skip to content

Commit

Permalink
Adaptations on ROS coding standard and synchronization with upcoming …
Browse files Browse the repository at this point in the history
…ROS2 Driver version of this

* Adaptations on ROS coding standards
* Synchronization of handling between this ROS1 Driver and the up-for-release ROS2 Driver version
* Added handling for SIGTERM and SIGKILL
* Removed support for TMC variants that are either obsolete, no CAN support, or no Motor Drive

Co-Authored-By: Christian Joseph Acar <124771470+CAcarADI@users.noreply.github.com>
  • Loading branch information
mmaralit-adi and CAcarADI committed Sep 18, 2023
1 parent 4374d13 commit 42aac93
Show file tree
Hide file tree
Showing 89 changed files with 918 additions and 9,601 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ include_directories(
#add_definitions(-DDEBUG)

## Declare a C++ library
add_library(socket_can_wrapper src/socket_can_wrapper.cpp)
add_library(${PROJECT_NAME}_socket_can_wrapper src/socket_can_wrapper.cpp)
add_library(tmcl_interpreter src/tmcl_interpreter.cpp)
add_library(tmcl_ros src/tmcl_ros.cpp)
add_library(tmcl_motor src/tmcl_motor.cpp)
Expand Down Expand Up @@ -158,7 +158,7 @@ add_executable(${PROJECT_NAME}_node src/tmcl_ros_node.cpp)
# add_dependencies(${PROJECT_NAME}_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})

## Specify libraries to link a library or executable target against
target_link_libraries(tmcl_interpreter socket_can_wrapper)
target_link_libraries(tmcl_interpreter ${PROJECT_NAME}_socket_can_wrapper)
target_link_libraries(tmcl_ros tmcl_interpreter)
target_link_libraries(tmcl_ros tmcl_motor)
target_link_libraries(tmcl_interpreter tmcl_motor)
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,13 @@ $ roslaunch tmcl_ros tmcm_1636.launch

## tmcl_ros_node

> :memo: _Note: For those with <motor_num> in the topic names, these are ideally the motor number. For example, if there are 2 motors used, there should be two published topics for tmc_info, specifically /tmc_info_0 for motor 0 and then /tmc_info_1 for motor 1._
> :memo: _Note: For those with <motor_number> in the topic names, these are ideally the motor number. For example, if there are 2 motors used, there should be two published topics for tmc_info, specifically /tmc_info_0 for motor 0 and then /tmc_info_1 for motor 1._
### Published topics

These are the default topic names, topic names can be modified as a ROS parameter.

+ **/tmc_info_<motor_num>**
+ **/tmc_info_<motor_number>**
- Data containing:
+ (1) board voltage (V)
+ (2) statusflag value (only for boards with StatusFlags AP, else, value is set to 0)
Expand All @@ -182,13 +182,13 @@ These are the default topic names, topic names can be modified as a ROS paramete

### Subscriber topics

+ **/cmd_vel_<motor_num>**
+ **/cmd_vel_<motor_number>**
- Velocity command (rpm or m/s)
+ **/cmd_abspos_<motor_num>**
+ **/cmd_abspos_<motor_number>**
- Absolute position command (degree angle)
+ **/cmd_relpos_<motor_num>**
+ **/cmd_relpos_<motor_number>**
- Relative position command (degree angle)
+ **/cmd_trq_<motor_num>**
+ **/cmd_trq_<motor_number>**
- Torque command (mA)

### Advertised services
Expand Down
89 changes: 0 additions & 89 deletions config/TMCM-1021_Ext.yaml

This file was deleted.

89 changes: 0 additions & 89 deletions config/TMCM-1070_Ext.yaml

This file was deleted.

89 changes: 0 additions & 89 deletions config/TMCM-1076_Ext.yaml

This file was deleted.

Loading

0 comments on commit 42aac93

Please sign in to comment.