shark/hexapod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Zhengyu Peng
2021-12-10 22:52:04 -05:00
parent 89eb1c0fc4
commit ddaa006145
1 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
software/rpi/path_generator.py
View File

@@ -90,13 +90,8 @@ def gen_fastbackward_path(standby_coordinate,
def gen_leftturn_path(standby_coordinate,
<<<<<<< HEAD
g_steps = 20,
g_radius = 25):
=======
g_steps=20,
g_radius=25):
>>>>>>> 17d87ef422229801dda42aa0696f121b8358aeda
assert (g_steps % 4) == 0
halfsteps = int(g_steps/2)
@@ -116,13 +111,8 @@ def gen_leftturn_path(standby_coordinate,
def gen_rightturn_path(standby_coordinate,
<<<<<<< HEAD
g_steps = 20,
g_radius = 25):
=======
g_steps=20,
g_radius=25):
>>>>>>> 17d87ef422229801dda42aa0696f121b8358aeda
assert (g_steps % 4) == 0
halfsteps = int(g_steps/2)
@@ -141,13 +131,8 @@ def gen_rightturn_path(standby_coordinate,
def gen_shiftleft_path(standby_coordinate,
<<<<<<< HEAD
g_steps = 20,
g_radius = 25):
=======
g_steps=20,
g_radius=25):
>>>>>>> 17d87ef422229801dda42aa0696f121b8358aeda
assert (g_steps % 4) == 0
halfsteps = int(g_steps/2)
@@ -164,13 +149,8 @@ def gen_shiftleft_path(standby_coordinate,
def gen_shiftright_path(standby_coordinate,
<<<<<<< HEAD
g_steps = 20,
g_radius = 25):
=======
g_steps=20,
g_radius=25):
>>>>>>> 17d87ef422229801dda42aa0696f121b8358aeda
assert (g_steps % 4) == 0
halfsteps = int(g_steps/2)
@@ -183,7 +163,6 @@ def gen_shiftright_path(standby_coordinate,
path[:,[0,2,4],:] = np.tile(semi_circle[:, np.newaxis, :], (1, 3, 1))
path[:,[1,3,5],:] = np.tile(mir_path[:, np.newaxis, :], (1, 3, 1))
<<<<<<< HEAD
return path+np.tile(standby_coordinate, (g_steps, 1, 1))
@@ -193,14 +172,6 @@ def gen_climb_path(standby_coordinate,
z_radius = 80,
x_radius = 30,
z_shift = -30):
=======
def gen_climb_path(standby_coordinate,
g_steps=20,
y_radius=20,
z_radius=80,
x_radius=30,
z_shift=-30):
>>>>>>> 17d87ef422229801dda42aa0696f121b8358aeda
assert (g_steps % 4) == 0
halfsteps = int(g_steps/2)