From da6ff0858f4997f79f5d8cdc88b7367a5cb710b1 Mon Sep 17 00:00:00 2001
From: wu_xinjun <bent20140204@outlook.com>
Date: 星期二, 07 六月 2022 10:55:26 +0800
Subject: [PATCH] Merge commit 'mqdev' into mqaddFeature
---
src/slam/autoMode.py | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/slam/autoMode.py b/src/slam/autoMode.py
index 18663f2..7abd946 100644
--- a/src/slam/autoMode.py
+++ b/src/slam/autoMode.py
@@ -4,17 +4,18 @@
from ..microwave.deviceTools import udp_get_tool,udp2bin_tool,bin2ply_tool
from .manualMode import manual_merge
-cudir = os.path.abspath(os.path.join(__file__, *(['..'] * 1)))
-exe_path = os.path.abspath(os.path.join(cudir,"../RUN/Test_Servo.exe"))
+# cudir = os.path.abspath(os.path.join(__file__, *(['..'] * 1)))
+# exe_path = os.path.abspath(os.path.join(cudir,"../RUN/Test_Servo.exe"))
-def rotateAndMerge(port,speed,degre_step,time_delay,alpha,beta,gamma,microwaveHost,udp_packets,deviceName,saveFolder):
+def rotateAndMerge(servo_path,port,speed,degre_step,time_delay,alpha,beta,gamma,microwaveHost,udp_packets,deviceName,saveFolder):
# 鏃嬭浆鏈烘瀯澶嶄綅
+ exe_path = os.path.abspath(servo_path)
os.system(f"{exe_path} {port} 400 0")
time.sleep(10)
# 闂撮殧鑾峰彇udp
- for i in range(0,360,degre_step):
+ for i in np.arange(0,360,degre_step):
os.system(f"{exe_path} {port} {speed} {i}")
time.sleep(int(time_delay))
subFolder = str(-i)
--
Gitblit v1.9.1