From fae7ff6b9ce2d0ae0a52d2b8f2ed312008ab186f Mon Sep 17 00:00:00 2001 From: Florian Vahl <7vahl@informatik.uni-hamburg.de> Date: Tue, 16 Jan 2024 15:58:24 +0100 Subject: [PATCH] rename to hl --- .../config/game_controller_settings.yaml | 2 +- .../game_controller_hl}/__init__.py | 0 .../game_controller_hl}/gamestate.py | 0 .../game_controller_hl}/receiver.py | 6 +++--- .../game_controller_hl}/utils.py | 0 game_controller_hl/launch/game_controller.launch | 9 +++++++++ .../package.xml | 8 ++++---- .../resource/game_controller_hl | 0 .../scripts/sim_gamestate.py | 0 game_controller_hl/setup.cfg | 4 ++++ .../setup.py | 4 ++-- .../test/test_game_controller.py | 8 ++++---- .../.gitignore | 0 .../CMakeLists.txt | 2 +- .../msg/GameState.msg | 0 .../package.xml | 2 +- game_controller_humanoid/launch/game_controller.launch | 9 --------- game_controller_humanoid/setup.cfg | 4 ---- 18 files changed, 29 insertions(+), 29 deletions(-) rename {game_controller_humanoid => game_controller_hl}/config/game_controller_settings.yaml (83%) rename {game_controller_humanoid/game_controller_humanoid => game_controller_hl/game_controller_hl}/__init__.py (100%) rename {game_controller_humanoid/game_controller_humanoid => game_controller_hl/game_controller_hl}/gamestate.py (100%) rename {game_controller_humanoid/game_controller_humanoid => game_controller_hl/game_controller_hl}/receiver.py (97%) rename {game_controller_humanoid/game_controller_humanoid => game_controller_hl/game_controller_hl}/utils.py (100%) create mode 100644 game_controller_hl/launch/game_controller.launch rename {game_controller_humanoid => game_controller_hl}/package.xml (74%) rename game_controller_humanoid/resource/game_controller_humanoid => game_controller_hl/resource/game_controller_hl (100%) rename {game_controller_humanoid => game_controller_hl}/scripts/sim_gamestate.py (100%) create mode 100644 game_controller_hl/setup.cfg rename {game_controller_humanoid => game_controller_hl}/setup.py (87%) rename {game_controller_humanoid => game_controller_hl}/test/test_game_controller.py (97%) rename {game_controller_humanoid_interfaces => game_controller_hl_interfaces}/.gitignore (100%) rename {game_controller_humanoid_interfaces => game_controller_hl_interfaces}/CMakeLists.txt (89%) rename {game_controller_humanoid_interfaces => game_controller_hl_interfaces}/msg/GameState.msg (100%) rename {game_controller_humanoid_interfaces => game_controller_hl_interfaces}/package.xml (94%) delete mode 100644 game_controller_humanoid/launch/game_controller.launch delete mode 100644 game_controller_humanoid/setup.cfg diff --git a/game_controller_humanoid/config/game_controller_settings.yaml b/game_controller_hl/config/game_controller_settings.yaml similarity index 83% rename from game_controller_humanoid/config/game_controller_settings.yaml rename to game_controller_hl/config/game_controller_settings.yaml index 77fecb4..87660de 100644 --- a/game_controller_humanoid/config/game_controller_settings.yaml +++ b/game_controller_hl/config/game_controller_settings.yaml @@ -1,7 +1,7 @@ --- # Game controller network settings -game_controller_humanoid: +game_controller_hl: ros__parameters: listen_host: '0.0.0.0' listen_port: 3838 diff --git a/game_controller_humanoid/game_controller_humanoid/__init__.py b/game_controller_hl/game_controller_hl/__init__.py similarity index 100% rename from game_controller_humanoid/game_controller_humanoid/__init__.py rename to game_controller_hl/game_controller_hl/__init__.py diff --git a/game_controller_humanoid/game_controller_humanoid/gamestate.py b/game_controller_hl/game_controller_hl/gamestate.py similarity index 100% rename from game_controller_humanoid/game_controller_humanoid/gamestate.py rename to game_controller_hl/game_controller_hl/gamestate.py diff --git a/game_controller_humanoid/game_controller_humanoid/receiver.py b/game_controller_hl/game_controller_hl/receiver.py similarity index 97% rename from game_controller_humanoid/game_controller_humanoid/receiver.py rename to game_controller_hl/game_controller_hl/receiver.py index b702575..f1fcae7 100755 --- a/game_controller_humanoid/game_controller_humanoid/receiver.py +++ b/game_controller_hl/game_controller_hl/receiver.py @@ -22,10 +22,10 @@ from rclpy.duration import Duration from std_msgs.msg import Header from construct import Container -from game_controller_humanoid.gamestate import GameStateStruct, ResponseStruct -from game_controller_humanoid.utils import get_parameters_from_other_node +from game_controller_hl.gamestate import GameStateStruct, ResponseStruct +from game_controller_hl.utils import get_parameters_from_other_node -from game_controller_humanoid_interfaces.msg import GameState +from game_controller_hl_interfaces.msg import GameState class GameStateReceiver(Node): diff --git a/game_controller_humanoid/game_controller_humanoid/utils.py b/game_controller_hl/game_controller_hl/utils.py similarity index 100% rename from game_controller_humanoid/game_controller_humanoid/utils.py rename to game_controller_hl/game_controller_hl/utils.py diff --git a/game_controller_hl/launch/game_controller.launch b/game_controller_hl/launch/game_controller.launch new file mode 100644 index 0000000..3567104 --- /dev/null +++ b/game_controller_hl/launch/game_controller.launch @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/game_controller_humanoid/package.xml b/game_controller_hl/package.xml similarity index 74% rename from game_controller_humanoid/package.xml rename to game_controller_hl/package.xml index 9ed4dad..b330f23 100644 --- a/game_controller_humanoid/package.xml +++ b/game_controller_hl/package.xml @@ -1,11 +1,11 @@ - game_controller_humanoid + game_controller_hl 1.1.0 - The game_controller_humanoid packages receives packets from the GameController and - republishes them as bitbots_msgs/GameState ROS messages. It sends response packets + The game_controller_hl packages receives packets from the GameController and + republishes them as GameState ROS messages. It sends response packets back to the GameController. @@ -19,7 +19,7 @@ rosidl_default_generators rosidl_default_runtime - game_controller_humanoid_interfaces + game_controller_hl_interfaces python3-construct rclpy std_msgs diff --git a/game_controller_humanoid/resource/game_controller_humanoid b/game_controller_hl/resource/game_controller_hl similarity index 100% rename from game_controller_humanoid/resource/game_controller_humanoid rename to game_controller_hl/resource/game_controller_hl diff --git a/game_controller_humanoid/scripts/sim_gamestate.py b/game_controller_hl/scripts/sim_gamestate.py similarity index 100% rename from game_controller_humanoid/scripts/sim_gamestate.py rename to game_controller_hl/scripts/sim_gamestate.py diff --git a/game_controller_hl/setup.cfg b/game_controller_hl/setup.cfg new file mode 100644 index 0000000..374a706 --- /dev/null +++ b/game_controller_hl/setup.cfg @@ -0,0 +1,4 @@ +[develop] +script_dir=$base/lib/game_controller_hl +[install] +install_scripts=$base/lib/game_controller_hl diff --git a/game_controller_humanoid/setup.py b/game_controller_hl/setup.py similarity index 87% rename from game_controller_humanoid/setup.py rename to game_controller_hl/setup.py index 41d2c1a..62e2168 100644 --- a/game_controller_humanoid/setup.py +++ b/game_controller_hl/setup.py @@ -2,7 +2,7 @@ from setuptools import find_packages, setup -package_name = 'game_controller_humanoid' +package_name = 'game_controller_hl' setup( name=package_name, @@ -28,7 +28,7 @@ tests_require=['pytest'], entry_points={ 'console_scripts': [ - 'game_controller = game_controller_humanoid.receiver:main', + 'game_controller = game_controller_hl.receiver:main', ], } ) diff --git a/game_controller_humanoid/test/test_game_controller.py b/game_controller_hl/test/test_game_controller.py similarity index 97% rename from game_controller_humanoid/test/test_game_controller.py rename to game_controller_hl/test/test_game_controller.py index 407801a..c63fe96 100644 --- a/game_controller_humanoid/test/test_game_controller.py +++ b/game_controller_hl/test/test_game_controller.py @@ -6,11 +6,11 @@ from rclpy.node import Node from rclpy.parameter import Parameter -from game_controller_humanoid.gamestate import GameStateStruct, TeamInfoStruct -from game_controller_humanoid.utils import get_parameters_from_other_node -from game_controller_humanoid.receiver import GameStateReceiver +from game_controller_hl.gamestate import GameStateStruct, TeamInfoStruct +from game_controller_hl.utils import get_parameters_from_other_node +from game_controller_hl.receiver import GameStateReceiver -from game_controller_humanoid_interfaces.msg import GameState +from game_controller_hl_interfaces.msg import GameState def test_get_parameters_from_other_node(): diff --git a/game_controller_humanoid_interfaces/.gitignore b/game_controller_hl_interfaces/.gitignore similarity index 100% rename from game_controller_humanoid_interfaces/.gitignore rename to game_controller_hl_interfaces/.gitignore diff --git a/game_controller_humanoid_interfaces/CMakeLists.txt b/game_controller_hl_interfaces/CMakeLists.txt similarity index 89% rename from game_controller_humanoid_interfaces/CMakeLists.txt rename to game_controller_hl_interfaces/CMakeLists.txt index b0cd129..79407c8 100644 --- a/game_controller_humanoid_interfaces/CMakeLists.txt +++ b/game_controller_hl_interfaces/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -project(game_controller_humanoid_interfaces) +project(game_controller_hl_interfaces) find_package(ament_cmake REQUIRED) find_package(rosidl_default_generators REQUIRED) diff --git a/game_controller_humanoid_interfaces/msg/GameState.msg b/game_controller_hl_interfaces/msg/GameState.msg similarity index 100% rename from game_controller_humanoid_interfaces/msg/GameState.msg rename to game_controller_hl_interfaces/msg/GameState.msg diff --git a/game_controller_humanoid_interfaces/package.xml b/game_controller_hl_interfaces/package.xml similarity index 94% rename from game_controller_humanoid_interfaces/package.xml rename to game_controller_hl_interfaces/package.xml index bf2a01b..3a4ec94 100644 --- a/game_controller_humanoid_interfaces/package.xml +++ b/game_controller_hl_interfaces/package.xml @@ -1,7 +1,7 @@ - game_controller_humanoid_interfaces + game_controller_hl_interfaces 0.0.1 RoboCup Humanoid League Game Controller Messages diff --git a/game_controller_humanoid/launch/game_controller.launch b/game_controller_humanoid/launch/game_controller.launch deleted file mode 100644 index 2fc2d72..0000000 --- a/game_controller_humanoid/launch/game_controller.launch +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/game_controller_humanoid/setup.cfg b/game_controller_humanoid/setup.cfg deleted file mode 100644 index 7f8929b..0000000 --- a/game_controller_humanoid/setup.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[develop] -script_dir=$base/lib/game_controller_humanoid -[install] -install_scripts=$base/lib/game_controller_humanoid