diff --git a/.gitignore b/.gitignore index e5c0918..284780d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,15 @@ +.DS_Store + +.vscode/ + +# Editor directories and files +.idea +#.vscode +*.suo +*.ntvs* +*.njsproj +*.sln +*.sw? + urdf.zip -.DS_Store -.vscode/settings.json -.vscode/c_cpp_properties.json diff --git a/mycobot_280/scripts/detect_marker.py b/mycobot_280/scripts/detect_marker.py index c379bf6..f5b565d 100755 --- a/mycobot_280/scripts/detect_marker.py +++ b/mycobot_280/scripts/detect_marker.py @@ -7,7 +7,13 @@ from sensor_msgs.msg import Image import tf from tf.broadcaster import TransformBroadcaster import tf_conversions -from mycobot_description.srv import GetCoords, SetCoords, GetAngles, SetAngles, GripperStatus +from mycobot_communication.srv import ( + GetCoords, + SetCoords, + GetAngles, + SetAngles, + GripperStatus, +) class ImageConverter: diff --git a/mycobot_280/scripts/follow_and_pump.py b/mycobot_280/scripts/follow_and_pump.py index b4f2565..899235d 100755 --- a/mycobot_280/scripts/follow_and_pump.py +++ b/mycobot_280/scripts/follow_and_pump.py @@ -2,9 +2,8 @@ import rospy from visualization_msgs.msg import Marker import time -import random -from mycobot_description.msg import MycobotSetAngles, MycobotSetCoords, MycobotPumpStatus +from mycobot_communication.msg import MycobotSetAngles, MycobotSetCoords, MycobotPumpStatus rospy.init_node("gipper_subscriber", anonymous=True) diff --git a/mycobot_280/scripts/listen_real_of_topic.py b/mycobot_280/scripts/listen_real_of_topic.py index 6439e56..6f1c119 100755 --- a/mycobot_280/scripts/listen_real_of_topic.py +++ b/mycobot_280/scripts/listen_real_of_topic.py @@ -6,7 +6,7 @@ import math import rospy from sensor_msgs.msg import JointState from std_msgs.msg import Header -from mycobot_description.msg import MycobotAngles +from mycobot_communication.msg import MycobotAngles class Listener(object):