diff --git a/scad/bed.scad b/scad/bed.scad index 8475842..3efa1fb 100644 --- a/scad/bed.scad +++ b/scad/bed.scad @@ -34,16 +34,16 @@ module bed_assembly() { translate([0,0, pillar_height(bed_pillars) + pcb_thickness / 2]) color(bed_color) cube([bed_width, bed_depth, pcb_thickness], center = true); - translate([0,0, pillar_height(bed_pillars) + pcb_thickness + sheet_thickness(glass) / 2 + eta * 3]) - sheet(glass, bed_width, bed_depth - 12); + translate([0,0, pillar_height(bed_pillars) + pcb_thickness + sheet_thickness(bed_glass) / 2 + eta * 3]) + sheet(bed_glass, bed_width, bed_depth - 12); for(x = [-1, 1]) for(y = [-1,1]) translate([bed_width / 2 * x, ((bed_depth - bulldog_length(small_bulldog)) / 2 - washer_diameter(M3_washer)) * y, - pillar_height(bed_pillars) + (pcb_thickness + sheet_thickness(glass))/ 2]) + pillar_height(bed_pillars) + (pcb_thickness + sheet_thickness(bed_glass))/ 2]) rotate([0, 0, 90 + x * 90]) - bulldog(small_bulldog, pcb_thickness + sheet_thickness(glass)); + bulldog(small_bulldog, pcb_thickness + sheet_thickness(bed_glass)); } end("bed_assembly"); diff --git a/scad/conf/config.scad b/scad/conf/config.scad index a8bf8dc..499ff44 100644 --- a/scad/conf/config.scad +++ b/scad/conf/config.scad @@ -16,8 +16,6 @@ eta = 0.01; // small fudge factor to stop CSG barfing on coi $fa = 5; $fs = 0.5; -glass_thickness = 2; - // // Hole sizes // diff --git a/scad/conf/huxley_config.scad b/scad/conf/huxley_config.scad index 632c332..06fe782 100644 --- a/scad/conf/huxley_config.scad +++ b/scad/conf/huxley_config.scad @@ -23,7 +23,8 @@ Z_travel = 110; bed_depth = 150; bed_width = 150; bed_pillars = M3x20_pillar; -bed_thickness = 1.6 + sheet_thickness(glass); // PCB heater plus glass sheet +bed_glass = glass2; +bed_thickness = 1.6 + sheet_thickness(bed_glass); // PCB heater plus glass sheet bed_holes = 146; base = PMMA10; // Sheet material used for the base. Needs to be thick enough to screw into. diff --git a/scad/conf/mendel_config.scad b/scad/conf/mendel_config.scad index af93445..ad867e6 100644 --- a/scad/conf/mendel_config.scad +++ b/scad/conf/mendel_config.scad @@ -23,7 +23,8 @@ Z_travel = 140; bed_depth = 214; bed_width = 214; bed_pillars = M3x20_pillar; -bed_thickness = 1.6 + sheet_thickness(glass); // PCB heater plus glass sheet +bed_glass = glass2; +bed_thickness = 1.6 + sheet_thickness(bed_glass); // PCB heater plus glass sheet bed_holes = 209; base = PMMA10; // Sheet material used for the base. Needs to be thick enough to screw into. diff --git a/scad/conf/sturdy_config.scad b/scad/conf/sturdy_config.scad index bd1270f..e49dab4 100644 --- a/scad/conf/sturdy_config.scad +++ b/scad/conf/sturdy_config.scad @@ -23,7 +23,8 @@ Z_travel = 150; bed_depth = 214; bed_width = 214; bed_pillars = M3x20_pillar; -bed_thickness = 1.6 + sheet_thickness(glass); // PCB heater plus glass sheet +bed_glass = glass2; +bed_thickness = 1.6 + sheet_thickness(bed_glass); // PCB heater plus glass sheet bed_holes = 209; base = MDF12; diff --git a/scad/vitamins/sheet.scad b/scad/vitamins/sheet.scad index fda19c6..90fe301 100644 --- a/scad/vitamins/sheet.scad +++ b/scad/vitamins/sheet.scad @@ -13,15 +13,15 @@ // The "Color" parameter is a quad-array: [R, G, B, Alpha] -// [ Code, Description, Thickness, Color, Soft] +// [ Code, Description, Thickness, Color, Soft] -MDF6 = [ "MD", "MDF sheet", 6, MDF_brown, true]; // ~1/4" -MDF10 = [ "MD", "MDF sheet", 10, MDF_brown, true]; // ~3/8" -MDF12 = [ "MD", "MDF sheet", 12, MDF_brown, true]; // ~1/2" -PMMA6 = [ "AC", "Acrylic sheet", 6, acrylic_clear, false]; // ~1/4" -PMMA8 = [ "AC", "Acrylic sheet", 8, acrylic_clear, false]; // ~5/16" -PMMA10 = [ "AC", "Acrylic sheet",10, acrylic_clear, false]; // ~3/8" -glass = [ "GL", "Glass sheet", glass_thickness, glass_clear, false]; +MDF6 = [ "MD", "MDF sheet", 6, MDF_brown, true]; // ~1/4" +MDF10 = [ "MD", "MDF sheet", 10, MDF_brown, true]; // ~3/8" +MDF12 = [ "MD", "MDF sheet", 12, MDF_brown, true]; // ~1/2" +PMMA6 = [ "AC", "Acrylic sheet", 6, acrylic_clear, false]; // ~1/4" +PMMA8 = [ "AC", "Acrylic sheet", 8, acrylic_clear, false]; // ~5/16" +PMMA10 = [ "AC", "Acrylic sheet",10, acrylic_clear, false]; // ~3/8" +glass2 = [ "GL", "Glass sheet", 2, glass_clear, false]; DiBond = [ "DB", "Dibond sheet", 3, dibond_grey, false]; function sheet_thickness(type) = type[2];