Improved X carriage, increased frame height, fixed Z carriage

Hardware/CYCLONE_2/Cyclone.scad

@@ -54,7 +54,7 @@ axes_Zthreaded_rodD	= 8.5+animatePart(4,dist=5);
 // X axis reference is the frontal X smooth rod end, RIGHT FRAME
 // Z axis reference is the Z threaded rod, at the height of the Z nut, and relative to the X reference
 axes_Yreference_height	= 40+animatePart(5);
-axes_Xreference_height	= 72+animatePart(6); // relative to Y reference
+axes_Xreference_height	= 74+animatePart(6); // relative to Y reference
 axes_Zreference_height	= -3+animatePart(7)+animatePart(9); // relative to X reference
 
 axes_Xreference_posY	= -81-animatePart(8)-animatePart(9); // relative to Y reference. Moves the X axis towards the front of the machine
@@ -161,7 +161,7 @@ render_2D_or_3D() {
 	
 	
 		// TRANSLATE REFERENCE POSITION to the right frame, X lower smooth rod end
-		translate([axes_Xreference_posX,axes_Xreference_posY,axes_Xreference_height]) {
+		!translate([axes_Xreference_posX,axes_Xreference_posY,axes_Xreference_height]) {
 			if(draw_references) %frame();
 		
 			// Draw bottom X smooth rod

Hardware/CYCLONE_2/Cyclone_X_carriage.scad

@@ -12,7 +12,7 @@ module Cyclone_X_carriage() {
 	linearBearingDiameter = linearBearing_D(linearBearingModel);
 	
 	// Correction is needed to account for 3D printer tolerances
-	axes_effective_Xsmooth_separation = axes_Xsmooth_separation-1;
+	axes_effective_Xsmooth_separation = axes_Xsmooth_separation-0.5;
 	
 	linearBearingSeparation = 0;
 	
@@ -69,14 +69,14 @@ module Cyclone_X_carriage() {
 				rotate([0,90,0]) bcube([axes_effective_Xsmooth_separation,armWidth,armThickness], cr=3,cres=10);
 		} else {
 			if(draw_references) %frame();
-			translate([-0.01+rod_nut_len/2+6,0,0])
+			#translate([-0.01+rod_nut_len/2+6,0,0])
 				hull() {
-					rotate([0,0,-90]) hole_for_nut(size=8,nutAddedLen=-0.1,captiveLen=axes_Xthreaded_rodD*3,tolerance=0.1);
+					rotate([0,0,-90]) hole_for_nut(size=8,nutAddedLen=-1.25,captiveLen=axes_Xthreaded_rodD*3,rot=90,tolerance=0.1);
 					translate([2,0,0])
-						rotate([0,0,-90]) hole_for_nut(size=6,nutAddedLen=0,captiveLen=axes_Xthreaded_rodD*3,tolerance=0.1);
+						rotate([0,0,-90]) hole_for_nut(size=6,nutAddedLen=0,captiveLen=axes_Xthreaded_rodD*3,rot=90,tolerance=0.1);
 				}
 			translate([armThickness+0.01,0,0])
-				rotate([0,0,-90]) hole_for_nut(size=6,nutAddedLen=armThickness,captiveLen=axes_Xthreaded_rodD*3,tolerance=0.1);
+				rotate([0,0,-90]) hole_for_nut(size=6,nutAddedLen=armThickness,captiveLen=axes_Xthreaded_rodD*3,rot=90,tolerance=0.1);
 		}
 	}
 	
@@ -116,11 +116,17 @@ module Cyclone_X_carriage() {
 		// ----- Hole for the Z carriage space ------
 		difference() {
 			translate([-dimX/2-0.5,0,-sideExtensions+ZrodHolderLength])
-				cube([dimX+1,axes_effective_Xsmooth_separation-axes_ZthreadedReference_posY,axes_effective_Xsmooth_separation]);
+				cube([dimX+1,axes_Zreference_posY+axes_ZthreadedReference_posY,axes_effective_Xsmooth_separation]);
 			translate([0,axes_Zreference_posY+axes_ZthreadedReference_posY,axes_effective_Xsmooth_separation+(linearBearingDiameter+sideExtensions)/2])
 				Cyclone_XsubPart_ZnutHolder(mainPart=true);
 		}
 		
+		#frame(100);
+		
+		// ----- Hole for the spindle tool ------
+		translate([0,-35+8.5,0])
+			cylinder(r=35/2, h=100, center=true);
+		
 		// ----- Holes for the linear bearings ------
 		// Bottom right linear bearing
 		translate([-linearBearingLength/2-linearBearingSeparation/2,0,0])

Hardware/CYCLONE_2/INHERITED/Z_carriage_mod.scad

@@ -37,7 +37,7 @@ motor_length = 49; // not used
 motor_screw_distance = 31.3;
 motor_center_diameter = 23;
 
-motor_adjust_margin = 3;
+motor_adjust_margin = 10;
 
 motor_screw_diameter = 3.7;
 motor_screw_head_diameter = 8;
@@ -55,12 +55,13 @@ idler_width = 25;
 
 lbearing_holder_length = 23*2;
 
+ZthreadedOffset = -3.5;
 
-axes_Xsmooth_separation = 16;
+axes_Xsmooth_separation = 16+ZthreadedOffset;
 
 Z_threaded_pos = motor_width/2+axis_distance+axes_Xsmooth_separation;
 
-spindle_front_offset = 10;
+spindle_front_offset = 10+ZthreadedOffset;
 
 
 Z_smooth_rods_sep = 40;
@@ -272,7 +273,7 @@ module Z_carriage(showSpindle=false,top_part=true, with_extra_parts=false, explo
 		}
 
 		// Truncation in the base for avoiding collision with the X axis
-		if(!top_part) translate([-15-axes_Xsmooth_separation+11,0,0]) cube([20,100,50],center=true);
+		if(!top_part) translate([-15-axes_Xsmooth_separation+11+ZthreadedOffset,0,0]) cube([20,100,50],center=true);
 	}
 	*if(showSpindle) rotate([0,0,-90]) translate([0,wall_width-4-Z_threaded_pos,0])
 			translate([0,38,-20+8]) dummySpindle();

Hardware/CYCLONE_2/libs/standard_parts.scad

@@ -116,15 +116,15 @@ module nut(size=8, chamfer=false, renderPart=false, echoPart=false) {
 }
 
 
-module hole_for_nut(size=3,nutAddedLen=0,captiveLen=0,tolerance=0.35) {
+module hole_for_nut(size=3,nutAddedLen=0,captiveLen=0,rot=0,tolerance=0.35) {
 	radius = METRIC_NUT_AC_WIDTHS[size]/2+tolerance;
 	height = METRIC_NUT_THICKNESS[size]+tolerance;
 	scale([1,(height+nutAddedLen)/height,1])
 		rotate([90,0,0])
 			hull() {
-				nutHole(size=size, tolerance=tolerance, proj=-1);
+				rotate([0,0,rot]) nutHole(size=size, tolerance=tolerance, proj=-1);
 				translate([0,captiveLen,0])
-					nutHole(size=size, tolerance=tolerance, proj=-1);
+					rotate([0,0,rot]) nutHole(size=size, tolerance=tolerance, proj=-1);
 			}
 }