Merge branch 'master' of github.com:3299/2018

3299 · Mar 27, 2018 · 59a1d21 · 59a1d21
2 parents 84a7cd7 + ac9215f
commit 59a1d21
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/paths.py b/paths.py
@@ -20,7 +20,8 @@ def __init__(self):
                 'left': [
                     pf.Waypoint(0, 0, 0),
                     pf.Waypoint(6, -6, 0),
-                    #pf.Waypoint(18, -5, math.radians(-90)),
+                    pf.Waypoint(11, -6, 0),
+                    pf.Waypoint(8, 0, math.radians(-90)),
                     #pf.Waypoint(18, 0, 0)
                     #pf.Waypoint(14, 14, 0)
                     #pf.Waypoint(10, 15, 0),

diff --git a/trajectory.pickle b/trajectory.pickle