X-Git-Url: http://challenge-bot.com/repos/?p=challenge-bot;a=blobdiff_plain;f=3d-printables%2FMakefile;h=34bf30b04981627f03456f823073ed0bb147dfd4;hp=9122a3e4305ed347f8ced4ab0749a231e2cd190a;hb=3d90aff00bdea5d4a525d006d5390f9c5a25c635;hpb=d00915911d7048524d168f352e33426d094e3176

diff --git a/3d-printables/Makefile b/3d-printables/Makefile
index 9122a3e..34bf30b 100644
--- a/3d-printables/Makefile
+++ b/3d-printables/Makefile
@@ -1,183 +1,20 @@
-%.stl: %.scad %-dimensions.scad
+%.stl: %.scad %-data.scad
 	openscad $< -o $@
 
 %.gcode: %.stl
 	slic3r \
-        -o $@ \
-        --bed-temperature 70 \
-        --first-layer-bed-temperature 80 \
-        --temperature 225 \
-        --first-layer-temperature 235 \
-        --threads 4 \
-        --nozzle-diameter 0.4 \
-        --print-center 95,95 \
-        --z-offset 0 \
-        --gcode-flavor reprap \
-        --filament-diameter 1.75 \
-        --extrusion-multiplier 1 \
-        --travel-speed 100 \
-        --perimeter-speed 75 \
-        --small-perimeter-speed 50 \
-        --external-perimeter-speed '70%' \
-        --infill-speed 100 \
-        --solid-infill-speed 100 \
-        --top-solid-infill-speed 100 \
-        --support-material-speed 50 \
-        --bridge-speed 150 \
-        --gap-fill-speed 50 \
-        --first-layer-speed '30%' \
-        --perimeter-acceleration 0 \
-        --infill-acceleration 0 \
-        --bridge-acceleration 0 \
-        --default-acceleration 0 \
-        --layer-height 0.2 \
-        --first-layer-height 0.35 \
-        --infill-every-layers 1 \
-        --solid-infill-every-layers 0 \
-        --perimeters 3 \
-        --top-solid-layers 4 \
-        --bottom-solid-layers 3 \
-        --fill-density '20%' \
-        --fill-angle 45 \
-        --fill-pattern honeycomb \
-        --solid-fill-pattern rectilinear \
-        --start-gcode start.gcode \
-        --end-gcode end.gcode \
-        --extra-perimeters \
-        --seam-position nearest \
-        --avoid-crossing-perimeters \
-        --only-retract-when-crossing-perimeters \
-        --solid-infill-below-area 70 \
-        --support-material-threshold 0 \
-        --support-material-pattern rectilinear \
-        --support-material-spacing 2.5 \
-        --support-material-angle 0 \
-        --support-material-interface-layers 0 \
-        --support-material-interface-spacing 0 \
-        --raft-layers 0 \
-        --retract-length 1 \
-        --retract-speed 30 \
-        --retract-restart-extra 0 \
-        --retract-before-travel 2 \
-        --retract-lift 0 \
-        --retract-layer-change \
-        --cooling \
-        --min-fan-speed 35 \
-        --max-fan-speed 100 \
-        --bridge-fan-speed 100 \
-        --fan-below-layer-time 60 \
-        --slowdown-below-layer-time 30 \
-        --min-print-speed 10 \
-        --disable-fan-first-layers 0 \
-        --fan-always-on \
-        --skirts 1 \
-        --skirt-distance 6 \
-        --skirt-height 1 \
-        --min-skirt-length 0 \
-        --brim-width 0 \
-        --bed-size 200,200 \
-        --extruder-clearance-radius 20 \
-        --extruder-clearance-height 20 \
-        --resolution 0 \
-        --extrusion-width 0 \
-        --first-layer-extrusion-width '200%' \
-        --perimeter-extrusion-width 0 \
-        --infill-extrusion-width 0 \
-        --solid-infill-extrusion-width 0 \
-        --top-infill-extrusion-width 0 \
-        --support-material-extrusion-width 0 \
-        --bridge-flow-ratio 1 \
-        $<
-
-%-green.gcode: %.stl
-	slic3r \
-        -o $@ \
-        --bed-temperature 70 \
-        --first-layer-bed-temperature 90 \
-        --temperature 215 \
-        --first-layer-temperature 235 \
-        --perimeters 3 \
-        --top-solid-layers 4 \
-        --bottom-solid-layers 3 \
-        --fill-density 20 \
-        --fill-pattern honeycomb \
-        --skirts 1 \
-        --skirt-distance 6 \
-        --skirt-height 1 \
-        --brim-width 0 \
-        --layer-height 0.2 \
-        --fill-angle 45 \
-        --min-skirt-length 0 \
-        --threads 4 \
-        --nozzle-diameter 0.4 \
-        --print-center 95,95 \
-        --z-offset 0 \
-        --gcode-flavor reprap \
-        --filament-diameter 1.75 \
-        --extrusion-multiplier 1 \
-        --travel-speed 100 \
-        --perimeter-speed 75 \
-        --small-perimeter-speed 50 \
-        --external-perimeter-speed '70%' \
-        --infill-speed 100 \
-        --solid-infill-speed 100 \
-        --top-solid-infill-speed 100 \
-        --support-material-speed 50 \
-        --bridge-speed 150 \
-        --gap-fill-speed 50 \
-        --first-layer-speed '30%' \
-        --perimeter-acceleration 0 \
-        --infill-acceleration 0 \
-        --bridge-acceleration 0 \
-        --default-acceleration 0 \
-        --first-layer-height 0.35 \
-        --infill-every-layers 1 \
-        --solid-infill-every-layers 0 \
-        --solid-fill-pattern rectilinear \
-        --start-gcode start.gcode \
-        --end-gcode end.gcode \
-        --extra-perimeters \
-        --seam-position aligned \
-        --avoid-crossing-perimeters \
-        --only-retract-when-crossing-perimeters \
-        --solid-infill-below-area 70 \
-        --support-material-threshold 0 \
-        --support-material-pattern rectilinear \
-        --support-material-spacing 2.5 \
-        --support-material-angle 0 \
-        --support-material-interface-layers 0 \
-        --support-material-interface-spacing 0 \
-        --raft-layers 0 \
-        --retract-length 1 \
-        --retract-speed 30 \
-        --retract-restart-extra 0 \
-        --retract-before-travel 2 \
-        --retract-lift 0 \
-        --retract-layer-change \
-        --cooling \
-        --min-fan-speed 35 \
-        --max-fan-speed 100 \
-        --bridge-fan-speed 100 \
-        --fan-below-layer-time 60 \
-        --slowdown-below-layer-time 30 \
-        --min-print-speed 10 \
-        --disable-fan-first-layers 0 \
-        --fan-always-on \
-        --bed-size 200,200 \
-        --extruder-clearance-radius 20 \
-        --extruder-clearance-height 20 \
-        --resolution 0 \
-        --extrusion-width 0 \
-        --first-layer-extrusion-width '200%' \
-        --perimeter-extrusion-width 0 \
-        --infill-extrusion-width 0 \
-        --solid-infill-extrusion-width 0 \
-        --top-infill-extrusion-width 0 \
-        --support-material-extrusion-width 0 \
-        --bridge-flow-ratio 1 \
-        $<
+	-o $@ \
+	--load makerfarm-i3-v-8in.ini \
+	$<
 
 %.print: %.gcode
-	cp $< /media/3D-PRINTER
+	cp $< /media/${USER}/3D-PRINTER
 	sleep 1
-	umount /media/3D-PRINTER
+	umount /media/${USER}/3D-PRINTER
+
+pretty-angle-bracket:
+	astyle --options=astyle-options --recursive "*angle-bracket.scad"
+
+clean:
+	rm -f *.gcode
+	rm -f *.stl