diff --git a/readme.md b/readme.md index 6421ff7..ed99204 100644 --- a/readme.md +++ b/readme.md @@ -902,7 +902,7 @@ Can draw three styles: solid, open frame and open frame with screw bosses. | ---:|:--- |:---| | 1 | ```fan(fan120x25)``` | Fan 120mm x 25mm | | 1 | ```fan(fan17x8)``` | Fan 17mm x 8mm | -| 1 | ```fan(fan25x10)``` | Fan 25mm x 10mm | +| 1 | ```fan(fan25.4x10)``` | Fan 25.4mm x 10mm | | 1 | ```fan(fan30x10)``` | Fan 30mm x 10mm | | 1 | ```fan(fan40x11)``` | Fan 40mm x 11mm | | 1 | ```fan(fan50x15)``` | Fan 50mm x 15mm | @@ -4448,7 +4448,7 @@ The ring spacing as well as the number of spokes can be specified, if zero a gas | ---:|:--- | | 1 | fan_guard_120.stl | | 1 | fan_guard_17.stl | -| 1 | fan_guard_25.stl | +| 1 | fan_guard_25.4.stl | | 1 | fan_guard_30.stl | | 1 | fan_guard_40.stl | | 1 | fan_guard_50.stl | diff --git a/tests/png/fans.png b/tests/png/fans.png index f684b66..210ed20 100644 Binary files a/tests/png/fans.png and b/tests/png/fans.png differ diff --git a/vitamins/fans.scad b/vitamins/fans.scad index da8ccae..ce4769a 100644 --- a/vitamins/fans.scad +++ b/vitamins/fans.scad @@ -17,28 +17,28 @@ // If not, see . // -// w d b h s h t o b b a -// i e o o c u h u l o p -// d p r l r b i t a s p -// t t e e e c e d s e -// h h w d k r e r -// p i n s d t -// i a e d u -// t s i r -// c s a e -// h +// w d b h s h t o b b a +// i e o o c u h u l o p +// d p r l r b i t a s p +// t t e e e c e d s e +// h h w d k r e r +// p i n s d t +// i a e d u +// t s i r +// c s a e +// h // -fan120x25= [120,25, 116,52.5, M4_dome_screw, 41, 4, 140, 9, 0, 137]; -fan80x38 = [80, 38, 75, 35.75, M4_dome_screw, 40, 4.3, 84, 7, 0, 85]; -fan80x25 = [80, 25, 75, 35.75, M4_dome_screw, 40, 4.3, 84, 7, 0, 85]; -fan70x15 = [70, 15, 66, 30.75, M4_dome_screw, 29, 3.8, 70 ,7, 0, undef]; -fan60x25 = [60, 25, 57, 25, M4_dome_screw, 31.5, 3.6, 64, 7, 0, 63]; -fan60x15 = [60, 15, 57, 25, M4_dome_screw, 29, 2.4, 60, 7, 7.7, 63]; -fan50x15 = [50, 15, 48, 20, M4_dome_screw, 25, 12.5,100,7, 0, undef]; -fan40x11 = [40, 11, 37, 16, M3_dome_screw, 25, 7.5,100, 9, 0, undef]; -fan30x10 = [30, 10, 27, 12, M3_dome_screw, 17, 10, 100, 5, 0, undef]; -fan25x10 = [25, 10, 24, 10, M2p5_pan_screw, 16, 10, 100, 5, 0, undef]; -fan17x8 = [17, 8, 16, 6.75, M2_cap_screw, 12.6, 8, 100, 7, 0, undef]; +fan120x25= [120, 25, 116,52.5, M4_dome_screw, 41, 4, 140, 9, 0, 137]; +fan80x38 = [80, 38, 75, 35.75, M4_dome_screw, 40, 4.3, 84, 7, 0, 85]; +fan80x25 = [80, 25, 75, 35.75, M4_dome_screw, 40, 4.3, 84, 7, 0, 85]; +fan70x15 = [70, 15, 66, 30.75, M4_dome_screw, 29, 3.8, 70 ,7, 0, undef]; +fan60x25 = [60, 25, 57, 25, M4_dome_screw, 31.5, 3.6, 64, 7, 0, 63]; +fan60x15 = [60, 15, 57, 25, M4_dome_screw, 29, 2.4, 60, 7, 7.7, 63]; +fan50x15 = [50, 15, 48, 20, M4_dome_screw, 25, 12.5,100, 7, 0, undef]; +fan40x11 = [40, 11, 37, 16, M3_dome_screw, 25, 7.5,100, 9, 0, undef]; +fan30x10 = [30, 10, 27, 12, M3_dome_screw, 17, 10, 100, 5, 0, undef]; +fan25x10 = [25.4,10, 24, 10, M2p5_pan_screw, 16, 10, 100, 5, 0, undef]; +fan17x8 = [17, 8, 16, 6.75, M2_cap_screw, 12.6, 8, 100, 7, 0, undef]; fans = [fan17x8, fan25x10, fan30x10, fan40x11, fan50x15, fan60x15, fan60x25, fan70x15, fan80x25, fan80x38, fan120x25];