grey/BOSL2
1
0
Fork 0
mirror of https://github.com/BelfrySCAD/BOSL2.git synced 2025-01-20 03:19:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix lost change

Browse source
This commit is contained in:
Adrian Mariano 2023-06-20 00:20:32 -04:00
parent a9e36c0e0b
commit 3d73a26dd7
1 changed files with 12 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
gears.scad
View file

@ -246,24 +246,7 @@ module spur_gear(
c = outer_radius(pitch, teeth, clearance, internal); c = outer_radius(pitch, teeth, clearance, internal);
r = _root_radius(pitch, teeth, clearance, internal); r = _root_radius(pitch, teeth, clearance, internal);
twist = atan2(thickness*tan(helical),p); twist = atan2(thickness*tan(helical),p);
<<<<<<< HEAD
default_tag("remove", internal) default_tag("remove", internal)
attachable(anchor,spin,orient, r=p, l=thickness) {
difference() {
linear_extrude(height=thickness, center=true, convexity=teeth/2, twist=twist) {
spur_gear2d(
pitch = pitch,
teeth = teeth,
pressure_angle = pressure_angle,
hide = hide,
clearance = clearance,
backlash = backlash,
internal = internal
);
}
if (shaft_diam > 0) {
cylinder(h=2*thickness+1, r=shaft_diam/2, center=true, $fn=max(12,segs(shaft_diam/2)));
=======
attachable(anchor,spin,orient, r=p, l=thickness) { attachable(anchor,spin,orient, r=p, l=thickness) {
zrot(twist/2) zrot(twist/2)
linear_extrude( linear_extrude(
@ -283,7 +266,7 @@ module spur_gear(
); );
if (shaft_diam > 0) { if (shaft_diam > 0) {
circle(r=shaft_diam/2, $fn=max(12,segs(shaft_diam/2))); circle(r=shaft_diam/2, $fn=max(12,segs(shaft_diam/2)));
>>>>>>> upstream/master }
} }
} }
children(); children();