Merge remote-tracking branch 'origin/3.0' into awc-devel

This commit is contained in:
2026-03-23 11:05:41 +00:00

View File

@@ -9,14 +9,14 @@ trolley:
footprint: [[0.583,-0.48],[0.583,0.48],[-0.583,0.48],[-0.583,-0.48]] footprint: [[0.583,-0.48],[0.583,0.48],[-0.583,0.48],[-0.583,-0.48]]
delay: 1.5 # Cấm sửa không là không chạy được delay: 1.5 # Cấm sửa không là không chạy được
timeout: 60.0 timeout: 60.0
vel_x: 0.25 vel_x: 0.2
vel_theta: 0.3 vel_theta: 0.3
yaw_goal_tolerance: 0.015 yaw_goal_tolerance: 0.015
xy_goal_tolerance: 0.015 xy_goal_tolerance: 0.015
min_lookahead_dist: 0.4 min_lookahead_dist: 0.4
max_lookahead_dist: 1.0 max_lookahead_dist: 1.0
lookahead_time: 1.5 lookahead_time: 1.5
angle_threshold: 0.16 angle_threshold: 0.4
qrcode: qrcode:
maker_goal_frame: qr_trolley maker_goal_frame: qr_trolley
@@ -30,7 +30,7 @@ trolley:
min_lookahead_dist: 0.4 min_lookahead_dist: 0.4
max_lookahead_dist: 1.0 max_lookahead_dist: 1.0
lookahead_time: 1.5 lookahead_time: 1.5
angle_threshold: 0.16 angle_threshold: 0.4
charger: charger:
plugins: plugins:
@@ -41,13 +41,13 @@ charger:
footprint: [[0.583,-0.48],[0.583,0.48],[-0.583,0.48],[-0.583,-0.48]] footprint: [[0.583,-0.48],[0.583,0.48],[-0.583,0.48],[-0.583,-0.48]]
delay: 1.5 # Cấm sửa không là không chạy được delay: 1.5 # Cấm sửa không là không chạy được
timeout: 60 timeout: 60
vel_x: 0.1 vel_x: 0.15
yaw_goal_tolerance: 0.015 yaw_goal_tolerance: 0.015
xy_goal_tolerance: 0.015 xy_goal_tolerance: 0.015
min_lookahead_dist: 0.4 min_lookahead_dist: 0.4
max_lookahead_dist: 1.0 max_lookahead_dist: 1.0
lookahead_time: 1.5 lookahead_time: 1.5
angle_threshold: 0.16 angle_threshold: 0.4
dock_station: dock_station:
plugins: plugins:
@@ -102,7 +102,7 @@ undock_station:
min_lookahead_dist: 0.4 min_lookahead_dist: 0.4
max_lookahead_dist: 1.0 max_lookahead_dist: 1.0
lookahead_time: 1.5 lookahead_time: 1.5
angle_threshold: 0.16 angle_threshold: 0.4
qrcode: qrcode:
maker_goal_frame: qr_trolley maker_goal_frame: qr_trolley
@@ -116,7 +116,7 @@ undock_station:
min_lookahead_dist: 0.4 min_lookahead_dist: 0.4
max_lookahead_dist: 1.0 max_lookahead_dist: 1.0
lookahead_time: 1.5 lookahead_time: 1.5
angle_threshold: 0.16 angle_threshold: 0.4
undock_station_2: undock_station_2:
plugins: plugins:
@@ -135,7 +135,7 @@ undock_station_2:
min_lookahead_dist: 0.4 min_lookahead_dist: 0.4
max_lookahead_dist: 1.0 max_lookahead_dist: 1.0
lookahead_time: 1.5 lookahead_time: 1.5
angle_threshold: 0.16 angle_threshold: 0.4
qrcode: qrcode:
maker_goal_frame: qr_trolley maker_goal_frame: qr_trolley
@@ -149,4 +149,4 @@ undock_station_2:
min_lookahead_dist: 0.4 min_lookahead_dist: 0.4
max_lookahead_dist: 1.0 max_lookahead_dist: 1.0
lookahead_time: 1.5 lookahead_time: 1.5
angle_threshold: 0.16 angle_threshold: 0.4