rename to hl

ros-sports · Jan 16, 2024 · fae7ff6 · fae7ff6
1 parent b6547f7
commit fae7ff6
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 29 deletions.
diff --git a/...noid/config/game_controller_settings.yaml → ...r_hl/config/game_controller_settings.yaml b/...noid/config/game_controller_settings.yaml → ...r_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/...noid/game_controller_humanoid/__init__.py → ...troller_hl/game_controller_hl/__init__.py b/...noid/game_controller_humanoid/__init__.py → ...troller_hl/game_controller_hl/__init__.py
diff --git a/...oid/game_controller_humanoid/gamestate.py → ...roller_hl/game_controller_hl/gamestate.py b/...oid/game_controller_humanoid/gamestate.py → ...roller_hl/game_controller_hl/gamestate.py
diff --git a/...noid/game_controller_humanoid/receiver.py → ...troller_hl/game_controller_hl/receiver.py b/...noid/game_controller_humanoid/receiver.py → ...troller_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/...umanoid/game_controller_humanoid/utils.py → ...controller_hl/game_controller_hl/utils.py b/...umanoid/game_controller_humanoid/utils.py → ...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
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<launch>
+    <arg name="sim" default="false" />
+
+    <node pkg="game_controller_hl" exec="game_controller" name="game_controller_hl" output="screen">
+        <param from="$(find-pkg-share game_controller_hl)/config/game_controller_settings.yaml" />
+        <param name="use_sim_time" value="$(var sim)" />
+    </node>
+</launch>
diff --git a/game_controller_humanoid/package.xml → game_controller_hl/package.xml b/game_controller_humanoid/package.xml → game_controller_hl/package.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>game_controller_humanoid</name>
+  <name>game_controller_hl</name>
   <version>1.1.0</version>
   <description>
-      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.
   </description>
 
@@ -19,7 +19,7 @@
   <buildtool_depend>rosidl_default_generators</buildtool_depend>
   <exec_depend>rosidl_default_runtime</exec_depend>
 
-  <depend>game_controller_humanoid_interfaces</depend>
+  <depend>game_controller_hl_interfaces</depend>
   <depend>python3-construct</depend>
   <depend>rclpy</depend>
   <depend>std_msgs</depend>

diff --git a/...umanoid/resource/game_controller_humanoid → ...controller_hl/resource/game_controller_hl b/...umanoid/resource/game_controller_humanoid → ...controller_hl/resource/game_controller_hl
diff --git a/...troller_humanoid/scripts/sim_gamestate.py → game_controller_hl/scripts/sim_gamestate.py b/...troller_humanoid/scripts/sim_gamestate.py → game_controller_hl/scripts/sim_gamestate.py
diff --git a/game_controller_hl/setup.cfg 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 → game_controller_hl/setup.py b/game_controller_humanoid/setup.py → 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/...ler_humanoid/test/test_game_controller.py → ...ontroller_hl/test/test_game_controller.py b/...ler_humanoid/test/test_game_controller.py → ...ontroller_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/...controller_humanoid_interfaces/.gitignore → game_controller_hl_interfaces/.gitignore b/...controller_humanoid_interfaces/.gitignore → game_controller_hl_interfaces/.gitignore
diff --git a/...roller_humanoid_interfaces/CMakeLists.txt → game_controller_hl_interfaces/CMakeLists.txt b/...roller_humanoid_interfaces/CMakeLists.txt → 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/...ler_humanoid_interfaces/msg/GameState.msg → ...ontroller_hl_interfaces/msg/GameState.msg b/...ler_humanoid_interfaces/msg/GameState.msg → ...ontroller_hl_interfaces/msg/GameState.msg
diff --git a/...ontroller_humanoid_interfaces/package.xml → game_controller_hl_interfaces/package.xml b/...ontroller_humanoid_interfaces/package.xml → game_controller_hl_interfaces/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
-  <name>game_controller_humanoid_interfaces</name>
+  <name>game_controller_hl_interfaces</name>
   <version>0.0.1</version>
   <description>RoboCup Humanoid League Game Controller Messages</description>
 

diff --git a/game_controller_humanoid/launch/game_controller.launch b/game_controller_humanoid/launch/game_controller.launch
diff --git a/game_controller_humanoid/setup.cfg b/game_controller_humanoid/setup.cfg