Merge branch 'master' into v1.1

README.md

@@ -1,6 +1,7 @@
 ![Snappy Full Rendering](https://github.com/revarbat/snappy-reprap/wiki/snappy_small.png)
 
-# Snappy-Reprap v1.1
+Snappy-Reprap v1.1
+==================
 
 A parametric design for a cheap self-replicating 3D printer (reprap) that snaps together to minimize screws and non-printed parts.
 
@@ -17,40 +18,45 @@ Dev Forum            | https://groups.google.com/forum/#!forum/snappy-reprap-dev
 
 [![Join the chat at https://gitter.im/revarbat/snappy-reprap](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/revarbat/snappy-reprap?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-## Making STL Files
-For all platforms, you will need to have OpenSCAD and python installed. You can download OpenSCAD from their website at [http://www.openscad.org](http://www.openscad.org)
 
-### OS X
-Under OS X, you shouldn't need to change the Makefile.  It should set $OPENSCAD as:
+Generating STL Files
+====================
+For all platforms, you will need to have OpenSCAD installed. You can download OpenSCAD from their website at [http://www.openscad.org](http://www.openscad.org)
 
+
+OS X:
+-----
+Under OS X, you'll need to make sure you have the Xcode command-line tools installed first.  You can get them by installing Xcode from the App Store.
+
+You shouldn't need to change the Makefile.  It should set $OPENSCAD as:
 ```
 OPENSCAD=/Applications/OpenSCAD.app/Contents/MacOS/OpenSCAD
 ```
 
 To generate the STL model files, open a terminal to the snappy-reprap directory and type:
-
 ```
 make
 ```
 
-### Linux
-Under Linux, you will need to edit the Makefile, and change $OPENSCAD to:
 
+Linux:
+------
+Under Linux, you will need to edit the Makefile, and change $OPENSCAD to:
 ```
 OPENSCAD=openscad
 ```
-
 To generate the STL model files, open a terminal to the snappy-reprap directory and type:
-
 ```
 make
 ```
 
-### Windows
+
+Windows:
+--------
 Under Windows, you'll probably have to open and compile each `*_parts.scad` file individually and manually export the STL files.
 
 You _might_ be able to run the makefile under CygWin, if you set $OPENSCAD to something like:
-
 ```
 OPENSCAD="/Program Files/OpenSCAD/openscad.exe"
 ```
+

full_assembly.scad

@@ -85,7 +85,7 @@ module motor_mount_assembly(explode=0, arrows=false)
 module xy_motor_segment_assembly(explode=0, arrows=false)
 {
 	// view: [0, 0, 135] [72, 0, 23] 900
-	// desc: Seat the stepper motor with drive gear in the X/Y motor rail segment. Clamp it into place with a motor mount plate with micro-switch. Repeat this to make a second XY motor segment assembly.
+	// desc: Seat the stepper motor with drive gear in the X/Y motor rail segment. Clamp it into place with a motor mount plate with micro-switch. Repeat this to make a second XY motor segment assembly. On one, route the wiring out a side wiring access hole opposite the limit switch, and on the other, route it out one end.
 	motor_width = nema_motor_width(17)+printer_slop*2;
 
 	rail_xy_motor_segment();
@@ -117,7 +117,7 @@ module xy_motor_segment_assembly(explode=0, arrows=false)
 module y_axis_assembly_1(slidepos=0, explode=0, arrows=false)
 {
 	// view: [0, 0, 0] [45, 0, 240] 1800
-	// desc: Join a rail segment to each end of another motor rail assembly. Route wiring out the side wiring access hole on the motor rail segment.
+	// desc: Join a rail segment to each end of another motor rail assembly.
 	platform_vert_off = rail_height+groove_height/2;
 
 	xy_motor_segment_assembly();

vitamins.scad

@@ -86,12 +86,14 @@ module extruder_drive_gear()
 {
 	color("silver") {
 		difference() {
-			cylinder(h=12, d=extruder_drive_diam);
+			cylinder(h=12, d=extruder_drive_diam, $fn=24);
 			up(12-3.5) {
-				torus(ir=extruder_drive_diam/2-1, or=extruder_drive_diam/2+4, $fn=24);
+				zring(r=(extruder_drive_diam+3)/2, n=40) {
+					scale([1, 0.4, 1]) sphere(d=5, $fn=24);
+				}
 			}
-			down(1) cylinder(h=15, d=motor_shaft_size, $fn=12);
-			up(3.5) yrot(90) cylinder(h=extruder_drive_diam/2+1, d=3, $fn=12);
+			down(1) cylinder(h=15, d=motor_shaft_size, $fn=18);
+			up(3.5) yrot(90) cylinder(h=extruder_drive_diam/2+1, d=3, $fn=18);
 		}
 	}
 }