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
---
scripts/slamAutoMode.py | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/scripts/slamAutoMode.py b/scripts/slamAutoMode.py
index dc0e979..f687ec2 100644
--- a/scripts/slamAutoMode.py
+++ b/scripts/slamAutoMode.py
@@ -9,27 +9,28 @@
if __name__ == "__main__":
def help():
- print("Usage: auto_slam.py [port] [speed] [degre_step] [time_delay] [alpha] [beta] [gamma] [microwaveHost] [udp_packets] [deviceName] [saveFolder]")
- print("EXAMPLE: auto_slam.py COM11 100 5 5 0 20 auto 192.168.2.65 1000 pod1 ./data/run_test/")
+ print("Usage: auto_slam.py [servo_path][port] [speed] [degre_step] [time_delay] [alpha] [beta] [gamma] [microwaveHost] [udp_packets] [deviceName] [saveFolder]")
+ print("EXAMPLE: auto_slam.py ./RUN/Test_Servo.exe COM11 100 5 5 0 20 auto 192.168.2.65 1000 pod1 ./data/run_test/")
exit(1)
- if len(sys.argv) != 12:
+ if len(sys.argv) != 13:
help()
try:
- port = str(sys.argv[1])
- speed = str(sys.argv[2])
- degre_step = int(sys.argv[3])
- time_delay = int(sys.argv[4])
- alpha = str(sys.argv[5])
- beta = str(sys.argv[6])
- gamma = str(sys.argv[7])
- microwaveHost = str(sys.argv[8])
- udp_packets = int(sys.argv[9])
- deviceName = str(sys.argv[10])
- saveFolder = os.path.abspath(str(sys.argv[11]))
+ servo_path = str(sys.argv[1])
+ port = str(sys.argv[2])
+ speed = str(sys.argv[3])
+ degre_step = float(sys.argv[4])
+ time_delay = int(sys.argv[5])
+ alpha = str(sys.argv[6])
+ beta = str(sys.argv[7])
+ gamma = str(sys.argv[8])
+ microwaveHost = str(sys.argv[9])
+ udp_packets = int(sys.argv[10])
+ deviceName = str(sys.argv[11])
+ saveFolder = os.path.abspath(str(sys.argv[12]))
except Exception as e:
print(e)
help()
- rotateAndMerge(port,speed,degre_step,time_delay,alpha,beta,gamma,microwaveHost,udp_packets,deviceName,saveFolder)
+ rotateAndMerge(servo_path,port,speed,degre_step,time_delay,alpha,beta,gamma,microwaveHost,udp_packets,deviceName,saveFolder)
print("Done")
\ No newline at end of file
--
Gitblit v1.9.1