From 75eeae75f5ab48f5a5d9eccd0fcfde38b636fc0a Mon Sep 17 00:00:00 2001
From: Glen Chung <glen.tw@gmail.com>
Date: Tue, 22 Oct 2013 21:01:04 +0800
Subject: [PATCH] refactor Z smooth rods generation

---
 .../Development/Cyclone_Template/template.scad    |  4 +++-
 Hardware/Development/XZ_axis/X_carriage.scad      | 15 +++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Hardware/Development/Cyclone_Template/template.scad b/Hardware/Development/Cyclone_Template/template.scad
index ad5b887..02c9884 100644
--- a/Hardware/Development/Cyclone_Template/template.scad
+++ b/Hardware/Development/Cyclone_Template/template.scad
@@ -40,6 +40,7 @@ Y_Final_Threaded_Rod_Length = Y_threaded_rod_length+38;
 Y_Final_Smooth_Rod_Length = Y_axis_sep+8;
 Y_threaded_rod_offset = 8;
 Z_Final_Threaded_Rod_Length = 120;
+Z_Final_Smooth_Rod_Length = 140;
 
 X_Wood_Base = X_axis_sep+100;
 Y_Wood_Base = Y_axis_sep+30;
@@ -160,7 +161,7 @@ module cnc_workbed() {
 module X_carriage() {
   translate([0,X_rod_sep_real/2,0])
     rotate([0,0,90])
-      X_carriage_assembled(show_printbed = 0, show_Xrods = 0, show_Zrods = 1);
+      X_carriage_assembled(show_printbed = 0, show_Xrods = 0, z_smooth_rods_len = Z_Final_Smooth_Rod_Length);
 }
 
 module Z_carriage_piece() {
@@ -287,4 +288,5 @@ echo("Non-Plastic Parts: 2 x Smooth rod for X axis, M8 x ", X_Final_Smooth_Rod_L
 echo("Non-Plastic Parts: 1 x Threaded rod for X axis, M8 x ", X_Final_Threaded_Rod_Length);
 echo("Non-Plastic Parts: 2 x Smooth rod for Y axis, M8 x ", Y_Final_Smooth_Rod_Length);
 echo("Non-Plastic Parts: 1 x Threaded rod for Y axis, M8 x ", Y_Final_Threaded_Rod_Length);
+echo("Non-Plastic Parts: 2 x Smooth rod for Z axis, M8 x ", Z_Final_Smooth_Rod_Length);
 echo("Non-Plastic Parts: 1 x Threaded rod for Z axis, M8 x ", Z_Final_Threaded_Rod_Length);
diff --git a/Hardware/Development/XZ_axis/X_carriage.scad b/Hardware/Development/XZ_axis/X_carriage.scad
index 247befa..2e45fbe 100644
--- a/Hardware/Development/XZ_axis/X_carriage.scad
+++ b/Hardware/Development/XZ_axis/X_carriage.scad
@@ -41,7 +41,6 @@ lbearing_length = 24;
 Z_smooth_rods_sep = 55;
 Z_smooth_rods_len = 140;
 
-Z_threaded_rod_len = 120;
 
 lbearing_holder_length = Z_smooth_rods_sep+M8_rod_diam+5;
 
@@ -172,7 +171,7 @@ module X_carriage(show_printbed = 0, show_support = 0) {
 }
 
 
-module X_carriage_assembled(show_printbed = 0, show_Xrods = 0, show_Zrods = 0) {
+module X_carriage_assembled(show_printbed = 0, show_Xrods = 0, z_smooth_rods_len = 0) {
   X_carriage(show_printbed);
 
   if(show_Xrods){
@@ -187,13 +186,13 @@ module X_carriage_assembled(show_printbed = 0, show_Xrods = 0, show_Zrods = 0) {
 	    rod(len=100);
 	  }
   }
-  if(show_Zrods)
+  if(z_smooth_rods_len)
 	  translate([0,0,0])
 	    rotate([90,0,0]) {
-	      translate([0,Z_smooth_rods_len/2-5,Z_smooth_rods_sep/2])
-	        rod(len=Z_smooth_rods_len);
-	      translate([0,Z_smooth_rods_len/2-5,-Z_smooth_rods_sep/2])
-	        rod(len=Z_smooth_rods_len);
+	      translate([0,z_smooth_rods_len/2-5,Z_smooth_rods_sep/2])
+	        rod(len=z_smooth_rods_len);
+	      translate([0,z_smooth_rods_len/2-5,-Z_smooth_rods_sep/2])
+	        rod(len=z_smooth_rods_len);
 	    }
 }
 
@@ -205,7 +204,7 @@ module X_carriage_print_plate() {
 	    X_carriage(show_printbed = 0, show_support = 1);
 }
 
-//X_carriage_assembled(show_printbed = 1,show_Xrods = 1,show_Zrods = 1);
+//X_carriage_assembled(show_printbed = 1,show_Xrods = 1,z_smooth_rods_len = Z_smooth_rods_len);
 X_carriage_print_plate();
 
 //translate([0,20,0]) X_nut_holder_cover();