Merge branch 'master' of github.com:josefprusa/Prusa3

Conflicts:
	box_frame/configuration.scad.dist

box_frame/configuration.scad.dist

@@ -11,35 +11,47 @@ include <inc/conf_bushing.scad>;
 
 // Custom settings here, tailor to your supplies and print settings
 
+
+// Extruder settings **********************************************************
+// Don't forget to set your slicer's extruder settings to match the values you
+// enter here.
+
 layer_height = 0.3;
+// Width over thickness determines how wide the plastic will be when extruded
+// onto the object that is being printed. width_over_thickness is multiplied
+// by the layer_height to calculate this width. i.e. If your layer_height is
+// set to 0.3 mm and your width_over_thickness is set to 2.2, the resulting
+// width will be 0.66 mm.
 width_over_thickness = 2.2;
 
+
 // Select your belt type ******************************************************
 
-//T2.5
+// T2.5
 belt_tooth_distance = 2.5;
 belt_tooth_ratio = 0.75;
 
-//T5 (strongly discouraged)
-//belt_tooth_distance = 5;
-//belt_tooth_ratio = 0.75;
+// T5 (strongly discouraged)
+// belt_tooth_distance = 5;
+// belt_tooth_ratio = 0.75;
 
-//HTD3
-//belt_tooth_distance = 3;
-//belt_tooth_ratio = 0.75;
+// HTD3
+// belt_tooth_distance = 3;
+// belt_tooth_ratio = 0.75;
 
-//MXL
-//belt_tooth_distance = 2.032;
-//belt_tooth_ratio = 0.64;
+// MXL
+// belt_tooth_distance = 2.032;
+// belt_tooth_ratio = 0.64;
 
-//GT2 there is bunch of GT2 belts with different tooth-to-tooth distance
-//adjust to your needs
-//belt_tooth_distance = 2;
-//belt_tooth_ratio = 0.5;
+// GT2 there is bunch of GT2 belts with different tooth-to-tooth distance
+// adjust to your needs
+// belt_tooth_distance = 2;
+// belt_tooth_ratio = 0.5;
 
 // For T type belts you will probably want 0.8mm or so.
 belt_thickness = 1.75;
 
+
 // Choose bearing/bushing configuration ***************************************
 // conf_b_* are in inc/conf_bushing.scad
 
@@ -49,31 +61,36 @@ bushing_z = conf_b_lm8uu;
 // by default use same as xy
 bushing_carriage = bushing_xy;
 
+
 // Select idler bearing size **************************************************
 // [outer_diameter, width, inner_diameter, uses_guide]
+
 // 608 [standard skate bearings] with bearing guide
 bearing_608 = [22, 7, 8, 1];
-//608 bearings with fender washers. Not good at all, the belt brushes against the carriage
+// 608 bearings with fender washers. Not good at all, the belt brushes against the carriage
 bearing_608_washers = [22, 10, 8, 0];
+
 // one 625 with guides
 bearing_625 = [16, 5, 5, 1];
 // two 625 - for use without bearing guides.
 bearing_625_double = [16, 10, 5, 0];
 
 // those two here are really good:
 bearing_624_double = [13, 10, 4, 0];
+
 // this one has roughly same diameter as pulley, makes belt parallel so its prettier
 bearing_623_double = [10, 8, 3, 0];
 
 idler_bearing = bearing_624_double;
 
-//Select carriage lenght
+// Select carriage lenght ******************************************************
 // 30 for single carriage extruder (two holes with centers 30mm apart)
 // 50 for wade or single with fan (three holes, 30-20)
 // 80 for full length carriage (four holes, 30-20-30)
 
 carriage_l_base = 50;
 
+
 // Fillets ********************************************************************
 // fillets are rounded corners of boxes. The right engineering term is probably radius
 // but cad software calls it fillet.
@@ -85,11 +102,11 @@ carriage_l_base = 50;
 
 use_fillets = 1;
 
-//set to 0 for single plate (affects z axis and screws that attach RP parts to frame)
+// set to 0 for single plate (affects z axis and screws that attach RP parts to frame)
 i_am_box = 1;
 
-//if you do your own plate and can move bottom Z screws 5mm up set this to 0 to
-//get stronger motor mount. Only for i_am_box = 0
+// if you do your own plate and can move bottom Z screws 5mm up set this to 0 to
+// get stronger motor mount. Only for i_am_box = 0
 i_want_to_use_single_plate_dxf_and_make_my_z_weaker = 1;
 
 
@@ -116,10 +133,11 @@ y_threaded_rod_long_r = 5.4;
 // (extras/bearing-holder-single-plate-y)
 board_thickness = 12;
 
-// segments of small holes. some poeple claim that a low value makes them easier to print.
+// Segments of small holes. some poeple claim that a low value makes them easier to print.
 small_hole_segments=7;
 
-// END of custom settings
+
+// END of custom settings *****************************************************
 
 
 // You are not supposed to change this

box_frame/y-belt-holder.scad

@@ -8,7 +8,7 @@
 
 include <configuration.scad>
 
-module y_belt_holder(len=42) {
+module y_belt_holder(len=40) {
     y_delta = i_am_box == 0 ? -2.5 : xy_delta;
     ybelt_hole_to_side = 5;
     real_len = len + 2 * ybelt_hole_to_side;
@@ -25,8 +25,8 @@ module y_belt_holder(len=42) {
         }
         translate([-4.5 + y_delta, 0, real_len / 2]) cube([10, 10, 10], center = true);
         translate([-11, 0, ybelt_hole_to_side + len]) {
-            translate([screw_hole_z_offset,0,0]) rotate([0, -90, 0]) plate_screw(20);
-            translate([8 + y_delta, 0, 0]) cube([10, 9, 9], center=true);
+       #     translate([screw_hole_z_offset,0,0]) rotate([0, -90, 0]) plate_screw(20);
+        #    translate([8 + y_delta, 0, 0]) cube([10, 9, 9], center=true);
         }
         translate([-11, 0, ybelt_hole_to_side]) {
             translate([screw_hole_z_offset,0,0]) rotate([0, -90, 0]) plate_screw(20);