From 1d6ccb7838b7027cd114369794e7dbbb01e97b70 Mon Sep 17 00:00:00 2001 From: mattmcw Date: Mon, 4 Sep 2023 11:43:01 -0400 Subject: [PATCH] Enlarge void for m5 bolt. Add void for m5 nut. --- app/data/cfg.json | 2 +- app/package-lock.json | 2 +- app/package.json | 2 +- data/cfg.json | 2 +- package-lock.json | 4 ++-- package.json | 2 +- processing/mcopy/cfg.json | 2 +- scad/mcopy_projector.scad | 35 +++++++++++++++++------------------ 8 files changed, 25 insertions(+), 26 deletions(-) diff --git a/app/data/cfg.json b/app/data/cfg.json index 280a30a..2b61c2e 100644 --- a/app/data/cfg.json +++ b/app/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.17", + "version": "1.8.18", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/app/package-lock.json b/app/package-lock.json index 05182e9..7abe10a 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.17", + "version": "1.8.18", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/app/package.json b/app/package.json index 1f98686..e6adc80 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.17", + "version": "1.8.18", "description": "GUI for the mcopy small gauge film optical printer platform", "main": "main.js", "scripts": { diff --git a/data/cfg.json b/data/cfg.json index 280a30a..2b61c2e 100644 --- a/data/cfg.json +++ b/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.17", + "version": "1.8.18", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/package-lock.json b/package-lock.json index e468521..76529a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mcopy", - "version": "1.8.17", + "version": "1.8.18", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mcopy", - "version": "1.8.17", + "version": "1.8.18", "license": "MIT", "dependencies": { "arduino": "file:app/lib/arduino", diff --git a/package.json b/package.json index 9b4348c..d518dfb 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mcopy", - "version": "1.8.17", + "version": "1.8.18", "description": "Small gauge film optical printer platform", "main": "build.js", "directories": { diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json index 280a30a..2b61c2e 100644 --- a/processing/mcopy/cfg.json +++ b/processing/mcopy/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.17", + "version": "1.8.18", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/scad/mcopy_projector.scad b/scad/mcopy_projector.scad index c90cdbe..d38c31e 100644 --- a/scad/mcopy_projector.scad +++ b/scad/mcopy_projector.scad @@ -93,15 +93,17 @@ module panel_cap_voids (pos = [0, 0, 0]) { module LED_void (pos = [0, 0, 0], rot = [0, 0, 0], flip = false) { LEDVoidD = 5; LightVoidD = 2.5; + EmitterZ = 39.5; + ReceiverZ = 65; translate(pos) rotate(rot) { rotate([0, 90, 0]) { cylinder(r = R(LightVoidD), h = 80, center = true, $fn = 40); if (flip) { - translate([0, 0, -37.5]) cylinder(r = R(LEDVoidD), h = 80, center = true, $fn = 40); - translate([0, 0, 65]) cylinder(r = R(LEDVoidD), h = 80, center = true, $fn = 40); + translate([0, 0, -EmitterZ]) cylinder(r = R(LEDVoidD), h = 80, center = true, $fn = 40); + translate([0, 0, ReceiverZ]) cylinder(r = R(LEDVoidD), h = 80, center = true, $fn = 40); } else { - translate([0, 0, 37.5]) cylinder(r = R(LEDVoidD), h = 80, center = true, $fn = 40); - translate([0, 0, -65]) cylinder(r = R(LEDVoidD), h = 80, center = true, $fn = 40); + translate([0, 0, EmitterZ]) cylinder(r = R(LEDVoidD), h = 80, center = true, $fn = 40); + translate([0, 0, -ReceiverZ]) cylinder(r = R(LEDVoidD), h = 80, center = true, $fn = 40); } } } @@ -178,7 +180,7 @@ module stepper_mount_block (pos = [0, 0, 0]) { union () { translate([0, 0, -5]) cube([NEMA17OuterWidth, NEMA17OuterWidth, H], center = true); LED_prop([0, 19, -4.5 + 7.5], [0, 0, 45], flip = true); - LED_prop([0, -19, -4.5 + 10.5], [0, 0, 45], H = 9, flip = false); + LED_prop([0, -19, -4.5 + 11.5], [0, 0, 45], H = 9, flip = false); } //corners for (i = [0 : 3]) { @@ -229,7 +231,8 @@ module octagon_void (pos = [0, 0, 0], D = 25, H = 5.01) { module gate_bolt_and_nut_void (pos = [0, 0, 0]) { translate(pos) { - cylinder(r = R(5), h = PanelZ + 1, center = true, $fn = 40); + cylinder(r = R(5.2), h = PanelZ + 1, center = true, $fn = 40); + translate([0, 0, -1.5]) hex(9.2, 4.5); } } @@ -283,14 +286,6 @@ module gate_key (pos = [0, 0, 0], rot = [0, 0, 0]) { gate_key_set_screw_void([0, 6, -2.5]); gate_key_set_screw_void([0, 6, -10]); } - /*translate([0, 0, 3]) { - for (i = [0 : 7]) { - rotate([0, 0, i * (360 / 8)]) { - translate([OctoVoidX, 0, 0]) rotate([0, 45, 0]) cube([2, 35, 2], center = true); - //translate([OctoVoidX, 0, 0]) rotate([90, 0, 0]) cylinder(r = R(2), h = 35, center = true, $fn = 30); - } - } - }*/ } } @@ -321,7 +316,11 @@ module panel (pos = [0, 0, 0], rot = [0, 0, 0]) { // nub_void([NubX, 0, 0]); } - stepper_mount([0, 0, -(StepperMountZ / 2) - (PanelZ / 2)]); + difference () { + stepper_mount([0, 0, -(StepperMountZ / 2) - (PanelZ / 2)]); + translate([GateBoltX, GateBoltY, -20]) hex(9.2, 50); + translate([GateBoltX, -GateBoltY, -20]) hex(9.2, 50); + } } } @@ -340,16 +339,16 @@ module debug () { union () { intersection () { panel(); - translate([0, -50, 0]) cube([60, 100, 150], center = true); + //translate([0, -50, 0]) cube([60, 100, 150], center = true); } } //translate([50, 0, 0]) rotate([0, 0, 45]) cube([100, 250, 150], center = true); } - gate_key([0, -KeyDistance / 2, -13.5], [0, 0, 45]); + color("black") gate_key([0, -KeyDistance / 2, -13.5], [0, 0, 0]); } -PART = "gate_key"; +PART = "gate_keyx"; if (PART == "gate_key") { gate_key();