Skip to content

Commit 4100edf

Browse files
committed
move whislte detector to misc and add extra launch param
1 parent 6246dfb commit 4100edf

8 files changed

Lines changed: 6 additions & 3 deletions

File tree

src/bitbots_misc/bitbots_bringup/launch/highlevel.launch

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<arg name="vision" default="true" description="Whether the vision system should be started" />
1313
<arg name="workspace_status" default="true" description="Whether to publish the current workspace status"/>
1414
<arg name="world_model" default="true" description="Whether the world model should be started"/>
15+
<arg name="whistle_detector" default="true" description="Whether whistle detector should be started"/>
1516

1617

1718
<!-- launch game controller -->
@@ -54,10 +55,10 @@
5455
<include file="$(find-pkg-share bitbots_robot_filter)/launch/robot_filter.launch">
5556
<arg name="sim" value="$(var sim)"/>
5657
</include>
57-
<include file="$(find-pkg-share bitbots_whistle_detector)/launch/whistle_detector.launch">
58-
</include>
5958
</group>
60-
59+
<group if="$(var whistle_detector)">
60+
<include file="$(find-pkg-share bitbots_whistle_detector)/launch/whistle_detector.launch"/>
61+
</group>
6162
<!-- launch localization or fake localization -->
6263
<group if="$(var localization)">
6364
<include file="$(find-pkg-share bitbots_localization)/launch/localization.launch">

src/bitbots_misc/bitbots_bringup/launch/teamplayer.launch

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<arg name="monitoring" default="true" description="Whether the system monitor and udp bridge should be started" />
1616
<arg name="record" default="false" description="Whether the ros bag recording should be started" />
1717
<arg name="tts" default="true" description="Whether to speak" />
18+
<arg name="whistle_detector" default="true" description="Whether to detect whistles"/>
1819
<arg unless="$(var sim)" name="fieldname" default="labor" description="Loads field settings (labor, webots, ...)." />
1920
<arg if="$(var sim)" name="fieldname" default="webots" description="Loads field settings (labor, webots, ...)." />
2021

@@ -54,6 +55,7 @@
5455
<arg name="teamcom" value="$(var teamcom)" />
5556
<arg name="vision" value="$(var vision)" />
5657
<arg name="world_model" value="$(var world_model)" />
58+
<arg name="whistle_detector" value="$(var whistle_detector)" />
5759
</include>
5860

5961
<!-- load monitoring -->

src/bitbots_world_model/bitbots_whistle_detector/bitbots_whistle_detector/__init__.py renamed to src/bitbots_misc/bitbots_whistle_detector/bitbots_whistle_detector/__init__.py

File renamed without changes.

src/bitbots_world_model/bitbots_whistle_detector/bitbots_whistle_detector/whistle_detector.py renamed to src/bitbots_misc/bitbots_whistle_detector/bitbots_whistle_detector/whistle_detector.py

File renamed without changes.

src/bitbots_world_model/bitbots_whistle_detector/launch/whistle_detector.launch renamed to src/bitbots_misc/bitbots_whistle_detector/launch/whistle_detector.launch

File renamed without changes.

src/bitbots_world_model/bitbots_whistle_detector/package.xml renamed to src/bitbots_misc/bitbots_whistle_detector/package.xml

File renamed without changes.

src/bitbots_world_model/bitbots_whistle_detector/setup.cfg renamed to src/bitbots_misc/bitbots_whistle_detector/setup.cfg

File renamed without changes.

src/bitbots_world_model/bitbots_whistle_detector/setup.py renamed to src/bitbots_misc/bitbots_whistle_detector/setup.py

File renamed without changes.

0 commit comments

Comments
 (0)