Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
23-yoshikawa committed Aug 14, 2024
1 parent 7f936ac commit 75d6769
Show file tree
Hide file tree
Showing 14 changed files with 44 additions and 5 deletions.
1 change: 1 addition & 0 deletions app/imshow/launch/imshow_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ def generate_launch_description() -> LaunchDescription:
"log_level",
default_value="info",
choices=["debug", "info", "warn", "error", "fatal"],
description="Logging level for the nodes",
)
index = LaunchConfiguration("index")
log_level = LaunchConfiguration("log_level")
Expand Down
1 change: 1 addition & 0 deletions app/power_map/launch/power_map_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ def generate_launch_description():
"log_level",
default_value="info",
choices=["debug", "info", "warn", "error", "fatal"],
description="Logging level for the nodes",
)
log_level = LaunchConfiguration("log_level")
power_map = Node(
Expand Down
1 change: 1 addition & 0 deletions app/simple_joy_app/launch/app_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ def generate_launch_description():
"log_level",
default_value="info",
choices=["debug", "info", "warn", "error", "fatal"],
description="Logging level for the nodes",
)
log_level = LaunchConfiguration("log_level")
app = Node(
Expand Down
11 changes: 10 additions & 1 deletion device/camera_reader/launch/camera_reader_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,13 @@ def camera_node(**kwargs: Any) -> Node:

def generate_launch_description() -> LaunchDescription:
index_arg = DeclareLaunchArgument("index", default_value="-1")
log_level_arg = DeclareLaunchArgument(
"log_level",
default_value="info",
choices=["debug", "info", "warn", "error", "fatal"],
description="Logging level for the nodes",
)
log_level = LaunchConfiguration("log_level")
index = LaunchConfiguration("index")
index_specified = PythonExpression([index, ">= 0"])
default_config_path = PathJoinSubstitution(
Expand All @@ -30,13 +37,15 @@ def generate_launch_description() -> LaunchDescription:
name=["camera_", index],
parameters=[{"camera_id": index}],
remappings=[("/device/camera_image", ["/packet/camera_image_", index])],
ros_arguments=["--log-level", log_level],
condition=IfCondition(index_specified),
)
unuse_index = camera_node(
parameters=[default_config_path],
remappings=[("/device/camera_image", "/packet/camera_image")],
ros_arguments=["--log-level", log_level],
condition=UnlessCondition(index_specified),
)
return LaunchDescription(
[index_arg, use_index, unuse_index],
[index_arg, log_level_arg,use_index, unuse_index],
)
1 change: 1 addition & 0 deletions device/joystick/launch/joystick_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def generate_launch_description() -> LaunchDescription:
"log_level",
default_value="info",
choices=["debug", "info", "warn", "error", "fatal"],
description="Logging level for the nodes",
)
log_level = LaunchConfiguration("log_level")

