Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
2 changed files with 24 additions and 3 deletions
Showing only changes of commit 05cdda615b - Show all commits

View File

@ -42,8 +42,8 @@ module exploded_view () {
motor_mount_bottom(); motor_mount_bottom();
//projection () intval_panel_laser(); //projection () intval_panel_laser();
//intval_laser_panel_cover(true, ALL_RED=true); //intval_laser_panel_cover(true, ALL_RED=true);
rotate([0, 0, 13]) intval_panel_laser(); //rotate([0, 0, 13]) intval_panel_laser();
rotate([0, 0, 13]) intval_laser_panel_cover(); //rotate([0, 0, 13]) intval_laser_panel_cover();
//key_cap(); //key_cap();
//geared_motor_mount_120(); //geared_motor_mount_120();
//motor_key(); //motor_key();
@ -51,6 +51,7 @@ rotate([0, 0, 13]) intval_laser_panel_cover();
//plunger_plate(); //plunger_plate();
//motor_cap(false); //motor_cap(false);
//motor_cap_120(false); //motor_cap_120(false);
//translate([0, 0, 39 / 2 + 5.75]) bolt_guide();
//exploded_view(); //exploded_view();
//stl_plate(); //stl_plate();

View File

@ -192,7 +192,7 @@ module motor_mount_bottom () {
module panel_attachment () { module panel_attachment () {
difference () { difference () {
union() { union() {
translate([0, 0, 7.75 + 3.5]) cylinder(r = 7/2, h = 44 - shelf_h, center = true); translate([0, 0, 7.75 + 3]) cylinder(r = 7/2, h = 44 - shelf_h, center = true);
translate([3.5, 0, 0]) cube([7, 7, height - shelf_h - 4], center = true); translate([3.5, 0, 0]) cube([7, 7, height - shelf_h - 4], center = true);
} }
translate([0, 0, 25]) cylinder(r = 3.2/2, h = 50, center = true); translate([0, 0, 25]) cylinder(r = 3.2/2, h = 50, center = true);
@ -203,6 +203,13 @@ module motor_mount_bottom () {
microswitch_holder(); microswitch_holder();
bolt_holder([mm_x[2], mm_y[2], ((height - shelf_h)/ 2) + 3.75], 0, height - shelf_h - 4, 6); //bottom left mount bolt_holder([mm_x[2], mm_y[2], ((height - shelf_h)/ 2) + 3.75], 0, height - shelf_h - 4, 6); //bottom left mount
bolt_holder([mm_x[3], mm_y[3], ((height - shelf_h)/ 2) + 3.75], 180, height - shelf_h - 4, 6); //bottom right mount bolt_holder([mm_x[3], mm_y[3], ((height - shelf_h)/ 2) + 3.75], 180, height - shelf_h - 4, 6); //bottom right mount
if (DECOYS) {
difference () {
translate([35, 0 , 0]) decoys(44, 8, 6);
}
translate([0, 0, 8]) cube([4, 4, 4], center = true);
translate([40, 55, 8]) cube([4, 4, 4], center = true);
}
} }
module bolt_holder (position = [0, 0, 0], rotate_z = 0, h = 17, length = 4.5, hole = true, tight = 0) { module bolt_holder (position = [0, 0, 0], rotate_z = 0, h = 17, length = 4.5, hole = true, tight = 0) {
bolt_r = 6; bolt_r = 6;
@ -270,4 +277,17 @@ module pcb_mount () {
translate([DISTANCE_X, DISTANCE_Y, 0]) stand(); translate([DISTANCE_X, DISTANCE_Y, 0]) stand();
translate([0, DISTANCE_Y, 0]) stand(); translate([0, DISTANCE_Y, 0]) stand();
translate([DISTANCE_X/2, DISTANCE_Y/2, -4]) rounded_cube([DISTANCE_X + OUTER, DISTANCE_Y + OUTER, 4], OUTER, center = true); translate([DISTANCE_X/2, DISTANCE_Y/2, -4]) rounded_cube([DISTANCE_X + OUTER, DISTANCE_Y + OUTER, 4], OUTER, center = true);
}
module bolt_guide () {
$fn = 60;
H = 39;
difference () {
union() {
cylinder(r = 10 / 2, h = H, center = true);
translate([0, 0, -(H / 2) + 1]) cylinder(r = 14 / 2, h = 2, center = true);
}
cylinder(r = 7 / 2, h = H + 1, center = true);
translate([12, 0, -(H / 2) + 1]) cube([14, 14, 3], center = true);
}
} }