Skip to content

Commit 26bd9fc

Browse files
committed
update encoder access for latest version
1 parent 41e3eff commit 26bd9fc

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

CMakeLists.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,14 +130,23 @@ include_directories(
130130
set(TINYMOVR_SOURCES
131131
src/tinymovr/can.cpp
132132
src/tinymovr/comms.cpp
133+
src/tinymovr/commutation_sensor.cpp
133134
src/tinymovr/controller.cpp
134135
src/tinymovr/current.cpp
135-
src/tinymovr/encoder.cpp
136+
src/tinymovr/external_spi.cpp
137+
src/tinymovr/hall.cpp
138+
src/tinymovr/homing.cpp
136139
src/tinymovr/motor.cpp
140+
src/tinymovr/onboard.cpp
141+
src/tinymovr/position_sensor.cpp
137142
src/tinymovr/position.cpp
138143
src/tinymovr/scheduler.cpp
144+
src/tinymovr/select.cpp
145+
src/tinymovr/setup.cpp
146+
src/tinymovr/stall_detect.cpp
139147
src/tinymovr/tinymovr.cpp
140148
src/tinymovr/traj_planner.cpp
149+
src/tinymovr/user_frame.cpp
141150
src/tinymovr/velocity.cpp
142151
src/tinymovr/voltage.cpp
143152
src/tinymovr/watchdog.cpp

src/tm_joint_iface.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ bool TinymovrJoint::init(ros::NodeHandle& root_nh, ros::NodeHandle& robot_hw_nh)
239239
ROS_DEBUG("Asserting calibrated");
240240
for (int i=0; i<num_joints; i++)
241241
{
242-
ROS_ASSERT((servos[i].encoder.get_calibrated() == true) && (servos[i].motor.get_calibrated() == true));
242+
ROS_ASSERT(servos[i].get_calibrated() == true);
243243
ROS_DEBUG("%s ok", joint_name[i].c_str());
244244
}
245245

0 commit comments

Comments
 (0)