Expand Down
1 change: 1 addition & 0 deletions device/nucleo_communicate/launch/channel_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ def generate_launch_description():
"log_level",
default_value="info",
choices=["debug", "info", "warn", "error", "fatal"],
description="Logging level for the nodes",
)
log_level = LaunchConfiguration("log_level")
channel = Node(
Expand Down
1 change: 1 addition & 0 deletions device/nucleo_communicate_py/launch/channel_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ def generate_launch_description() -> LaunchDescription:
"log_level",
default_value="info",
choices=["debug", "info", "warn", "error", "fatal"],
description="Logging level for the nodes",
)
log_level = LaunchConfiguration("log_level")
main = Node(
Expand Down
1 change: 1 addition & 0 deletions device/nucleo_communicate_py/launch/receiver_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ def generate_launch_description() -> LaunchDescription:
"log_level",
default_value="info",
choices=["debug", "info", "warn", "error", "fatal"],
description="Logging level for the nodes",
)
log_level = LaunchConfiguration("log_level")
receiver = Node(
Expand Down
1 change: 1 addition & 0 deletions device/nucleo_communicate_py/launch/sender_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ def generate_launch_description() -> LaunchDescription:
"log_level",
default_value="info",
choices=["debug", "info", "warn", "error", "fatal"],
description="Logging level for the nodes",
)
log_level = LaunchConfiguration("log_level")
sender = Node(
Expand Down
1 change: 1 addition & 0 deletions device/pi_i2c/launch/all_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ def generate_launch_description() -> LaunchDescription:
"log_level",
default_value="info",
choices=["debug", "info", "warn", "error", "fatal"],
description="Logging level for the nodes",
)
log_level = LaunchConfiguration("log_level")
all_exec = Node(
Expand Down
1 change: 1 addition & 0 deletions device/pi_i2c/launch/depth_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ def generate_launch_description() -> LaunchDescription:
"log_level",
default_value="info",
choices=["debug", "info", "warn", "error", "fatal"],
description="Logging level for the nodes",
)
log_level = LaunchConfiguration("log_level")
depth = Node(
Expand Down
1 change: 1 addition & 0 deletions device/pi_i2c/launch/imu_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ def generate_launch_description() -> LaunchDescription:
"log_level",
default_value="info",
choices=["debug", "info", "warn", "error", "fatal"],
description="Logging level for the nodes",
)
log_level = LaunchConfiguration("log_level")
imu = Node(
Expand Down
13 changes: 12 additions & 1 deletion device/pi_led/launch/led_launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ def led_node(**kwargs: Any) -> Node:


def generate_launch_description() -> LaunchDescription:
log_level_arg = DeclareLaunchArgument(
"log_level",
default_valye="info",
description="Logging level for the nodes",
)
log_level = LaunchConfiguration("log-level")
# arguments
variant_arg = DeclareLaunchArgument(
"variant",
Expand All @@ -44,27 +50,32 @@ def generate_launch_description() -> LaunchDescription:
use_default = led_node(
parameters=[right_param_file],
remappings=[("/device/led_color", "/packet/order/led_color")],
ros_arguments=["--log-level", log_level],
condition=IfCondition(variant_is_default),
)
use_right = led_node(
name="led_right",
parameters=[right_param_file],
remappings=[("/device/led_color", "/packet/order/led_color_right")],
ros_arguments=["--log-level", log_level],
condition=IfCondition(variant_is_right),
)
use_left = led_node(
name="led_left",
parameters=[left_param_file],
remappings=[("/device/led_color", "/packet/order/led_color_left")],
ros_arguments=["--log-level", log_level],
condition=IfCondition(variant_is_left),
)
use_custom = led_node(
name="led_custom",
parameters=[param_file],
remappings=[("/device/led_color", "/packet/order/led_color_custom")],
ros_arguments=["--log-level", log_level],
condition=IfCondition(variant_is_custom),
)

return LaunchDescription(
[variant_arg, param_file_arg, use_default, use_right, use_left, use_custom]
[log_level_arg,variant_arg, param_file_arg, use_default, use_right,
use_left, use_custom]
)
14 changes: 11 additions & 3 deletions ul/launch/simple_joy_app_pc.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@


def generate_launch_description() -> LaunchDescription:
log_level_arg = DeclareLaunchArgument(
"log_level",
default_value="info",
description="Logging level for the nodes",
)
log_level = LaunchConfiguration("log-level")
power_map_param_file_arg = DeclareLaunchArgument(
"power_map_param_file",
default_value=PathJoinSubstitution(
Expand All @@ -18,14 +24,16 @@ def generate_launch_description() -> LaunchDescription:
PathJoinSubstitution(
[FindPackageShare("joystick"), "launch", "joystick_launch.py"]
)
)
),
launch_arguments=[("log-level", log_level)],
)
app = IncludeLaunchDescription(
PythonLaunchDescriptionSource(
PathJoinSubstitution(
[FindPackageShare("simple_joy_app"), "launch", "app_launch.py"]
)
)
),
launch_arguments=[("log-level", log_level)],
)
power_map = IncludeLaunchDescription(
PythonLaunchDescriptionSource(
Expand All @@ -40,4 +48,4 @@ def generate_launch_description() -> LaunchDescription:
forwarding=False,
launch_configurations={"param_file": power_map_param_file},
)
return LaunchDescription([power_map_param_file_arg, nodes])
return LaunchDescription([log_level_arg,power_map_param_file_arg, nodes])

0 comments on commit 75d6769

Please sign in to comment.