Skip to content

Commit 9493d61

Browse files
X2DemoMachine, ROS and readme improvements (#52)
- Improved X2Robot ( extended parameters, simplified dynamic parameters estimation, acceleration estimation, etc.) - X2DemoMachineRos has now access to X2DemoState, this allows publishing state-related parameters in real-time. - Simplified X2DemoState for demonstration purposes. - Readme for ROS X2DemoMachine. - Improved TechnaidIMU class - FourierHandle(4 buttons) class ------------------------------------------------ * robotName initialization and demomachineRos structure change * FourierHandle class is added * fix torque direction * cmake-build-debug is added to gitignore * gyro reading feature is added to IMU class * message_runtime is added to package_xml * parameter file cleaned. default robot name changed * Additional features such as simplified dynamic parameter calculation, acceleration estimation is added under X2Robot. a demo state with 4 basic controllers are added. * message generation related parameters are added to CMakeLists * minor changes on sim related parameters * additional dynamic parameters and change of publish rate * ns parameter is added so that different robot name (therefore kinematic/inertial parameters) can be sued while using the same rviz * errors during simulation are fixed * keyboard no echo uncommented * setting useImu to false for default parameters * readme for X2DemoMachine is added * CMakelist parameters are changed back to default for unimelb merge * debug level changed to info * added link to the specific page on GettingStarted * minor readme improvements + spdlog header fix + changed default name to x2 * READme improvements: ros_controller is added under dependencies, initializing the can device is now mentioned Co-authored-by: emekBaris <baris.kucuktabak@u.northwestern.edu>
1 parent 2235131 commit 9493d61

33 files changed

Lines changed: 1985 additions & 561 deletions

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ CANopenSocket/canopend/X2_log.txt
88
/.devcontainer/devcontainer.json
99
/build/*
1010
bbbxc
11-
EXO_APP_2020
11+
EXO_APP_2020
12+
cmake-build-debug/

CMakeLists.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ if(USE_ROS)
119119
sensor_msgs
120120
geometry_msgs
121121
dynamic_reconfigure
122+
message_generation
122123
)
123124
if(SIM)
124125
find_package(catkin REQUIRED COMPONENTS
@@ -132,6 +133,19 @@ if(USE_ROS)
132133
config/x2_dynamic_params.cfg
133134
)
134135

136+
add_message_files(
137+
FILES
138+
X2Array.msg
139+
X2Acceleration.msg
140+
X2AccelerationMerge.msg
141+
)
142+
143+
generate_messages(
144+
DEPENDENCIES
145+
std_msgs
146+
)
147+
148+
135149

136150
catkin_package(
137151
# INCLUDE_DIRS include
@@ -144,6 +158,7 @@ if(USE_ROS)
144158
sensor_msgs
145159
geometry_msgs
146160
dynamic_reconfigure
161+
message_runtime
147162
# DEPENDS system_lib
148163
)
149164

0 commit comments

Comments
 (0)