From 74839dcd661fd3904d00066597396eeb31fe0027 Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Sat, 27 Jan 2024 14:52:54 +0100 Subject: [PATCH 1/2] docs: update warning to include shared user accounts --- docs2/conf.py | 2 +- docs2/usage.rst | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/docs2/conf.py b/docs2/conf.py index 63931d5d4..4acc270d1 100644 --- a/docs2/conf.py +++ b/docs2/conf.py @@ -62,7 +62,7 @@ # General information about the project. project = 'Crazyswarm2' -copyright = '2021-2022, Wolfgang Hönig (IMRClab), Kimberly McGuire (Bitcraze AB) and contributors' +copyright = '2021-2024, Wolfgang Hönig (TU Berlin), Kimberly McGuire (Bitcraze AB), and contributors' author = 'Wolfgang Hönig, Kimberly McGuire' # The version info for the project you're documenting, acts as replacement for diff --git a/docs2/usage.rst b/docs2/usage.rst index c35939ff7..d8278958b 100644 --- a/docs2/usage.rst +++ b/docs2/usage.rst @@ -19,6 +19,11 @@ Usage .. code-block:: bash export ROS_LOCALHOST_ONLY=1 + export ROS_DOMAIN_ID= + + The first environment variable restricts ROS to your local machine. The second is useful + if you have multiple user accounts on the same machine (e.g., a shared workstation computer). + In such case, each user should use a unique `domain ID `_. Configuration From 762672a6d4a78efca3613e24bfaf84ab75ce245e Mon Sep 17 00:00:00 2001 From: Wolfgang Hoenig Date: Sat, 27 Jan 2024 14:55:23 +0100 Subject: [PATCH 2/2] systemtests: use non-default domain id This should avoid interference with systemtests running on the same machine as flight tests --- .github/workflows/systemtests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/systemtests.yml b/.github/workflows/systemtests.yml index 045b64049..1cae1631a 100644 --- a/.github/workflows/systemtests.yml +++ b/.github/workflows/systemtests.yml @@ -39,6 +39,7 @@ jobs: source /opt/ros/humble/setup.bash . install/local_setup.bash export ROS_LOCALHOST_ONLY=1 + export ROS_DOMAIN_ID=99 python3 src/crazyswarm2/systemtests/test_flights.py - name: Upload files