Skip to content

GitLab

Commit df26342d authored by Pierre Fernbach's avatar Pierre Fernbach
Browse files

Rebase before PR

parent 62e1f4ae
Pipeline #15011 passed with stage
in 39 seconds
Hide whitespace changes
Inline Side-by-side
cmake @ 09483408
Compare 3a52692a...09483408
Subproject commit 3a52692a40839b10f38352c1b06ccfebc0b53f36
Subproject commit 094834088ad9de32f1abdc2d56d29bca2190772c
talos_rbprm/talos.py
View file @ df26342d
......@@ -82,11 +82,7 @@ class Robot(Parent):
referenceConfig_elbowsUp = [
0.0,
0.0,
<<<<<<< cba7912482150ad26b98838e76e365360853dd49
1.0225,
=======
1.01977,
>>>>>>> Reduce root Height in reference config
0.0,
0.0,
0.0,
......@@ -128,11 +124,7 @@ class Robot(Parent):
referenceConfig_legsApart = [
0.0,
0.0,
<<<<<<< cba7912482150ad26b98838e76e365360853dd49
1.0225,
=======
1.01977,
>>>>>>> Reduce root Height in reference config
0.0,
0.0,
0.0,
......@@ -174,11 +166,7 @@ class Robot(Parent):
referenceConfig_armsFront = [
0.0,
0.0,
<<<<<<< cba7912482150ad26b98838e76e365360853dd49
1.0225,
=======
1.01977,
>>>>>>> Reduce root Height in reference config
0,
0.0,
0.0,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment