Skip to content

Commit c69fb62

Browse files
authored
Merge branch 'master' into forum_button
2 parents 22d33f8 + 1e5dc4d commit c69fb62

File tree

32 files changed

+345
-16
lines changed

32 files changed

+345
-16
lines changed

detect_cans_in_fridge_201202/CHANGELOG.rst

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,33 @@
22
Changelog for package detect_cans_in_fridge_201202
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.0.5 (2021-07-17)
6+
------------------
7+
8+
* [detect_cans_in_fridge_201202] add rosinstall (`#1290 <https://github.com/jsk-ros-pkg/jsk_demos/issues/1290>`_)
9+
* add fridge demo with voice command (`#1263 <https://github.com/jsk-ros-pkg/jsk_demos/issues/1263>`_)
10+
11+
* 2019/04/10 Fridge demo (`#1262 <https://github.com/jsk-ros-pkg/jsk_demos/issues/1262>`_)
12+
13+
* fix to launch correct file
14+
* change +x for apps
15+
* update pr2_fridge_demo apps
16+
* update color_histogram_detector
17+
* add euslisp codes
18+
* add launch files
19+
* update package.xml
20+
* add pr2_fridge_demo app
21+
* add config/pr2.machine
22+
* add config/reference_histograms.yaml
23+
* remove config/object_histograms.yaml
24+
* detect_cans: color_histogram.launch: fix some minor bug
25+
* add morinaga_milk as reference histogram
26+
* use new color histogram
27+
28+
* Update README to indigo (`#1220 <https://github.com/jsk-ros-pkg/jsk_demos/issues/1220>`_)
29+
30+
* Contributors: Guilherme Affonso, Kei Okada, Koki Shinjo, Shingo Kitagawa, Yuki Furuta
31+
532
0.0.4 (2017-03-15)
633
------------------
734
* Migrate srv files from jsk_pcl_ros to jsk_recognition_msgs

detect_cans_in_fridge_201202/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<package>
22
<name>detect_cans_in_fridge_201202</name>
3-
<version>0.0.4</version>
3+
<version>0.0.5</version>
44
<description>detect_cans_in_fridge_201202</description>
55
<maintainer email="[email protected]">Youhei Kakiuchi</maintainer>
66

diabolo_pr2_201806/CHANGELOG.rst

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
2+
Changelog for package diabolo_pr2_201806
3+
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4+
5+
0.0.5 (2021-07-17)
6+
------------------
7+
8+
* Add .rviz and stop feedback controly from teleop device (`#1260 <https://github.com/jsk-ros-pkg/jsk_demos/issues/1260>`_)
9+
10+
* modify indent of euslisp file
11+
* add a function for stoping a feedback controller with button 'x' of a remote controller, for showing that diabolo demo is difficult without a feedback controller
12+
* add .rviz file for visualizing result of recognitino
13+
14+
* add diabolo_pr2 in jsk_demos (`#1257 <https://github.com/jsk-ros-pkg/jsk_demos/issues/1257>`_)
15+
16+
* Contributors: Takayuki Murooka
17+
18+
0.0.4 (2017-03-15)
19+
------------------
20+
21+
0.0.3 (2016-02-11)
22+
------------------
23+
24+
0.0.2 (2015-11-26)
25+
------------------
26+
27+
0.0.1 (2015-06-11)
28+
------------------

diabolo_pr2_201806/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package>
33
<name>diabolo_pr2_201806</name>
4-
<version>0.0.4</version>
4+
<version>0.0.5</version>
55
<description>diabolo_pr2_201806 package</description>
66

77
<maintainer email="[email protected]">Takayuki Murooka</maintainer>

elevator_move_base_pr2/CHANGELOG.rst

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,19 @@
22
Changelog for package elevator_move_base_pr2
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.0.5 (2021-07-17)
6+
------------------
7+
8+
* elevator_move_base_pr2: fix for testing (`#1238 <https://github.com/jsk-ros-pkg/jsk_demos/issues/1238>`_)
9+
10+
* elevator_move_base_pr2: remove old files
11+
* elevator_move_base_pr2: fix for indigo
12+
* elevator_move_base_pr2: minor bugfix
13+
14+
* travis: drop hydro (`#1231 <https://github.com/jsk-ros-pkg/jsk_demos/issues/1231>`_)
15+
16+
* Contributors: Yuki Furuta
17+
518
0.0.4 (2017-03-15)
619
------------------
720
* add catkin_INCLUDE_DIRS

elevator_move_base_pr2/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<package>
22
<name>elevator_move_base_pr2</name>
3-
<version>0.0.4</version>
3+
<version>0.0.5</version>
44
<description>elevator_move_base_pr2</description>
55
<maintainer email="[email protected]">Kei Okada</maintainer>
66
<author email="[email protected]">Manabu Saito</author>

interactive_behavior_201409/CHANGELOG.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
Changelog for package interactive_behavior_201409
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.0.5 (2021-07-17)
6+
------------------
7+
* Refine 73B2 fridge demo motion (`#1264 <https://github.com/jsk-ros-pkg/jsk_demos/issues/1264>`_)
8+
* Contributors: Shingo Kitagawa
9+
510
0.0.4 (2017-03-15)
611
------------------
712

interactive_behavior_201409/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package>
33
<name>interactive_behavior_201409</name>
4-
<version>0.0.4</version>
4+
<version>0.0.5</version>
55
<description>The interactive_behavior_201409 package</description>
66

77
<maintainer email="[email protected]">Ryohei Ueda</maintainer>

jsk_2011_07_pr2_semantic/CHANGELOG.rst

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
Changelog for package jsk_2011_07_pr2_semantic
33
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
44

5+
0.0.5 (2021-07-17)
6+
------------------
7+
58
0.0.4 (2017-03-15)
69
------------------
710
* Migrate srv files from jsk_pcl_ros to jsk_recognition_msgs

jsk_2011_07_pr2_semantic/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<package>
22
<name>jsk_2011_07_pr2_semantic</name>
3-
<version>0.0.4</version>
3+
<version>0.0.5</version>
44
<description>jsk_2011_07_pr2_semantic</description>
55
<maintainer email="[email protected]">Kei Okada</maintainer>
66

0 commit comments

Comments
 (0)