diff --git a/Printed-Parts/scad/fan-nozzle.scad b/Printed-Parts/scad/fan-nozzle.scad index 1694500..476b0db 100644 --- a/Printed-Parts/scad/fan-nozzle.scad +++ b/Printed-Parts/scad/fan-nozzle.scad @@ -4,14 +4,19 @@ difference(){ union(){ cube([32,10,17]); // Main cube translate([30,5,0])cylinder(r=5.8,h = 17, $fn=6); +translate([-3,0,-6]) cube([3,10,23]); +//#translate([-2,5,0])cylinder(r=5.8,h = 17, $fn=6); } // Mounting screw -translate([30,5,-1])cylinder(r=3.2/2,h = 14.5-0.2, $fn=15); // Screw cut +translate([30,5,-10])cylinder(r=3.2/2,h = 24.5-0.2, $fn=15); // Screw cut translate([30,5,17-3.5])cylinder(r=3.1,h = 20, $fn=15); // head cut +//#translate([-2,5,-10])cylinder(r=3.2/2,h = 24.5-0.2, $fn=15); // Screw cut +//#translate([-2,5,17-3.5])cylinder(r=3.1,h = 20, $fn=15); // head cut + // Fan entry hole translate([1,10-1.5,-1])cube([20,3,16.5]); -translate([-1,10-1.5,-1-5])cube([20,3,16.5]); +translate([1,10-1.5,-1-5])cube([18,3,16.5]); // Airway cutout difference(){ @@ -21,31 +26,42 @@ translate([-1,-10,-1])rotate([0,0,45])cube([10,8,30]); translate([20,0,16])rotate([0,20,0])cube([10,20,10]); } translate([2,-1,-4.5])cube([24,3,5]); -translate([-1,-1,-2])rotate([0,45,0])cube([5,4,5]); +//#translate([-2,-1,-2])rotate([0,45,0])cube([5,10,5]); translate([22,-1,-2])rotate([0,45,0])cube([5,10,5]); } // Air director translate([18,0,7])rotate([0,0,30])cube([1,9,10]); - + + } module fancy_corners(){ - translate([-3,-10.5,13])rotate([-20,0,0])cube([40,10,15]); - translate([-13,-10.5,17.5])rotate([0,45,0])cube([10,30,15]); + translate([-10,-10.5,13])rotate([-20,0,0])cube([50,10,15]); + translate([-16,-10.5,17.5])rotate([0,45,0])cube([10,30,15]); translate([46.5,-10.5,15])rotate([0,-45,30])cube([10,30,15]); - translate([28.62,-10.5,15])rotate([0,-45,-30])cube([10,30,15]); + + translate([-5,-1,-7])rotate([0,0,0]) cube([10,6,7]); + translate([-0.5,-1,-7])rotate([0,0,0]) cube([1,15,7]); + translate([-5,4,-11])rotate([45,0,0]) cube([10,5,5]); + + //left cut + translate([-6.5,-8,-5])rotate([0,0,45])cube([10,10,45]); + translate([-7,-5,12])rotate([0,-45,0])cube([10,30,15]); + + translate([-7,5,-10])rotate([0,0,45])cube([10,10,35]); } +module fan_n(){ difference(){ fan_nozzle(); fancy_corners(); - - translate([3,3.5,16.5])linear_extrude(height = 0.6) {text("! HOT !", size = 5, font = "Helvetica Neue");} - -} \ No newline at end of file +translate([2,3.5,16.5])linear_extrude(height = 0.6) {text("! HOT !", size = 5, font = "Helvetica Neue:style=Bold");} +} +} +fan_n(); diff --git a/Printed-Parts/scad/spool holdahMK3.scad b/Printed-Parts/scad/spool holdahMK3.scad index 370f20d..24640c9 100755 --- a/Printed-Parts/scad/spool holdahMK3.scad +++ b/Printed-Parts/scad/spool holdahMK3.scad @@ -1,6 +1,13 @@ - +module dxf_holder(){ linear_extrude(height = 8, center = true, convexity = 5) import (file = "spool holdahMK3.dxf", layer = "0"); -translate([51.53-3.5,123-5-3.5,3.9])cylinder(h = 10, r=8); -//translate([51.5,123,31])cylinder(h = 6, r1=8, r2=12.5); -//translate([51.5,123,37])cylinder(h = 2, r=12.5); \ No newline at end of file +} +module spool_holder_left(){ + dxf_holder(); + translate([51.53-3.5,123-5-3.5,3.9])cylinder(h = 10, r=8); + } +module spool_holder_right(){ + mirror([1,0,0])spool_holder_left(); + } +translate([8,100,0])rotate([0,0,139])spool_holder_right(); +spool_holder_left(); diff --git a/Printed-Parts/stl/LCD-SupportA.stl b/Printed-Parts/stl/LCD-SupportA.stl index 2bb44c9..a819987 100755 Binary files a/Printed-Parts/stl/LCD-SupportA.stl and b/Printed-Parts/stl/LCD-SupportA.stl differ diff --git a/Printed-Parts/stl/LCD-SupportB.stl b/Printed-Parts/stl/LCD-SupportB.stl index c35110f..edbb2bb 100755 Binary files a/Printed-Parts/stl/LCD-SupportB.stl and b/Printed-Parts/stl/LCD-SupportB.stl differ diff --git a/Printed-Parts/stl/LCD-cover.stl b/Printed-Parts/stl/LCD-cover.stl index e15009a..cb25d3d 100755 Binary files a/Printed-Parts/stl/LCD-cover.stl and b/Printed-Parts/stl/LCD-cover.stl differ diff --git a/Printed-Parts/stl/PSU-Y-part.stl b/Printed-Parts/stl/PSU-Y-part.stl index a0f94da..04b5f8c 100755 Binary files a/Printed-Parts/stl/PSU-Y-part.stl and b/Printed-Parts/stl/PSU-Y-part.stl differ diff --git a/Printed-Parts/stl/PSU-cover-NODRILL.stl b/Printed-Parts/stl/PSU-cover-NODRILL.stl index 17f5e71..35ebb2f 100755 Binary files a/Printed-Parts/stl/PSU-cover-NODRILL.stl and b/Printed-Parts/stl/PSU-cover-NODRILL.stl differ diff --git a/Printed-Parts/stl/RAMBO_Cover.stl b/Printed-Parts/stl/RAMBO_Cover.stl index 9d0d217..3e25955 100755 Binary files a/Printed-Parts/stl/RAMBO_Cover.stl and b/Printed-Parts/stl/RAMBO_Cover.stl differ diff --git a/Printed-Parts/stl/belt-guide.stl b/Printed-Parts/stl/belt-guide.stl index d74c87b..d23d5c7 100644 Binary files a/Printed-Parts/stl/belt-guide.stl and b/Printed-Parts/stl/belt-guide.stl differ diff --git a/Printed-Parts/stl/extruder-body.stl b/Printed-Parts/stl/extruder-body.stl index 4b7320f..2b5c5bb 100755 Binary files a/Printed-Parts/stl/extruder-body.stl and b/Printed-Parts/stl/extruder-body.stl differ diff --git a/Printed-Parts/stl/extruder-cover.stl b/Printed-Parts/stl/extruder-cover.stl index 435d942..1122f1e 100644 Binary files a/Printed-Parts/stl/extruder-cover.stl and b/Printed-Parts/stl/extruder-cover.stl differ diff --git a/Printed-Parts/stl/extruder-idler.stl b/Printed-Parts/stl/extruder-idler.stl index 8114f73..ccff206 100755 Binary files a/Printed-Parts/stl/extruder-idler.stl and b/Printed-Parts/stl/extruder-idler.stl differ diff --git a/Printed-Parts/stl/fan-nozzle.stl b/Printed-Parts/stl/fan-nozzle.stl index 307edda..fcc0b81 100644 Binary files a/Printed-Parts/stl/fan-nozzle.stl and b/Printed-Parts/stl/fan-nozzle.stl differ diff --git a/Printed-Parts/stl/heatbed_cable_cover.stl b/Printed-Parts/stl/heatbed_cable_cover.stl index 8b34dda..15c973b 100755 Binary files a/Printed-Parts/stl/heatbed_cable_cover.stl and b/Printed-Parts/stl/heatbed_cable_cover.stl differ diff --git a/Printed-Parts/stl/i3-anti-vib.stl b/Printed-Parts/stl/i3-anti-vib.stl index c1eb43d..b206528 100644 Binary files a/Printed-Parts/stl/i3-anti-vib.stl and b/Printed-Parts/stl/i3-anti-vib.stl differ diff --git a/Printed-Parts/stl/spool holdahMK3.stl b/Printed-Parts/stl/spool holdahMK3.stl index 50e41a7..48bfb53 100644 Binary files a/Printed-Parts/stl/spool holdahMK3.stl and b/Printed-Parts/stl/spool holdahMK3.stl differ diff --git a/Printed-Parts/stl/x-carriage.stl b/Printed-Parts/stl/x-carriage.stl index 46b2803..1ddc4dc 100755 Binary files a/Printed-Parts/stl/x-carriage.stl and b/Printed-Parts/stl/x-carriage.stl differ diff --git a/Printed-Parts/stl/x-end-idler.stl b/Printed-Parts/stl/x-end-idler.stl index 0f77237..334f31f 100755 Binary files a/Printed-Parts/stl/x-end-idler.stl and b/Printed-Parts/stl/x-end-idler.stl differ diff --git a/Printed-Parts/stl/x-end-motor.stl b/Printed-Parts/stl/x-end-motor.stl index 6eb4c1a..8385151 100755 Binary files a/Printed-Parts/stl/x-end-motor.stl and b/Printed-Parts/stl/x-end-motor.stl differ diff --git a/Printed-Parts/stl/y-belt-holder.stl b/Printed-Parts/stl/y-belt-holder.stl index 869c8d0..18beb37 100755 Binary files a/Printed-Parts/stl/y-belt-holder.stl and b/Printed-Parts/stl/y-belt-holder.stl differ diff --git a/Printed-Parts/stl/y-corners.stl b/Printed-Parts/stl/y-corners.stl index 793eb36..d46e017 100755 Binary files a/Printed-Parts/stl/y-corners.stl and b/Printed-Parts/stl/y-corners.stl differ diff --git a/Printed-Parts/stl/y-idler.stl b/Printed-Parts/stl/y-idler.stl index 0edf854..e4bce98 100644 Binary files a/Printed-Parts/stl/y-idler.stl and b/Printed-Parts/stl/y-idler.stl differ diff --git a/Printed-Parts/stl/y-motor.stl b/Printed-Parts/stl/y-motor.stl index 951e5d9..afe63eb 100755 Binary files a/Printed-Parts/stl/y-motor.stl and b/Printed-Parts/stl/y-motor.stl differ diff --git a/Printed-Parts/stl/z-axis-bottom.stl b/Printed-Parts/stl/z-axis-bottom.stl index 2ceed56..c3a118d 100755 Binary files a/Printed-Parts/stl/z-axis-bottom.stl and b/Printed-Parts/stl/z-axis-bottom.stl differ diff --git a/Printed-Parts/stl/z-axis-top.stl b/Printed-Parts/stl/z-axis-top.stl index 8ae18a6..2069e53 100755 Binary files a/Printed-Parts/stl/z-axis-top.stl and b/Printed-Parts/stl/z-axis-top.stl differ diff --git a/Printed-Parts/stl/z-screw-cover.stl b/Printed-Parts/stl/z-screw-cover.stl index 13cd291..41febde 100755 Binary files a/Printed-Parts/stl/z-screw-cover.stl and b/Printed-Parts/stl/z-screw-cover.stl differ