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.

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

fix: pre-commit error for yaml #7

Merged
merged 1 commit into from
Apr 27, 2024
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: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,3 @@ ros2 launch navyu_navigation navigation2_bringup.launch.py
ros2 launch navyu_simulator navyu_simple_simulator_bringup.launch.py
```
![image](https://github.com/RyuYamamoto/navyu/assets/6177252/9d6984f6-edd8-4c10-a049-9d9f2b11834b)

12 changes: 6 additions & 6 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,12 @@ ENV GAZEBO_MODEL_PATH=$GAZEBO_MODEL_PATH:/ros2_ws/src/navyu/navyu_simulator/worl

RUN mkdir -p "$HOME/.gazebo/models" && mkdir /tmp/models && \
cd /tmp/models && \
for m in "cube_20k" "dumpster" "jersey_barrier" "ground_plane" "sun" "willowgarage"; do \
curl -Os "http://models.gazebosim.org/$m/model.tar.gz" && \
tar -zvxf model.tar.gz && \
cp -vfR $m "$HOME/.gazebo/models/"; \
rm model.tar.gz; \
done && \
for m in "cube_20k" "dumpster" "jersey_barrier" "ground_plane" "sun" "willowgarage"; do \
curl -Os "http://models.gazebosim.org/$m/model.tar.gz" && \
tar -zvxf model.tar.gz && \
cp -vfR $m "$HOME/.gazebo/models/"; \
rm model.tar.gz; \
done && \
cd .. && rm -r /tmp/models

COPY entrypoint.sh /usr/bin/
Expand Down
4 changes: 2 additions & 2 deletions navyu/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@

<buildtool_depend>ament_cmake_auto</buildtool_depend>

<depend>rclcpp</depend>
<depend>navyu_simulator</depend>
<depend>navyu_navigation</depend>
<depend>navyu_simulator</depend>
<depend>rclcpp</depend>

<exec_depend>launch_ros</exec_depend>
<test_depend>ament_lint_auto</test_depend>
Expand Down
8 changes: 4 additions & 4 deletions navyu_costmap_2d/config/navyu_costmap_2d_params.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
global_costmap_node:
ros__parameters:
update_frequency: 1.0
base_frame_id: "base_link"
map_frame_id: "map"
plugins: ["static_layer", "inflation_layer"]
base_frame_id: base_link
map_frame_id: map
plugins: [static_layer, inflation_layer]
inflation_layer:
inflation_radius: 0.55
robot_radius: 0.22
static_layer:
map_topic: "map"
map_topic: map
10 changes: 5 additions & 5 deletions navyu_navigation/config/amcl_params.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,27 @@ amcl:
alpha3: 0.2
alpha4: 0.2
alpha5: 0.2
base_frame_id: "base_footprint"
base_frame_id: base_footprint
beam_skip_distance: 0.5
beam_skip_error_threshold: 0.9
beam_skip_threshold: 0.3
do_beamskip: false
global_frame_id: "map"
global_frame_id: map
lambda_short: 0.1
laser_likelihood_max_dist: 2.0
laser_max_range: 12.0
laser_min_range: -1.0
laser_model_type: "likelihood_field"
laser_model_type: likelihood_field
max_beams: 60
max_particles: 500
min_particles: 50
odom_frame_id: "odom"
odom_frame_id: odom
pf_err: 0.05
pf_z: 0.99
recovery_alpha_fast: 0.0
recovery_alpha_slow: 0.0
resample_interval: 1
robot_model_type: "nav2_amcl::DifferentialMotionModel"
robot_model_type: nav2_amcl::DifferentialMotionModel
save_pose_rate: 0.5
sigma_hit: 0.2
tf_broadcast: true
Expand Down
Loading
Loading