diff --git a/.travis.rosinstall.kinetic b/.travis.rosinstall.kinetic
index e14b5a50d5..10f35fb2d8 100644
--- a/.travis.rosinstall.kinetic
+++ b/.travis.rosinstall.kinetic
@@ -28,6 +28,12 @@
local-name: fetchrobotics/fetch_ros
uri: https://github.com/fetchrobotics/fetch_ros.git
version: 0ad250a996a2ef68172fc064698f253bc9cf08d0
+# Remove this dependency if jsk_common version 2.2.12 is released in kinetic
+# See https://github.com/jsk-ros-pkg/jsk_robot/pull/1481#issuecomment-1209544704
+- git:
+ local-name: jsk-ros-pkg/jsk_common
+ uri: https://github.com/jsk-ros-pkg/jsk_common.git
+ version: 2.2.12
# denso_cobotta_control, denso_cobotta_descriptions, denso_cobotta_driver, and denso_cobotta_gripper are not released
- git:
local-name: DENSORobot/denso_cobotta_ros
diff --git a/jsk_fetch_robot/jsk_fetch_startup/config/fetch_analyzers.yaml b/jsk_fetch_robot/jsk_fetch_startup/config/fetch_analyzers.yaml
index 5ccf32d376..f4847a4cba 100644
--- a/jsk_fetch_robot/jsk_fetch_startup/config/fetch_analyzers.yaml
+++ b/jsk_fetch_robot/jsk_fetch_startup/config/fetch_analyzers.yaml
@@ -119,7 +119,7 @@ analyzers:
joy:
type: diagnostic_aggregator/GenericAnalyzer
path: PS3 Controller
- find_and_remove_prefix: "joy:"
+ find_and_remove_prefix: "jsk_joy_node:"
system:
type: diagnostic_aggregator/AnalyzerGroup
path: System
@@ -144,3 +144,35 @@ analyzers:
type: diagnostic_aggregator/GenericAnalyzer
path: CPU Usage
startswith: 'my_machine CPU Usage'
+ topics:
+ type: diagnostic_aggregator/AnalyzerGroup
+ path: Topics
+ analyzers:
+ audio:
+ type: diagnostic_aggregator/GenericAnalyzer
+ path: Audio
+ contains: '/audio'
+ timeout: 100
+ discard_stale: true
+ head_depth_image:
+ type: diagnostic_aggregator/GenericAnalyzer
+ path: HeadDepthImage
+ contains: '/head_camera/depth/image_raw'
+ timeout: 100
+ discard_stale: true
+ head_rgb_image:
+ type: diagnostic_aggregator/GenericAnalyzer
+ path: HeadRGBImage
+ contains: '/head_camera/rgb/image_raw'
+ timeout: 100
+ discard_stale: true
+ nodes:
+ type: diagnostic_aggregator/AnalyzerGroup
+ path: Nodes
+ analyzers:
+ head_camera_manager:
+ type: diagnostic_aggregator/GenericAnalyzer
+ path: HeadCameraManager
+ contains: '/head_camera/head_camera_nodelet_manager'
+ timeout: 100
+ discard_stale: true
diff --git a/jsk_fetch_robot/jsk_fetch_startup/config/sanity_targets.yaml b/jsk_fetch_robot/jsk_fetch_startup/config/sanity_targets.yaml
new file mode 100644
index 0000000000..6b8ce4ff93
--- /dev/null
+++ b/jsk_fetch_robot/jsk_fetch_startup/config/sanity_targets.yaml
@@ -0,0 +1,9 @@
+topics:
+ - /audio
+ - /edgetpu_human_pose_estimator/output/image/compressed
+ - /edgetpu_object_detector/output/image/compressed
+ - /head_camera/depth/image_raw
+ - /head_camera/rgb/image_raw
+
+nodes:
+ - /head_camera/head_camera_nodelet_manager
diff --git a/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch b/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch
index 0c704a99c6..4a84a439d6 100644
--- a/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch
+++ b/jsk_fetch_robot/jsk_fetch_startup/launch/fetch_bringup.launch
@@ -270,4 +270,12 @@
+
+
+
+
+ duration: 60
+
+
+
diff --git a/jsk_fetch_robot/jsk_fetch_startup/package.xml b/jsk_fetch_robot/jsk_fetch_startup/package.xml
index e8e8f633ad..a89d0c4dea 100644
--- a/jsk_fetch_robot/jsk_fetch_startup/package.xml
+++ b/jsk_fetch_robot/jsk_fetch_startup/package.xml
@@ -15,17 +15,23 @@
image_proc
jsk_fetch_accessories
+ jsk_fetch_diagnosis
+ jsk_network_tools
jsk_robot_startup
+ jsk_tools
jsk_maps
fetcheus
fetch_navigation
fetch_moveit_config
fetch_open_auto_dock
fetch_driver_msgs
+ nodelet
pr2_computer_monitor
robot_pose_publisher
rviz
+ tf
touchegg
+ sound_play
switchbot_ros
tf2_ros
voice_text