Merge pull request #22 from shitoujie/master

test: 调整cpu频率适合shitoujie的电脑，改导航目标点
IRobot-Algorithm · Feb 26, 2024 · 7e970b5 · 7e970b5
2 parents 35ac6b3 + 88d4059
commit 7e970b5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/scripts/launch.sh b/scripts/launch.sh
@@ -29,7 +29,7 @@ echo "server is finished"
 
 docker run -it --rm --name client --network net-sim \
 	--gpus all \
-	--cpus=8 -m 8192M \
+	--cpus=7.0 -m 8192M \
 	-e ROS_MASTER_URI=http://ros-master:11311 \
 	-e DISPLAY=$DISPLAY \
 	-e QT_X11_NO_MITSHM=1 \

diff --git a/src/rmus_solution/scripts/navi_control.py b/src/rmus_solution/scripts/navi_control.py
@@ -41,7 +41,7 @@ def __init__(self) -> None:
             12: ("block12", [0.575, 0.989, pi], [0.025, 0.05]),
 
             21: ("block21", [2.532, 0.404, -pi/2], [0.05, 0.1]),
-            22: ("block22", [1.793,-0.196, 0], [0.05, 0.1]),
+            22: ("block22", [1.810,-0.196, 0], [0.05, 0.1]),
 
             31: ("block31", [1.276, 3.103,3*pi/4], [0.05, 0.1]),
             32: ("block32", [0.264, 3.1, pi / 4], [0.05, 0.1]),