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

cleanup dev-image #129

Merged
merged 8 commits into from
Jul 30, 2024
Merged

cleanup dev-image #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f955195
cleanup
fred-labs Jul 30, 2024
f40feb2
fix dep
fred-labs Jul 30, 2024
f6c0b71
naming
fred-labs Jul 30, 2024
66408a3
update user/group
fred-labs Jul 30, 2024
f746171
update readme
fred-labs Jul 30, 2024
b60bedb
use readme of base folder
fred-labs Jul 30, 2024
2066a70
fix setup.py
fred-labs Jul 30, 2024
ad55a6c
Merge branch 'main' into dev_image
fred-labs Jul 30, 2024
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
6 changes: 3 additions & 3 deletions .devcontainer/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
libxext6 \
libx11-6 \
mesa-utils \
libgl1-mesa-glx \
libglx-mesa0 \
libglu1-mesa-dev \
freeglut3-dev \
mesa-common-dev \
Expand Down Expand Up @@ -52,8 +52,8 @@ RUN --mount=type=bind,target=/tmp_setup export DEBIAN_FRONTEND=noninteractive &&
##############################################################################
ARG USER=ros
ARG PASSWORD=ros
ARG UID=1000
ARG GID=1000
ARG UID=1234
ARG GID=1234
ENV UID=${UID}
ENV GID=${GID}
ENV USER=${USER}
Expand Down
52 changes: 0 additions & 52 deletions .devcontainer/deb_requirements_humble.txt
View file
Open in desktop

This file was deleted.

5 changes: 2 additions & 3 deletions scenario_execution/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@

# read the contents of the README file
this_directory = Path(__file__).resolve()
root_directory = [p for p in this_directory.parents[1:] if p.parts[-1] == PACKAGE_NAME][0]
src_directory = Path.joinpath(root_directory, PACKAGE_NAME)
long_description = (src_directory / "README.md").read_text()
root_directory = [p for p in this_directory.parents if p.parts[-1] == PACKAGE_NAME][0]
long_description = Path.joinpath(root_directory, "README.md").read_text()

setup(
name=PACKAGE_NAME,
Expand Down
6 changes: 3 additions & 3 deletions simulation/gazebo/gazebo_tf_publisher/src/gazebo_tf_publisher_node.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <tf2_msgs/msg/tf_message.hpp>

class GazeboTFPublisher : public rclcpp::Node {
std::shared_ptr<ignition::transport::Node> mIgnNode;
std::shared_ptr<ignition::transport::Node> mSimNode;
rclcpp::Publisher<tf2_msgs::msg::TFMessage>::SharedPtr mPublisher;
std::string gz_pose_topic;
std::string base_frame_id;
Expand All @@ -36,12 +36,12 @@ class GazeboTFPublisher : public rclcpp::Node {

GazeboTFPublisher::GazeboTFPublisher() : Node("gazebo_tf_publisher") {
mPublisher = this->create_publisher<tf2_msgs::msg::TFMessage>("tf", 10);
mIgnNode = std::make_shared<ignition::transport::Node>();
mSimNode = std::make_shared<ignition::transport::Node>();
declare_parameter("gz_pose_topic", "/world/name/dynamic_pose/info");
gz_pose_topic = get_parameter("gz_pose_topic").as_string();
declare_parameter("base_frame_id", "base_link");
base_frame_id = get_parameter("base_frame_id").as_string();
mIgnNode->Subscribe(gz_pose_topic, &GazeboTFPublisher::simulationCallback,
mSimNode->Subscribe(gz_pose_topic, &GazeboTFPublisher::simulationCallback,
this);
}

Expand Down