Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ install(
)

if(BUILD_TESTING)
set(ament_cmake_flake8_CONFIG_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ament_flake8.ini")
find_package(ament_cmake_pytest REQUIRED)
find_package(ament_lint_auto REQUIRED)
ament_lint_auto_find_test_dependencies()
Expand Down
6 changes: 6 additions & 0 deletions ament_flake8.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[flake8]
extend-ignore = B902,C816,D100,D101,D102,D103,D104,D105,D106,D107,D203,D212,D404,I100,I202,Q000
import-order-style = google
max-line-length = 99
show-source = true
statistics = true
39 changes: 19 additions & 20 deletions launch/gazebo.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
import os
from pathlib import Path

import yaml
from ament_index_python.packages import get_package_prefix, get_package_share_directory
from launch import LaunchDescription
from launch.actions import (
DeclareLaunchArgument,
IncludeLaunchDescription,
Expand All @@ -40,8 +40,8 @@
)
from launch_ros.actions import Node
from lucy_control_supervisor.controllers_spawn import controllers_to_spawn
import yaml

from launch import LaunchDescription


def _gz_ros2_control_plugin_path():
Expand Down Expand Up @@ -199,24 +199,23 @@ def _camera_compressor(topic: str, compressed_topic: str) -> Node:
parameters=[{"use_sim_time": True}],
output="screen",
)
else:
return Node(
package="image_transport",
executable="republish",
name="camera_compressor_" + safe,
remappings=[
("in", topic),
("out/compressed", compressed_topic),
],
parameters=[
{
"use_sim_time": True,
"in_transport": "raw",
"out_transport": "compressed",
}
],
output="screen",
)
return Node(
package="image_transport",
executable="republish",
name="camera_compressor_" + safe,
remappings=[
("in", topic),
("out/compressed", compressed_topic),
],
parameters=[
{
"use_sim_time": True,
"in_transport": "raw",
"out_transport": "compressed",
}
],
output="screen",
)

camera_compressors = [
_camera_compressor(topic, compressed_topic)
Expand Down
3 changes: 2 additions & 1 deletion scripts/autocalibrate_joint_limits.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,8 @@ def setup(self, p, body, name_to_idx, cid) -> None:
self._idxs = [name_to_idx[n] for n in self._joint_names]
print(
f"[--view rviz] publishing /joint_states for {len(self._joint_names)} joints. "
"Make sure `ros2 launch inmoov_urdf joint_preview.launch.py jsp_gui:=false` is running."
"Make sure `ros2 launch inmoov_urdf joint_preview.launch.py "
"jsp_gui:=false` is running."
)

def step(self, p, body, name_to_idx, cid) -> None:
Expand Down
3 changes: 2 additions & 1 deletion test/test_hardware_yaml.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,8 @@ def _active_yaml_path() -> Path:
try:
from ament_index_python.packages import get_package_share_directory

p = Path(get_package_share_directory("inmoov_urdf")) / "config" / "hardware" / "active.yaml"
share = get_package_share_directory("inmoov_urdf")
p = Path(share) / "config" / "hardware" / "active.yaml"
if p.is_file():
return p
except Exception:
Expand Down
Loading