diff --git a/bitbots_lowlevel/bitbots_ros_control/launch/ros_control.launch b/bitbots_lowlevel/bitbots_ros_control/launch/ros_control.launch index c219072fa..f76b243c3 100644 --- a/bitbots_lowlevel/bitbots_ros_control/launch/ros_control.launch +++ b/bitbots_lowlevel/bitbots_ros_control/launch/ros_control.launch @@ -4,6 +4,7 @@ + @@ -25,9 +26,11 @@ - + + + diff --git a/bitbots_misc/bitbots_bringup/launch/motion.launch b/bitbots_misc/bitbots_bringup/launch/motion.launch index a3329d7e4..d766d9375 100644 --- a/bitbots_misc/bitbots_bringup/launch/motion.launch +++ b/bitbots_misc/bitbots_bringup/launch/motion.launch @@ -4,16 +4,17 @@ + - - + + - + @@ -21,6 +22,7 @@ + diff --git a/bitbots_misc/bitbots_bringup/launch/teamplayer.launch b/bitbots_misc/bitbots_bringup/launch/teamplayer.launch index 184429c64..38627eea5 100644 --- a/bitbots_misc/bitbots_bringup/launch/teamplayer.launch +++ b/bitbots_misc/bitbots_bringup/launch/teamplayer.launch @@ -14,6 +14,8 @@ + + @@ -32,6 +34,7 @@ + diff --git a/scripts/deploy/tasks/__init__.py b/scripts/deploy/tasks/__init__.py index ab39c822f..f67a23545 100644 --- a/scripts/deploy/tasks/__init__.py +++ b/scripts/deploy/tasks/__init__.py @@ -1,12 +1,16 @@ -from deploy.tasks.abstract_task import AbstractTask, AbstractTaskWhichRequiresSudo -from deploy.tasks.build import Build -from deploy.tasks.check_repos import CheckReposTask -from deploy.tasks.configure import Configure -from deploy.tasks.install import Install -from deploy.tasks.launch import Launch -from deploy.tasks.sync import Sync +INTERNET_TIMEOUT: float = 2.0 + + +from deploy.tasks.abstract_task import AbstractTask, AbstractTaskWhichRequiresSudo # noqa: E402 +from deploy.tasks.build import Build # noqa: E402 +from deploy.tasks.check_repos import CheckReposTask # noqa: E402 +from deploy.tasks.configure import Configure # noqa: E402 +from deploy.tasks.install import Install # noqa: E402 +from deploy.tasks.launch import Launch # noqa: E402 +from deploy.tasks.sync import Sync # noqa: E402 __all__ = [ + "INTERNET_TIMEOUT", "AbstractTask", "AbstractTaskWhichRequiresSudo", "Build", diff --git a/scripts/deploy/tasks/check_repos.py b/scripts/deploy/tasks/check_repos.py index c968684de..c4a180d93 100644 --- a/scripts/deploy/tasks/check_repos.py +++ b/scripts/deploy/tasks/check_repos.py @@ -4,6 +4,7 @@ from hashlib import md5 from deploy.misc import be_quiet, hide_output, print_debug, print_info, print_success, print_warning +from deploy.tasks import INTERNET_TIMEOUT from deploy.tasks.abstract_task import AbstractTask from fabric import Connection, Group, GroupResult, Result from git import Repo @@ -203,7 +204,7 @@ def _github_available(self, connection: Connection) -> bool: github: str = "https://github.com" print_debug(f"Checking for internet connection to {github}") - cmd = f"timeout --foreground 0.5 curl -sSLI {github}" + cmd = f"timeout --foreground {INTERNET_TIMEOUT:.2f} curl -sSLI {github}" print_debug(f"Calling {cmd}") available = False result: Result | None = None @@ -292,7 +293,7 @@ def failure( commit_name: str = self._get_friendly_name(commit_hash) warnings: str = "" for i, warning in enumerate(repo_warnings): - warnings += f"{i+1}. {warning}\n" + warnings += f"{i + 1}. {warning}\n" warning_table.add_row(repo_name, f"{commit_name} ({commit_hash[:8]})", warnings) print_warning( RichGroup( @@ -422,8 +423,7 @@ def _get_friendly_name(self, hash: str) -> str: "Zebra", ] - friendly_name: str = f"{friendly_adjectives[int(hash[:len(hash)//2], 16) % len(friendly_adjectives)]} {friendly_animals[int(hash[len(hash)//2:], 16) % len(friendly_animals)]}" - print_debug(f"Generated friendly commit name: '{friendly_name}'.") + friendly_name: str = f"{friendly_adjectives[int(hash[: len(hash) // 2], 16) % len(friendly_adjectives)]} {friendly_animals[int(hash[len(hash) // 2 :], 16) % len(friendly_animals)]}" return friendly_name def _write_commits(self) -> None: diff --git a/scripts/deploy/tasks/install.py b/scripts/deploy/tasks/install.py index 3f05c63c0..ffb52ba04 100644 --- a/scripts/deploy/tasks/install.py +++ b/scripts/deploy/tasks/install.py @@ -3,6 +3,7 @@ from typing import Optional from deploy.misc import Connection, get_connections_from_succeeded, hide_output, print_debug, print_error, print_warning +from deploy.tasks import INTERNET_TIMEOUT from deploy.tasks.abstract_task import AbstractTaskWhichRequiresSudo from fabric import Group, GroupResult, Result from fabric.exceptions import GroupException @@ -56,7 +57,7 @@ def _internet_available_on_target(self, connections: Group) -> GroupResult: apt_mirror = "de.archive.ubuntu.com" print_debug("Checking internet connections") - cmd = f"timeout --foreground 0.5 curl -sSLI {apt_mirror}" + cmd = f"timeout --foreground {INTERNET_TIMEOUT} curl -sSLI {apt_mirror}" print_debug(f"Calling {cmd}") try: results = connections.run(cmd, hide=hide_output()) diff --git a/scripts/deploy/tasks/launch.py b/scripts/deploy/tasks/launch.py index 904399682..bc270253e 100644 --- a/scripts/deploy/tasks/launch.py +++ b/scripts/deploy/tasks/launch.py @@ -150,7 +150,7 @@ def _check_tmux_session_already_running(self, connections: Group) -> GroupResult def _launch_teamplayer(self, connections: Group) -> GroupResult: print_debug("Launching teamplayer") # Create tmux session - cmd = f"tmux new-session -d -s {self._tmux_session_name} && tmux send-keys -t {self._tmux_session_name} 'ros2 launch bitbots_bringup teamplayer.launch record:=true' Enter" + cmd = f"tmux new-session -d -s {self._tmux_session_name} && tmux send-keys -t {self._tmux_session_name} 'ros2 launch bitbots_bringup teamplayer.launch record:=true tts:=false' Enter" print_debug(f"Calling {cmd}") try: