mirror of
https://github.com/elephantrobotics/mycobot_ros.git
synced 2026-07-05 19:47:04 +00:00
fix name error.
This commit is contained in:
parent
2b5bea1b20
commit
223c8077ac
8 changed files with 12 additions and 15 deletions
|
|
@ -6,11 +6,10 @@
|
||||||
<arg name="num" default="0" />
|
<arg name="num" default="0" />
|
||||||
|
|
||||||
<include file="$(find mycobot_280)/launch/slider_control.launch">
|
<include file="$(find mycobot_280)/launch/slider_control.launch">
|
||||||
<arg name="model" value="$(arg model)" />
|
<arg name="model" value="$(arg model)" />
|
||||||
<arg name="rvizconfig" value="$(arg rvizconfig)" />
|
<arg name="rvizconfig" value="$(arg rvizconfig)" />
|
||||||
<arg name="gui" value="$(arg gui)" />
|
<arg name="gui" value="$(arg gui)" />
|
||||||
</include>
|
</include>
|
||||||
<!-- <node name="real_listener" pkg="mycobot_ros" type="listen_real.py" /> -->
|
|
||||||
<node name="opencv_camera" pkg="mycobot_280" type="opencv_camera" args="$(arg num)"/>
|
<node name="opencv_camera" pkg="mycobot_280" type="opencv_camera" args="$(arg num)"/>
|
||||||
<node name="detect_marker" pkg="mycobot_280" type="detect_marker.py" />
|
<node name="detect_marker" pkg="mycobot_280" type="detect_marker.py" />
|
||||||
<node name="following_marker" pkg="mycobot_280" type="following_marker.py" />
|
<node name="following_marker" pkg="mycobot_280" type="following_marker.py" />
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,14 @@
|
||||||
<launch>
|
<launch>
|
||||||
<arg name="model" default="$(find mycobot_ros)/urdf/mycobot/mycobot_with_vision.urdf"/>
|
<arg name="model" default="$(find mycobot_description)/urdf/mycobot/mycobot_with_vision.urdf"/>
|
||||||
<arg name="rvizconfig" default="$(find mycobot_ros)/config/mycobot.rviz" />
|
<arg name="rvizconfig" default="$(find mycobot_280)/config/mycobot.rviz" />
|
||||||
<arg name="gui" default="true" />
|
<arg name="gui" default="true" />
|
||||||
|
|
||||||
<param name="robot_description" command="$(find xacro)/xacro --inorder $(arg model)" />
|
<param name="robot_description" command="$(find xacro)/xacro --inorder $(arg model)" />
|
||||||
|
|
||||||
<!-- Combinejoin values to TF -->
|
<!-- Combinejoin values to TF -->
|
||||||
<node name="robot_state_publisher" pkg="robot_state_publisher" type="state_publisher" />
|
<node name="robot_state_publisher" pkg="robot_state_publisher" type="state_publisher" />
|
||||||
<node name="joint_state_publisher" pkg="joint_state_publisher" type="joint_state_publisher">
|
<node name="joint_state_publisher" pkg="joint_state_publisher" type="joint_state_publisher">
|
||||||
<param name="use_gui" value="$(arg gui)" />
|
<param name="use_gui" value="$(arg gui)" />
|
||||||
<!-- <rosparam param="source_list" subst_value="true">["joint_states"]</rosparam> -->
|
<!-- <rosparam param="source_list" subst_value="true">["joint_states"]</rosparam> -->
|
||||||
</node>
|
</node>
|
||||||
<!-- Show in Rviz -->
|
<!-- Show in Rviz -->
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ from sensor_msgs.msg import Image
|
||||||
import tf
|
import tf
|
||||||
from tf.broadcaster import TransformBroadcaster
|
from tf.broadcaster import TransformBroadcaster
|
||||||
import tf_conversions
|
import tf_conversions
|
||||||
from mycobot_ros.srv import GetCoords, SetCoords, GetAngles, SetAngles, GripperStatus
|
from mycobot_description.srv import GetCoords, SetCoords, GetAngles, SetAngles, GripperStatus
|
||||||
|
|
||||||
|
|
||||||
class ImageConverter:
|
class ImageConverter:
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@ from visualization_msgs.msg import Marker
|
||||||
import time
|
import time
|
||||||
import random
|
import random
|
||||||
|
|
||||||
from mycobot_ros.msg import MycobotSetAngles, MycobotSetCoords, MycobotPumpStatus
|
from mycobot_description.msg import MycobotSetAngles, MycobotSetCoords, MycobotPumpStatus
|
||||||
|
|
||||||
|
|
||||||
rospy.init_node("gipper_subscriber", anonymous=True)
|
rospy.init_node("gipper_subscriber", anonymous=True)
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ import math
|
||||||
import rospy
|
import rospy
|
||||||
from sensor_msgs.msg import JointState
|
from sensor_msgs.msg import JointState
|
||||||
from std_msgs.msg import Header
|
from std_msgs.msg import Header
|
||||||
from mycobot_ros.srv import GetAngles
|
from mycobot_description.srv import GetAngles
|
||||||
|
|
||||||
|
|
||||||
def talker():
|
def talker():
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ import math
|
||||||
import rospy
|
import rospy
|
||||||
from sensor_msgs.msg import JointState
|
from sensor_msgs.msg import JointState
|
||||||
from std_msgs.msg import Header
|
from std_msgs.msg import Header
|
||||||
from mycobot_ros.msg import MycobotAngles
|
from mycobot_description.msg import MycobotAngles
|
||||||
|
|
||||||
|
|
||||||
class Listener(object):
|
class Listener(object):
|
||||||
|
|
|
||||||
|
|
@ -10,8 +10,6 @@ import time
|
||||||
|
|
||||||
import roslib
|
import roslib
|
||||||
|
|
||||||
# roslib.load_manifest("mycobot_ros")
|
|
||||||
|
|
||||||
|
|
||||||
msg = """\
|
msg = """\
|
||||||
Mycobot Teleop Keyboard Controller
|
Mycobot Teleop Keyboard Controller
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
cmake_minimum_required(VERSION 3.0.2)
|
cmake_minimum_required(VERSION 2.8.3)
|
||||||
project(mycobot_description)
|
project(mycobot_description)
|
||||||
|
|
||||||
## Compile as C++11, supported in ROS Kinetic and newer
|
## Compile as C++11, supported in ROS Kinetic and newer
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue