Merge branch 'master' of https://github.com/looooo/freecad.gears

README.md

@@ -5,9 +5,6 @@
 FreeCAD > v0.16  
 __python > 3 (for python2 use branch py2)__
 
-## Screenshots
-![gear](examples/spiral.png)
-![gear1](examples/animated_spiral.gif)
 
 ## Supported gear-types
 
@@ -28,6 +25,13 @@ __python > 3 (for python2 use branch py2)__
 
 ### Crown-Gear
 
+### Worm-Gear
+
+### Timing-Gear
+
+### Latern-Gear
+![latern-gear](examples/latern-gear.png)
+
 ---------------------------
 
 ## Installation
@@ -79,4 +83,4 @@ by browsing this repositories [issue queue](https://github.com/looooo/freecad.ge
 * "FC Gears: Feedback thread" ([thread](https://forum.freecadweb.org/viewtopic.php?f=8&t=27626))  
 
 # License
-GNU General Public License v2.0
+GNU General Public License v3.0

freecad/gears/features.py

@@ -810,12 +810,9 @@ class TimingGear(object):
         m_34 = (r5 - r_34) * np.array([-np.sin(phi4), np.cos(phi4)])
 
 
-
-        x1 = np.array([0., r5 - h])
         x2 = np.array([-r_12 * np.sin(phi_12), m_12[1] - r_12 * np.cos(phi_12)])
         x3 = m_34 + r_34 / (r_34 + r_23) * (m_23 - m_34)
         x4 = r4 * np.array([-np.sin(phi4), np.cos(phi4)])
-        x5 = r5 * np.array([-np.sin(phi5), np.cos(phi5)])
 
 
         ref = reflection(-phi5 - np.pi / 2)
@@ -980,4 +977,4 @@ def makeBSplineWire(pts):
 def on_mirror_plane(face, z, direction, small_size=0.000001):
     # the tolerance is very high. Maybe there is a bug in Part.makeHelix.
     return (face.normalAt(0, 0).cross(direction).Length < small_size and
-            abs(face.CenterOfMass.z - z) < small_size)
+            abs(face.CenterOfMass.z - z) < small_size)