Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[N/A] revert update_sigterm_sigkill_timeouts #553

Merged
merged 1 commit into from
Jan 13, 2025
Merged

[N/A] revert update_sigterm_sigkill_timeouts #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions spot_driver/launch/point_cloud_xyz.launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
from launch import LaunchDescription
from launch.actions import DeclareLaunchArgument
from launch.substitutions import LaunchConfiguration, PathJoinSubstitution
from synchros2.launch.actions import update_sigterm_sigkill_timeout


def generate_launch_description() -> LaunchDescription:
Expand Down Expand Up @@ -74,5 +73,4 @@ def generate_launch_description() -> LaunchDescription:
),
]
)
update_sigterm_sigkill_timeout(ld)
return ld
2 changes: 0 additions & 2 deletions spot_driver/launch/point_cloud_xyzrgb.launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
from launch import LaunchDescription
from launch.actions import DeclareLaunchArgument
from launch.substitutions import LaunchConfiguration, PathJoinSubstitution
from synchros2.launch.actions import update_sigterm_sigkill_timeout


def generate_launch_description() -> LaunchDescription:
Expand Down Expand Up @@ -77,5 +76,4 @@ def generate_launch_description() -> LaunchDescription:
),
]
)
update_sigterm_sigkill_timeout(ld)
return ld
2 changes: 0 additions & 2 deletions spot_driver/launch/rviz.launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
PathJoinSubstitution,
)
from launch_ros.substitutions import FindPackageShare
from synchros2.launch.actions import update_sigterm_sigkill_timeout

THIS_PACKAGE = "spot_driver"

Expand Down Expand Up @@ -44,7 +43,6 @@ def create_rviz_config(robot_name: str) -> None:


def launch_setup(context: LaunchContext, ld: LaunchDescription) -> None:
update_sigterm_sigkill_timeout(ld)
rviz_config_file = LaunchConfiguration("rviz_config_file").perform(context)
spot_name = LaunchConfiguration("spot_name").perform(context)

Expand Down
3 changes: 1 addition & 2 deletions spot_driver/launch/spot_driver.launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,14 @@
from launch.substitutions import Command, FindExecutable, LaunchConfiguration, PathJoinSubstitution, TextSubstitution
from launch_ros.actions import Node
from launch_ros.substitutions import FindPackageShare
from synchros2.launch.actions import DeclareBooleanLaunchArgument, update_sigterm_sigkill_timeout
from synchros2.launch.actions import DeclareBooleanLaunchArgument

from spot_driver.launch.spot_launch_helpers import IMAGE_PUBLISHER_ARGS, declare_image_publisher_args, spot_has_arm

THIS_PACKAGE = "spot_driver"


def launch_setup(context: LaunchContext, ld: LaunchDescription) -> None:
update_sigterm_sigkill_timeout(ld)
config_file = LaunchConfiguration("config_file")
launch_rviz = LaunchConfiguration("launch_rviz")
rviz_config_file = LaunchConfiguration("rviz_config_file").perform(context)
Expand Down
2 changes: 0 additions & 2 deletions spot_driver/launch/spot_image_publishers.launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from launch.actions import DeclareLaunchArgument, OpaqueFunction
from launch.conditions import IfCondition
from launch.substitutions import LaunchConfiguration, PathJoinSubstitution
from synchros2.launch.actions import update_sigterm_sigkill_timeout

from spot_driver.launch.spot_launch_helpers import (
DepthRegisteredMode,
Expand Down Expand Up @@ -92,7 +91,6 @@ def create_point_cloud_nodelets(


def launch_setup(context: LaunchContext, ld: LaunchDescription) -> None:
update_sigterm_sigkill_timeout(ld)
config_file = LaunchConfiguration("config_file")
spot_name = LaunchConfiguration("spot_name").perform(context)
depth_registered_mode_config = LaunchConfiguration("depth_registered_mode")
Expand Down
3 changes: 1 addition & 2 deletions spot_ros2_control/launch/spot_ros2_control.launch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
)
from launch_ros.actions import Node
from launch_ros.substitutions import FindPackageShare
from synchros2.launch.actions import DeclareBooleanLaunchArgument, update_sigterm_sigkill_timeout
from synchros2.launch.actions import DeclareBooleanLaunchArgument

from spot_driver.launch.spot_launch_helpers import (
IMAGE_PUBLISHER_ARGS,
Expand Down Expand Up @@ -301,6 +301,5 @@ def generate_launch_description():
+ declare_image_publisher_args()
)
# Add nodes to launch description
update_sigterm_sigkill_timeout(ld)
ld.add_action(OpaqueFunction(function=launch_setup, args=[ld]))
return ld
Loading