From e4f6ee34b75bbc98b74566b1dcf0681d1c848106 Mon Sep 17 00:00:00 2001
From: Glen Chung <glen.tw@gmail.com>
Date: Wed, 16 Oct 2013 08:25:38 +0800
Subject: [PATCH] 1. move M3 x 8mm grub screw to motor_gear.scad 2. more
 comments 3. BlackPaint micro switch

---
 Hardware/Development/Gears/motor_gear.scad   | 8 +++++++-
 Hardware/Development/Y_axis/motor_stand.scad | 9 +++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Hardware/Development/Gears/motor_gear.scad b/Hardware/Development/Gears/motor_gear.scad
index 62a4d7f..f32f272 100644
--- a/Hardware/Development/Gears/motor_gear.scad
+++ b/Hardware/Development/Gears/motor_gear.scad
@@ -33,6 +33,7 @@
  * -- 
  *     DeuxVis - device@ymail.com */
 
+include <MCAD/materials.scad>
 include <MCAD/teardrop.scad>
 include <MCAD/involute_gears.scad>
 
@@ -81,7 +82,7 @@ module herringbone_gear( teeth=12, circles=0, shaft=5 ) {
     );
 }
 
-module cyclone_motor_gear() {
+module cyclone_motor_gear(with_extra_parts=false) {
 // Motor gear
 union() difference() {	 
   union() {
@@ -118,6 +119,11 @@ union() difference() {
   //shaft hole
   translate( [0, 0, -6] ) cylinder( r=motor_shaft_diameter/2, h=20, $fn=30 );
 }
+
+  // --- M3 x 8mm grub screw to attach Gear to motor shaft ---
+  if(with_extra_parts)
+    translate([0,2.5+8,12-3.5]) rotate([90, 0, 0]) color(Steel) cylinder(r=1.5, h=8, $fn=30);
+
 }
 
 cyclone_motor_gear();
diff --git a/Hardware/Development/Y_axis/motor_stand.scad b/Hardware/Development/Y_axis/motor_stand.scad
index d4c2f06..8c330dd 100644
--- a/Hardware/Development/Y_axis/motor_stand.scad
+++ b/Hardware/Development/Y_axis/motor_stand.scad
@@ -115,10 +115,8 @@ module motor_stand_no_base(with_motor=true, with_extra_parts=false) {
           motor(Cyclone_Nema17, NemaLengthLong);
       // --- Motor Gear ---
       translate([0,0,12+5.5]) {
-        rotate([180, 0, 30]) cyclone_motor_gear();
+        rotate([180, 0, -90]) cyclone_motor_gear(with_extra_parts);
       }
-      // --- M3 x 8mm grub screw to attach Gear to motor shaft ---
-      translate([-2.5,0,12-3]) rotate([0, -90, 0]) color(Steel) cylinder(r=1.5, h=8);
     }
     translate([motor_width/2,motor_width/2,wall_thickness/2]) {
       rotate([0,0,15]) translate([0,axis_distance,2.5-wall_thickness/2]) {
@@ -165,8 +163,11 @@ difference() {
   translate([motor_width/2,motor_width/2,wall_thickness/2])
     rotate([0,0,15]) translate([0,axis_distance,2.5-wall_thickness/2]) color(Steel) {
       if(!with_motor && with_extra_parts) {
+        // --- 608 bearing ---
         bearing(model=608);
+        // --- M8 washer ---
         translate([0,0,7]) washer(8);
+        // --- M8 nut ---
         translate([0,0,6.4+7+0.8]) rotate([0,180,0]) flat_nut(8);
        }
     }
@@ -235,7 +236,7 @@ module idle_stand(with_extra_parts=false) {
     // --- micro switch ---
       translate([0,motor_width-idler_width/2,wall_thickness])
         rotate([-90, 0, 90])
-          micro_switch(with_extra_parts);
+          color(BlackPaint) micro_switch(with_extra_parts);
     }
 }