2.2.2 release candidate fixes (#589)

KmakD · BOOTCFG · web-flow · commit 5bd1efaf8713 · 2025-07-09T14:23:16.000+02:00
Co-authored-by: BOOTCFG <139364969+BOOTCFG@users.noreply.github.com> Fix release documentation rebuild (#523)
diff --git a/.github/workflows/release-project.yaml b/.github/workflows/release-project.yaml
@@ -112,5 +112,5 @@ jobs:
           owner: husarion
           repo: docs_new
           github_token: ${{ secrets.GH_PAT }}
-          workflow_file_name: build.yml
+          workflow_file_name: build.yaml
           ref: master
diff --git a/docker/demo/compose.rviz.yaml b/docker/demo/compose.rviz.yaml
@@ -4,7 +4,7 @@ x-common-config:
   ipc: host
   environment:
     - RMW_IMPLEMENTATION=rmw_cyclonedds_cpp # Default FastDDS do not work
-    - ROBOT_NAMESPACE=${ROBOT_NAMESPACE:-panther}
+    - ROBOT_NAMESPACE=${ROBOT_NAMESPACE:-${ROBOT_MODEL_NAME:-panther}}
     - ROS_DOMAIN_ID=${ROS_DOMAIN_ID:-0}
 
 x-cpu-config:
diff --git a/docker/demo/compose.simulation.yaml b/docker/demo/compose.simulation.yaml
@@ -4,7 +4,7 @@ x-common-config: &common-config
   environment:
     - RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
     - ROBOT_MODEL_NAME=${ROBOT_MODEL_NAME:-panther}
-    - ROBOT_NAMESPACE=${ROBOT_NAMESPACE:-panther}
+    - ROBOT_NAMESPACE=${ROBOT_NAMESPACE:-${ROBOT_MODEL_NAME:-panther}}
     - ROS_DOMAIN_ID=${ROS_DOMAIN_ID:-0}
 
 x-cpu-config: &cpu-config
diff --git a/docker/utils/update_config_directory.sh b/docker/utils/update_config_directory.sh
@@ -29,7 +29,7 @@ copy_package_file() {
 # source robot environment
 source /run/husarion/robot_config.env
 
-copy_package_file husarion_ugv config/joy2twist_${ROBOT_MODEL_NAME}.yaml
+copy_package_file husarion_ugv_bringup config/joy2twist_${ROBOT_MODEL_NAME}.yaml
 copy_package_file husarion_ugv_controller config
 copy_package_file husarion_ugv_lights config/user_animations.yaml
 copy_package_file husarion_ugv_lights config/${ROBOT_MODEL_NAME}_animations.yaml
diff --git a/husarion_ugv/CMakeLists.txt b/husarion_ugv/CMakeLists.txt
@@ -3,6 +3,4 @@ project(husarion_ugv)
 
 find_package(ament_cmake REQUIRED)
 
-install(DIRECTORY config DESTINATION share/${PROJECT_NAME})
-
 ament_package()
diff --git a/husarion_ugv_bringup/CMakeLists.txt b/husarion_ugv_bringup/CMakeLists.txt
@@ -3,6 +3,6 @@ project(husarion_ugv_bringup)
 
 find_package(ament_cmake REQUIRED)
 
-install(DIRECTORY launch DESTINATION share/${PROJECT_NAME})
+install(DIRECTORY config launch DESTINATION share/${PROJECT_NAME})
 
 ament_package()
diff --git a/husarion_ugv_bringup/config/joy2twist_lynx.yaml b/husarion_ugv_bringup/config/joy2twist_lynx.yaml
@@ -4,13 +4,13 @@
 
     linear_velocity_factor:
       fast: 1.5
-      regular: 0.9
-      slow: 0.3
+      regular: 1.2
+      slow: 0.4
 
     angular_velocity_factor:
       fast: 2.0
-      regular: 0.9
-      slow: 0.3
+      regular: 0.78
+      slow: 0.39
 
     e_stop:
       present: true
diff --git a/husarion_ugv_bringup/config/joy2twist_panther.yaml b/husarion_ugv_bringup/config/joy2twist_panther.yaml
diff --git a/husarion_ugv_bringup/launch/bringup.launch.py b/husarion_ugv_bringup/launch/bringup.launch.py
@@ -172,14 +172,14 @@ def generate_launch_description():
         }.items(),
     )
 
-    husarion_ugv_common_dir = PythonExpression(
+    husarion_ugv_bringup_common_dir = PythonExpression(
         [
             "'",
             common_dir_path,
-            "/husarion_ugv' if '",
+            "/husarion_ugv_bringup' if '",
             common_dir_path,
             "' else '",
-            FindPackageShare("husarion_ugv"),
+            FindPackageShare("husarion_ugv_bringup"),
             "'",
         ]
     )
@@ -195,7 +195,7 @@ def generate_launch_description():
             "namespace": namespace,
             "joy2twist_params_file": PathJoinSubstitution(
                 [
-                    husarion_ugv_common_dir,
+                    husarion_ugv_bringup_common_dir,
                     "config",
                     PythonExpression(["'joy2twist_", robot_model_name, ".yaml'"]),
                 ]

Original file line number	Diff line number	Diff line change
`@@ -172,14 +172,14 @@ def generate_launch_description():`
`172`	`172`	`}.items(),`
`173`	`173`	`)`
`174`	`174`
`175`		`- husarion_ugv_common_dir = PythonExpression(`
	`175`	`+ husarion_ugv_bringup_common_dir = PythonExpression(`
`176`	`176`	`[`
`177`	`177`	`"'",`
`178`	`178`	`common_dir_path,`
`179`		`- "/husarion_ugv' if '",`
	`179`	`+ "/husarion_ugv_bringup' if '",`
`180`	`180`	`common_dir_path,`
`181`	`181`	`"' else '",`
`182`		`- FindPackageShare("husarion_ugv"),`
	`182`	`+ FindPackageShare("husarion_ugv_bringup"),`
`183`	`183`	`"'",`
`184`	`184`	`]`
`185`	`185`	`)`
`@@ -195,7 +195,7 @@ def generate_launch_description():`
`195`	`195`	`"namespace": namespace,`
`196`	`196`	`"joy2twist_params_file": PathJoinSubstitution(`
`197`	`197`	`[`
`198`		`- husarion_ugv_common_dir,`
	`198`	`+ husarion_ugv_bringup_common_dir,`
`199`	`199`	`"config",`
`200`	`200`	`PythonExpression(["'joy2twist_", robot_model_name, ".yaml'"]),`
`201`	`201`	`]`