diff --git a/ros_tutorials/CHANGELOG.rst b/ros_tutorials/CHANGELOG.rst index 74e60170..f453c94c 100644 --- a/ros_tutorials/CHANGELOG.rst +++ b/ros_tutorials/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package ros_tutorials ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.6.2 (2016-03-18) +------------------ + 0.6.1 (2015-09-19) ------------------ diff --git a/ros_tutorials/package.xml b/ros_tutorials/package.xml index 605a508d..cf1f004e 100644 --- a/ros_tutorials/package.xml +++ b/ros_tutorials/package.xml @@ -1,7 +1,7 @@ ros_tutorials - 0.6.1 + 0.6.2 ros_tutorials contains packages that demonstrate various features of ROS, as well as support packages which help demonstrate those features. diff --git a/roscpp_tutorials/CHANGELOG.rst b/roscpp_tutorials/CHANGELOG.rst index 8e95bb77..23f3a75a 100644 --- a/roscpp_tutorials/CHANGELOG.rst +++ b/roscpp_tutorials/CHANGELOG.rst @@ -2,6 +2,9 @@ Changelog for package roscpp_tutorials ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.6.2 (2016-03-18) +------------------ + 0.6.1 (2015-09-19) ------------------ diff --git a/roscpp_tutorials/package.xml b/roscpp_tutorials/package.xml index d4877765..ddb371f0 100644 --- a/roscpp_tutorials/package.xml +++ b/roscpp_tutorials/package.xml @@ -1,7 +1,7 @@ roscpp_tutorials - 0.6.1 + 0.6.2 This package attempts to show the features of ROS step-by-step, including using messages, servers, parameters, etc. diff --git a/rospy_tutorials/001_talker_listener/listener.py b/rospy_tutorials/001_talker_listener/listener.py index 7cd8b7a7..ed27e1e5 100755 --- a/rospy_tutorials/001_talker_listener/listener.py +++ b/rospy_tutorials/001_talker_listener/listener.py @@ -40,18 +40,18 @@ from std_msgs.msg import String def callback(data): - rospy.loginfo(rospy.get_caller_id() + "I heard %s", data.data) + rospy.loginfo(rospy.get_caller_id() + 'I heard %s', data.data) def listener(): # In ROS, nodes are uniquely named. If two nodes with the same - # node are launched, the previous one is kicked off. The + # name are launched, the previous one is kicked off. The # anonymous=True flag means that rospy will choose a unique - # name for our 'talker' node so that multiple talkers can + # name for our 'listener' node so that multiple listeners can # run simultaneously. rospy.init_node('listener', anonymous=True) - rospy.Subscriber("chatter", String, callback) + rospy.Subscriber('chatter', String, callback) # spin() simply keeps python from exiting until this node is stopped rospy.spin() diff --git a/rospy_tutorials/CHANGELOG.rst b/rospy_tutorials/CHANGELOG.rst index f98d4daa..1320a834 100644 --- a/rospy_tutorials/CHANGELOG.rst +++ b/rospy_tutorials/CHANGELOG.rst @@ -2,6 +2,10 @@ Changelog for package rospy_tutorials ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.6.2 (2016-03-18) +------------------ +* fix minor misleading comment (`#27 `_) + 0.6.1 (2015-09-19) ------------------ diff --git a/rospy_tutorials/package.xml b/rospy_tutorials/package.xml index 7f4ec0bc..b3201456 100644 --- a/rospy_tutorials/package.xml +++ b/rospy_tutorials/package.xml @@ -1,7 +1,7 @@ rospy_tutorials - 0.6.1 + 0.6.2 This package attempts to show the features of ROS python API step-by-step, including using messages, servers, parameters, etc. These tutorials are compatible with the nodes in roscpp_tutorial. diff --git a/turtlesim/CHANGELOG.rst b/turtlesim/CHANGELOG.rst index a1211653..3899a3a8 100644 --- a/turtlesim/CHANGELOG.rst +++ b/turtlesim/CHANGELOG.rst @@ -2,6 +2,11 @@ Changelog for package turtlesim ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +0.6.2 (2016-03-18) +------------------ +* fix size of Jade image to not exceed other images in order to not get positioned incorrectly +* fix compiler warnings + 0.6.1 (2015-09-19) ------------------ * update the coordinate system in /spawn service for consistency (`#25 `_) diff --git a/turtlesim/images/jade.png b/turtlesim/images/jade.png index ba9ef1db..f9029198 100644 Binary files a/turtlesim/images/jade.png and b/turtlesim/images/jade.png differ diff --git a/turtlesim/package.xml b/turtlesim/package.xml index e6b66bab..de1df7a8 100644 --- a/turtlesim/package.xml +++ b/turtlesim/package.xml @@ -1,7 +1,7 @@ turtlesim - 0.6.1 + 0.6.2 turtlesim is a tool made for teaching ROS and ROS packages. diff --git a/turtlesim/src/turtle_frame.cpp b/turtlesim/src/turtle_frame.cpp index 2e0dc729..24bcc1cd 100644 --- a/turtlesim/src/turtle_frame.cpp +++ b/turtlesim/src/turtle_frame.cpp @@ -77,7 +77,7 @@ TurtleFrame::TurtleFrame(QWidget* parent, Qt::WindowFlags f) turtles.append("jade.png"); QString images_path = (ros::package::getPath("turtlesim") + "/images/").c_str(); - for (size_t i = 0; i < turtles.size(); ++i) + for (int i = 0; i < turtles.size(); ++i) { QImage img; img.load(images_path + turtles[i]); @@ -102,7 +102,7 @@ TurtleFrame::TurtleFrame(QWidget* parent, Qt::WindowFlags f) // spawn all available turtle types if(FALSE) { - for(size_t index = 0; index < turtles.size(); index++) + for(int index = 0; index < turtles.size(); ++index) { QString name = turtles[index]; name = name.split(".").first(); @@ -211,7 +211,7 @@ void TurtleFrame::onUpdate() } } -void TurtleFrame::paintEvent(QPaintEvent* event) +void TurtleFrame::paintEvent(QPaintEvent*) { QPainter painter(this); diff --git a/turtlesim/tutorials/teleop_turtle_key.cpp b/turtlesim/tutorials/teleop_turtle_key.cpp index bffb47dc..48590750 100644 --- a/turtlesim/tutorials/teleop_turtle_key.cpp +++ b/turtlesim/tutorials/teleop_turtle_key.cpp @@ -42,6 +42,7 @@ struct termios cooked, raw; void quit(int sig) { + (void)sig; tcsetattr(kfd, TCSANOW, &cooked); ros::shutdown(); exit(0);