Skip to content

Commit 8c964ec

Browse files
authored
Use supertone tts (#754)
2 parents b16d3e7 + 0b80176 commit 8c964ec

12 files changed

Lines changed: 2576 additions & 2647 deletions

File tree

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@
100100
"rsyncignore",
101101
"rtype",
102102
"rviz",
103+
"samplerate",
103104
"scipy",
104105
"sdev",
105106
"seaborn",

pixi.lock

Lines changed: 2080 additions & 2546 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pixi.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ breathe = ">=4.36.0,<5"
4444
cmake = "<3.30" # Constraint to avoid issues with deprecated features in newer cmake versions
4545
colorama = ">=0.4.6,<0.5"
4646
compilers = ">=1.11.0,<2"
47+
construct = ">=2.10.70,<3"
4748
eigen = ">=3.4.0,<4"
4849
fabric = ">=3.2.2,<4"
4950
flask = ">=3.1.2,<4"
@@ -71,6 +72,7 @@ psutil = ">=7.1.3,<8"
7172
pthread-stubs = ">=0.4,<0.5"
7273
pybind11 = ">=3.0.1,<4"
7374
pyqt = ">=5.15.11,<6"
75+
pysoundcard = ">=0.4.5,<0.5"
7476
pytest = ">=9.0.1,<10"
7577
pytest-mock = ">=3.15.1,<4"
7678
pyyaml = ">=6.0.3,<7"
@@ -193,6 +195,7 @@ ros-jazzy-better-launch = ">=1.0.3,<2"
193195
# Neural network models / data packages
194196
bitbots_model_2023_04_04_philipp_yoeox_with_team_colors = ">=1.0.0,<2"
195197
bitbots_model_2022_10_07_flo_torso21_yoeox = ">=1.0.0,<2"
198+
tts-supertonic = ">=1.0.0,<2"
196199

197200
# Local packages
198201
bitbots_rust_nav = { path = "src/bitbots_navigation/bitbots_rust_nav" }
@@ -222,8 +225,6 @@ pre-commit = ">=4.4.0,<5"
222225
construct = ">=2.10.56, <3"
223226
syrupy = ">=5.0.0, <6"
224227
exhale = ">=0.3.7, <0.4"
225-
mycroft-mimic3-tts = ">=0.2.4, <0.3"
226-
pyttsx3 = ">=2.99, <3"
227228

228229
[feature.ros.target.linux-64.pypi-dependencies]
229230
onnxruntime-webgpu = ">=1.24.0.dev20251218001, <2"

src/bitbots_lowlevel/bitbots_ros_control/launch/ros_control.launch

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<arg name="torqueless_mode" default="false"/>
55
<arg name="only_imu" default="false"/>
66
<arg name="only_pressure" default="false"/>
7-
<arg name="tts" default="true" description="Whether to speak" />
87

98
<node pkg="bitbots_ros_control" exec="ros_control" output="screen" >
109
<param from="$(find-pkg-share bitbots_ros_control)/config/wolfgang.yaml" />
@@ -25,9 +24,5 @@
2524
<include file="$(find-pkg-share bitbots_buttons)/launch/buttons.launch"/>
2625
<!--include file="$(find-pkg-share bitbots_ros_control)/launch/pressure_converter.launch"/-->
2726
</group>
28-
29-
<group if="$(var tts)">
30-
<include file="$(find-pkg-share bitbots_tts)/launch/tts.launch"/>
31-
</group >
3227
</launch>
3328

src/bitbots_misc/bitbots_bringup/launch/motion_standalone.launch

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<arg name="sim" default="false"/>
44
<arg name="viz" default="false"/>
55
<arg name="torqueless_mode" default="false" description="start without torque, for example for testing the falling detection"/>
6+
<arg name="tts" default="true" description="Whether to enable text-to-speech"/>
67

78
<include file="$(find-pkg-share bitbots_parameter_blackboard)/launch/parameter_blackboard.launch">
89
<arg name="sim" value="$(var sim)"/>
@@ -12,6 +13,10 @@
1213
<arg name="sim" value="$(var sim)"/>
1314
</include>
1415

16+
<group if="$(var tts)">
17+
<include file="$(find-pkg-share bitbots_tts)/launch/tts.launch"/>
18+
</group>
19+
1520
<group if="$(var viz)">
1621
<node pkg="bitbots_utils" exec="motor_goals_viz_helper.py" output="screen" args="--all"/>
1722
<node pkg="rviz2" exec="rviz2" args="-d $(find-pkg-share bitbots_quintic_walk)/config/walk.rviz"/>

src/bitbots_misc/bitbots_bringup/launch/teamplayer.launch

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
<arg name="fieldname" value="$(var fieldname)" />
2727
</include>
2828

29+
<!-- load the text to speech engine -->
30+
<group if="$(var tts)">
31+
<include file="$(find-pkg-share bitbots_tts)/launch/tts.launch"/>
32+
</group >
33+
2934
<!-- load the diagnostic aggregator -->
3035
<include file="$(find-pkg-share bitbots_diagnostic)/launch/aggregator.launch" />
3136

0 commit comments

Comments
 (0)