Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,040 changes: 285 additions & 755 deletions pixi.lock

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ breathe = ">=4.36.0,<5"
cmake = "<3.30" # Constraint to avoid issues with deprecated features in newer cmake versions
colorama = ">=0.4.6,<0.5"
compilers = ">=1.11.0,<2"
construct = ">=2.10.70,<3"
eigen = ">=3.4.0,<4"
fabric = ">=3.2.2,<4"
flask = ">=3.1.2,<4"
Expand All @@ -67,6 +68,7 @@ psutil = ">=7.1.3,<8"
pthread-stubs = ">=0.4,<0.5"
pybind11 = ">=3.0.1,<4"
pyqt = ">=5.15.11,<6"
pysoundcard = ">=0.4.5,<0.5"
pytest = ">=9.0.1,<10"
pytest-mock = ">=3.15.1,<4"
pyyaml = ">=6.0.3,<7"
Expand Down Expand Up @@ -187,6 +189,7 @@ ros-jazzy-better-launch = ">=1.0.3,<2"
# Neural network models / data packages
bitbots_model_2023_04_04_philipp_yoeox_with_team_colors = ">=1.0.0,<2"
bitbots_model_2022_10_07_flo_torso21_yoeox = ">=1.0.0,<2"
tts-supertonic = ">=1.0.0,<2"

# Local packages
bitbots_rust_nav = { path = "src/bitbots_navigation/bitbots_rust_nav" }
Expand All @@ -211,8 +214,6 @@ pre-commit = ">=4.4.0,<5"
# These are are pypi dependencies needed for our ROS 2 packages
syrupy = ">=5.0.0, <6"
exhale = ">=0.3.7, <0.4"
mycroft-mimic3-tts = ">=0.2.4, <0.3"
pyttsx3 = ">=2.99, <3"

[feature.ros.target.linux-64.pypi-dependencies]
onnxruntime-webgpu = ">=1.24.0.dev20251218001, <2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<arg name="torqueless_mode" default="false"/>
<arg name="only_imu" default="false"/>
<arg name="only_pressure" default="false"/>
<arg name="tts" default="true" description="Whether to speak" />

<let if="$(env IS_ROBOT false)" name="taskset" value="taskset -c 0"/>
<let unless="$(env IS_ROBOT false)" name="taskset" value=""/>
Expand All @@ -28,9 +27,5 @@
<include file="$(find-pkg-share bitbots_buttons)/launch/buttons.launch"/>
<!--include file="$(find-pkg-share bitbots_ros_control)/launch/pressure_converter.launch"/-->
</group>

<group if="$(var tts)">
<include file="$(find-pkg-share bitbots_tts)/launch/tts.launch"/>
</group >
</launch>

Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
<arg name="sim" value="$(var sim)"/>
</include>

<include file="$(find-pkg-share bitbots_tts)/launch/tts.launch"/>
Comment thread
jaagut marked this conversation as resolved.
Outdated

<group if="$(var viz)">
<node pkg="bitbots_utils" exec="motor_goals_viz_helper.py" output="screen" args="--all"/>
<node pkg="rviz2" exec="rviz2" args="-d $(find-pkg-share bitbots_quintic_walk)/config/walk.rviz"/>
Expand Down
5 changes: 5 additions & 0 deletions src/bitbots_misc/bitbots_bringup/launch/teamplayer.launch
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
<arg name="fieldname" value="$(var fieldname)" />
</include>

<!-- load the text to speech engine -->
<group if="$(var tts)">
<include file="$(find-pkg-share bitbots_tts)/launch/tts.launch"/>
</group >

<!-- load the diagnostic aggregator -->
<include file="$(find-pkg-share bitbots_diagnostic)/launch/aggregator.launch" />

Expand Down
Loading
Loading