Skip to content

Commit d01269e

Browse files
authored
Merge pull request #1697 from knorth55/fetch-rosinstall-melodic-update
[jsk_fetch_robot] update jsk_fetch.rosinstall.melodic
2 parents 997ffe9 + 0d68919 commit d01269e

File tree

1 file changed

+107
-54
lines changed

1 file changed

+107
-54
lines changed
Lines changed: 107 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,87 @@
11
# This is rosinstall file for melodic PC inside fetch.
22
# $ ln -s $(rospack find jsk_fetch_startup)/../jsk_fetch.rosinstall.$ROS_DISTRO $HOME/ros/$ROS_DISTRO/src/.rosinstall
33

4+
# This PR fix bug in multimaster connection mode.
5+
# https://github.com/PR2/app_manager/pull/50
6+
# In order to run multiple app_managers in one master, we need this PR
7+
# https://github.com/PR2/app_manager/pull/54
48
- git:
59
local-name: PR2/app_manager
6-
uri: https://github.com/PR2/app_manager.git
7-
version: kinetic-devel
8-
- git:
9-
local-name: RobotWebTools/rosbridge_suite
10-
uri: https://github.com/RobotWebTools/rosbridge_suite.git
11-
version: 0.11.9
10+
uri: https://github.com/knorth55/app_manager.git
11+
version: fetch15
12+
# we need this for proximity sensors
1213
- git:
1314
local-name: RoboticMaterials/FA-I-sensor
1415
uri: https://github.com/RoboticMaterials/FA-I-sensor.git
15-
# Waiting 0.8.3 release
16+
# In order to avoid issue https://github.com/jsk-ros-pkg/jsk_robot/issues/1665,
17+
# we need to use development branch until PR below are merged
18+
# https://github.com/ZebraDevs/fetch_ros/pull/162
19+
# https://github.com/ZebraDevs/fetch_ros/pull/163
20+
# https://github.com/ZebraDevs/fetch_ros/pull/164
1621
- git:
1722
local-name: fetchrobotics/fetch_ros
18-
uri: https://github.com/fetchrobotics/fetch_ros.git
19-
version: melodic-devel
23+
uri: https://github.com/knorth55/fetch_ros.git
24+
version: develop/fetch
2025
# Waiting 0.6.1 release
2126
- git:
2227
local-name: fetchrobotics/robot_controllers
2328
uri: https://github.com/fetchrobotics/robot_controllers.git
2429
version: melodic-devel
30+
# We need this PR to text dialogflow interface.
31+
# https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/291
32+
# We need this PR to support key from dialogflow.
33+
# https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/292
34+
# We need this PR to enable google chat.
35+
# https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/323
36+
# We need this PR to enable voicevox.
37+
# https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/337
38+
# We need this PR to publish multichannel from respeaker.
39+
# https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/350
40+
# We need this PR to post tweets with image.
41+
# https://github.com/jsk-ros-pkg/jsk_3rdparty/pull/375
2542
- git:
2643
local-name: jsk-ros-pkg/jsk_3rdparty
27-
uri: https://github.com/knorth55/jsk_3rdparty.git
28-
version: fetch15
29-
# we need to use the development branch (fetch15 branch in knorth55's fork)
30-
# until it is merged to master
44+
uri: https://github.com/jsk-ros-pkg/jsk_3rdparty.git
45+
version: develop/fetch
46+
# we need to use the development branch until PR below are merged.
47+
# - https://github.com/jsk-ros-pkg/jsk_common/pull/1719
48+
# - https://github.com/jsk-ros-pkg/jsk_common/pull/1746
49+
# Waiting 2.2.12 release
50+
# - git:
51+
# local-name: jsk-ros-pkg/jsk_common
52+
# uri: https://github.com/jsk-ros-pkg/jsk_common.git
53+
# version: master
3154
- git:
3255
local-name: jsk-ros-pkg/jsk_common
33-
uri: https://github.com/knorth55/jsk_common.git
34-
version: fetch15
35-
# we need to use the development branch (fetch15 branch in knorth55's fork)
36-
# until it is merged to master
56+
uri: https://github.com/jsk-ros-pkg/jsk_common.git
57+
version: develop/fetch
58+
# we need to use the development branch until the next release.
3759
- git:
3860
local-name: jsk-ros-pkg/jsk_demos
39-
uri: https://github.com/knorth55/jsk_demos.git
40-
version: fetch15
61+
uri: https://github.com/jsk-ros-pkg/jsk_demos.git
62+
version: master
63+
# we need to use the development branch until the next release.
4164
- git:
4265
local-name: jsk-ros-pkg/jsk_pr2eus
4366
uri: https://github.com/jsk-ros-pkg/jsk_pr2eus.git
4467
version: master
45-
# we need to use the development branch (throttle-insta360 branch in 708yamaguchi's fork)
46-
# Restore jsk-ros-pkg/jsk_recognition master branch if https://github.com/jsk-ros-pkg/jsk_recognition/pull/2596 is merged.
47-
# - git:
48-
# local-name: jsk-ros-pkg/jsk_recognition
49-
# uri: https://github.com/jsk-ros-pkg/jsk_recognition.git
50-
# version: master
68+
# we need to use the development branch until the next release.
5169
- git:
5270
local-name: jsk-ros-pkg/jsk_recognition
53-
uri: https://github.com/708yamaguchi/jsk_recognition.git
54-
version: throttle-insta360
71+
uri: https://github.com/jsk-ros-pkg/jsk_recognition.git
72+
version: master
5573
# we need to use the development branch (fetch15 branch in knorth55's fork)
5674
# until it is merged to master
5775
- git:
5876
local-name: jsk-ros-pkg/jsk_robot
59-
uri: https://github.com/knorth55/jsk_robot.git
60-
version: fetch15
77+
uri: https://github.com/jsk-ros-pkg/jsk_robot.git
78+
version: develop/fetch
79+
# we need to use the development branch until the next release.
6180
- git:
6281
local-name: knorth55/app_manager_utils
6382
uri: https://github.com/knorth55/app_manager_utils
6483
version: master
65-
- git:
66-
local-name: locusrobotics/catkin_virtualenv
67-
uri: https://github.com/locusrobotics/catkin_virtualenv.git
68-
version: 0.5.0
69-
- git:
70-
local-name: mikeferguson/robot_calibration
71-
uri: https://github.com/mikeferguson/robot_calibration.git
72-
version: 0.5.5
73-
# https://github.com/ros-drivers/audio_common/pull/173
84+
# we need to use the development branch until the next release.
7485
- git:
7586
local-name: ros-drivers/audio_common
7687
uri: https://github.com/ros-drivers/audio_common.git
@@ -83,14 +94,6 @@
8394
local-name: ros-drivers/rosserial
8495
uri: https://github.com/708yamaguchi/rosserial.git
8596
version: fetch15
86-
- git:
87-
local-name: ros-perception/slam_gmapping
88-
uri: https://github.com/ros-perception/slam_gmapping.git
89-
version: 1.3.10
90-
- tar:
91-
local-name: ros/common_msgs/visualization_msgs
92-
uri: https://github.com/ros-gbp/common_msgs-release/archive/release/kinetic/visualization_msgs/1.12.7-0.tar.gz
93-
version: common_msgs-release-release-kinetic-visualization_msgs-1.12.7-0
9497
# Following error is output at about 25Hz for about 4 hours
9598
# [ERROR] [1653231340.987602] [/replicator_node:rosout]: [mongorestore] - E11000 duplicate key error collection: jsk_robot_lifelog.fetch1075 index: _id_ dup key: { : ObjectId('6243af9651998d10f0c7787c') }
9699
# Errors are now output once per hour
@@ -99,12 +102,12 @@
99102
local-name: strands-project/mongodb_store
100103
uri: https://github.com/708yamaguchi/mongodb_store.git
101104
version: fetch15
102-
# we need to use the development branch (fetch15 branch in knorth55's fork)
103-
# until it is merged to master
105+
# we need to use the develop branch for basic authentication
104106
- git:
105107
local-name: tork-a/roswww
106-
uri: https://github.com/knorth55/roswww.git
107-
version: fetch15
108+
uri: https://github.com/tork-a/roswww.git
109+
version: develop
110+
# we need to use the development branch until the next release.
108111
- git:
109112
local-name: tork-a/visualization_rwt
110113
uri: https://github.com/tork-a/visualization_rwt.git
@@ -119,16 +122,66 @@
119122
# If you upgrade realsense-ros version, please upgrade librealsense packages.
120123
# Currently, realsense-ros 2.3.0 (source) and librealsense 2.45.0 (apt) works
121124
# https://github.com/IntelRealSense/librealsense/issues/10304#issuecomment-1067354378
125+
# realsense_camera has a problem in src/base_realsense_node.cpp which prevents it from build (find_if -> std::find_if)
126+
# https://github.com/IntelRealSense/realsense-ros/issues/910
127+
# Using Affonso-Gui/realsense e155795440b29d4edb78827ac0d1f50e4aad8750 for now
122128
- git:
123129
local-name: IntelRealSense/realsense-ros
124-
uri: https://github.com/IntelRealSense/realsense-ros.git
125-
version: 2.3.0
130+
uri: https://github.com/Affonso-Gui/realsense.git
131+
version: fetch15
132+
# - git:
133+
# local-name: IntelRealSense/realsense-ros
134+
# uri: https://github.com/IntelRealSense/realsense-ros.git
135+
# version: 2.3.0
136+
# Until PRs below merged, we need to use develop branch
137+
# - https://github.com/fetchrobotics/fetch_open_auto_dock/pull/9
138+
# - https://github.com/fetchrobotics/fetch_open_auto_dock/pull/8
126139
- git:
127140
local-name: fetchrobotics/fetch_open_auto_dock
128-
uri: https://github.com/fetchrobotics/fetch_open_auto_dock.git
129-
version: melodic-devel
141+
uri: https://github.com/sktometometo/fetch_open_auto_dock.git
142+
version: fetchdev
130143
# Use https://github.com/ros-planning/navigation/pull/839 based on 7f22997e6804d9d7249b8a1d789bf27343b26f75
131144
- git:
132145
local-name: ros-planning/navigation
133146
uri: https://github.com/708yamaguchi/navigation.git
134147
version: fetch15
148+
# Use coral_usb_ros + cv_bridge_python3
149+
- git:
150+
local-name: jsk-ros-pkg/coral_usb_ros
151+
uri: https://github.com/jsk-ros-pkg/coral_usb_ros.git
152+
version: master
153+
# we need melodic-devel branch for headless visualization
154+
- git:
155+
local-name: ros-visualization/executive_smach_visualization
156+
uri: https://github.com/ros-visualization/executive_smach_visualization.git
157+
version: melodic-devel
158+
# we need this for eus10 and roseus_resume
159+
- git:
160+
local-name: euslisp/Euslisp
161+
uri: https://github.com/Affonso-Gui/EusLisp.git
162+
version: eus10
163+
# we need this for eus10 and roseus_resume
164+
- git:
165+
local-name: jsk-ros-pkg/jsk_roseus
166+
uri: https://github.com/knorth55/jsk_roseus.git
167+
version: fetch15
168+
# we need this for eus10 and roseus_resume
169+
- git:
170+
local-name: euslisp/jskeus
171+
uri: https://github.com/euslisp/jskeus.git
172+
version: master
173+
# we need this for eus10 and roseus_resume
174+
- git:
175+
local-name: jsk-ros-pkg/geneus
176+
uri: https://github.com/jsk-ros-pkg/geneus.git
177+
version: master
178+
# we need this for eus10 and roseus_resume
179+
- git:
180+
local-name: Affonso-Gui/roseus_resume
181+
uri: https://github.com/Affonso-Gui/roseus_resume.git
182+
version: eus10
183+
# we need this for roseus_bt
184+
- git:
185+
local-name: BehaviorTree/BehaviorTree.ROS
186+
uri: https://github.com/BehaviorTree/BehaviorTree.ROS
187+
version: master

0 commit comments

Comments
 (0)