Merge pull request #115 from mqcmd196/coreio/enable-audio

[Strelka][coreio] add option to launch sound_play_jp
jsk-ros-pkg · Jan 17, 2025 · f0294d3 · f0294d3
2 parents 4cbe88a + 2e5ecbd
commit f0294d3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/jsk_spot_robot/jsk_spot_startup/launch/include/driver.launch b/jsk_spot_robot/jsk_spot_startup/launch/include/driver.launch
@@ -2,6 +2,7 @@
   <arg name="credential_config" default="/var/lib/robot/credentials/spot_credential.yaml" />
   <arg name="launch_robot_state_publisher" default="true" />
   <arg name="launch_sound_play" default="true" />
+  <arg name="launch_sound_play_jp" default="true" />
 
   <arg name="use_voice_text" default="false" doc="voice_text needs license" />
   <arg name="use_app_manager" default="true" />
@@ -85,6 +86,15 @@
   </node>
 
   <!-- Sound/Camera -->
+  <!-- speech recognition -->
+  <group ns="head">
+    <include file="$(find ros_speech_recognition)/launch/speech_recognition.launch">
+      <arg name="device" value="hw:Device,0" />
+      <arg name="language" value="ja-JP" />
+      <arg name="launch_sound_play" value="false" />
+      <arg name="sample_rate" value="44100" />
+    </include>
+  </group>
 
   <!-- republish compressed image -->
   <node pkg="image_transport" type="republish" name="hand_color_compress"
@@ -108,20 +118,21 @@
   <!-- see: https://github.com/jsk-ros-pkg/jsk_robot/pull/1140 -->
   <node name="sound_play" pkg="sound_play" type="soundplay_node.py"
         respawn="true" if="$(arg launch_sound_play)" >
-    <param name="device" value="hw:0,0" />
+    <param name="device" value="hw:UC,0" />
   </node>
 
-
   <!-- japanese speech node -->
-  <include if="$(arg use_voice_text)" file="$(find voice_text)/launch/voice_text.launch">
-    <arg name="launch_sound_play" value="$(arg launch_sound_play)" />
-    <arg name="sound_play_respawn" value="true" />
-  </include>
-  <include unless="$(arg use_voice_text)" file="$(find aques_talk)/launch/aques_talk.launch">
-    <arg name="launch_sound_play" value="$(arg launch_sound_play)" />
-    <arg name="sound_play_respawn" value="true" />
-  </include>
-
+  <group if="$(arg launch_sound_play_jp)" >
+    <include if="$(arg use_voice_text)" file="$(find voice_text)/launch/voice_text.launch">
+      <arg name="launch_sound_play" value="$(arg launch_sound_play)" />
+      <arg name="sound_play_respawn" value="true" />
+    </include>
+    <include unless="$(arg use_voice_text)" file="$(find aques_talk)/launch/aques_talk.launch">
+      <arg name="launch_sound_play" value="$(arg launch_sound_play)" />
+      <arg name="sound_play_respawn" value="true" />
+    </include>
+  </group>
+
   <!-- Notifier/Visualization -->
 
   <!-- <node -->

diff --git a/jsk_spot_robot/jsk_spot_startup/launch/jsk_spot_bringup.launch b/jsk_spot_robot/jsk_spot_startup/launch/jsk_spot_bringup.launch
@@ -4,6 +4,7 @@
   <arg name="launch_peripheral" default="false" />
   <arg name="launch_interaction" default="false" />
   <arg name="launch_switchbot_ros" default="false" />
+  <arg name="launch_sound_play_jp" default="true" />
 
   <arg name="use_driver" default="true" />
   <arg name="use_app_manager" default="true" />