From 29ba1255346e0b7ac8311a2beb740be9b4003352 Mon Sep 17 00:00:00 2001 From: mattmcw Date: Wed, 27 Sep 2023 21:31:35 -0400 Subject: [PATCH] Work on LED housing. --- 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 | 23 +++++++++++++---------- 8 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app/data/cfg.json b/app/data/cfg.json index ef4eb54..ff4c2ea 100644 --- a/app/data/cfg.json +++ b/app/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.36", + "version": "1.8.37", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/app/package-lock.json b/app/package-lock.json index a616b4d..428c162 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.36", + "version": "1.8.37", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/app/package.json b/app/package.json index aa0512f..8d87d2b 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.36", + "version": "1.8.37", "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 ef4eb54..ff4c2ea 100644 --- a/data/cfg.json +++ b/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.36", + "version": "1.8.37", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/package-lock.json b/package-lock.json index ecbc7b2..e01062e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mcopy", - "version": "1.8.36", + "version": "1.8.37", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mcopy", - "version": "1.8.36", + "version": "1.8.37", "license": "MIT", "dependencies": { "arduino": "file:app/lib/arduino", diff --git a/package.json b/package.json index 5dfaa7f..10f4606 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mcopy", - "version": "1.8.36", + "version": "1.8.37", "description": "Small gauge film optical printer platform", "main": "build.js", "directories": { diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json index ef4eb54..ff4c2ea 100644 --- a/processing/mcopy/cfg.json +++ b/processing/mcopy/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.36", + "version": "1.8.37", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/scad/mcopy_projector.scad b/scad/mcopy_projector.scad index 618a3f2..9e7a54c 100644 --- a/scad/mcopy_projector.scad +++ b/scad/mcopy_projector.scad @@ -153,6 +153,7 @@ module LED_housing (pos = [0, 0, 0], rot = [0, 0, 0], OffsetZ = 0, Void = true) D = LEDD + 0.2; H = LEDH; Opening = 3; + //LED_housing([0, -17.25, -4.5], [90, -90, 134], Void = true); translate(pos) rotate(rot) { translate([0, 0, OffsetZ]) { difference () { @@ -173,6 +174,7 @@ module LED_housing (pos = [0, 0, 0], rot = [0, 0, 0], OffsetZ = 0, Void = true) cube([1.5, 15 + 1, 3 + 1], center = true); } } + translate([0, -12.5, 12.25]) rotate([0, 90, 0]) cylinder(r = R(StepperMountInnerD + 1), h = 50 + 1, center = true, $fn = 120); } } } @@ -208,7 +210,6 @@ module stepper_mount_block (pos = [0, 0, 0], rot = [0, 0, 0]) { BoltY = NEMA17BoltSpacing / 2; BoltCapZ = 11; H = 30; - InnerD = StepperMountInnerD; translate(pos) rotate(rot) { difference () { @@ -220,7 +221,7 @@ module stepper_mount_block (pos = [0, 0, 0], rot = [0, 0, 0]) { //LED_prop([0, -19, -4.5 + 11.5], [0, 0, 45], H = 9, flip = false); } - translate([0, 0, -5]) cylinder(r = R(InnerD), h = H + 1, center = true, $fn = 120); + translate([0, 0, -5]) cylinder(r = R(StepperMountInnerD), h = H + 1, center = true, $fn = 120); LED_housing([0, -17.25, -4.5], [90, -90, 134], Void = false); LED_housing([0, -17.25, -4.5], [-90, 90, 134], OffsetZ = -24.25, Void = false); @@ -240,8 +241,8 @@ module stepper_mount_block (pos = [0, 0, 0], rot = [0, 0, 0]) { //bottom //LED_void([0, -17.25, 2.5], [0, 0, 45], true); } - //color("blue") LED_housing([0, -17.25, -4.5], [90, -90, 134], Void = true); - //color("blue") LED_housing([0, -17.25, -4.5], [-90, 90, 134], OffsetZ = -24.25, Void = true); + color("blue") LED_housing([0, -17.25, -4.5], [90, -90, 134], Void = true); + color("green") LED_housing([0, -17.25, -4.5], [-90, 90, 134], OffsetZ = -24.25, Void = true); } } @@ -446,10 +447,10 @@ module servo_mount (pos = [0, 0, 0], rot = [0, 0, 0]) { cube([ServoVoidX, ServoY + 1, ServoZ + 1], center = true); translate([0, ServoY - 1, 0]) cube([ServoX + 1, ServoY, 1], center = true); - translate([ServoSpaceX / 2, 0, ServoSpaceZ / 2]) rotate([90, 90, 0]) cylinder(r = R(ServoBoltD), h = ServoY + 1, center = true, $fn = 60); - translate([-ServoSpaceX / 2, 0, ServoSpaceZ / 2]) rotate([90, 90, 0]) cylinder(r = R(ServoBoltD), h = ServoY + 1, center = true, $fn = 60); - translate([ServoSpaceX / 2, 0, -ServoSpaceZ / 2]) rotate([90, 90, 0]) cylinder(r = R(ServoBoltD), h = ServoY + 1, center = true, $fn = 60); - translate([-ServoSpaceX / 2, 0, -ServoSpaceZ / 2]) rotate([90, 90, 0]) cylinder(r = R(ServoBoltD), h = ServoY + 1, center = true, $fn = 60); + translate([ServoSpaceX / 2, 0, ServoSpaceZ / 2]) rotate([90, 90, 0]) cylinder(r = R(ServoBoltD), h = ServoY + 1, center = true, $fn = 60); + translate([-ServoSpaceX / 2, 0, ServoSpaceZ / 2]) rotate([90, 90, 0]) cylinder(r = R(ServoBoltD), h = ServoY + 1, center = true, $fn = 60); + translate([ServoSpaceX / 2, 0, -ServoSpaceZ / 2]) rotate([90, 90, 0]) cylinder(r = R(ServoBoltD), h = ServoY + 1, center = true, $fn = 60); + translate([-ServoSpaceX / 2, 0, -ServoSpaceZ / 2]) rotate([90, 90, 0]) cylinder(r = R(ServoBoltD), h = ServoY + 1, center = true, $fn = 60); //void for motor translate([0, 7.5, -15]) rotate([45, 0, 0]) cube([ServoX+20, 10, 10], center = true); @@ -482,7 +483,7 @@ module debug () { //one mount //translate([0, -50, 0]) cube([60, 100, 150], center = true); // - translate([35, 5, 0]) cube([60, 25, 150], center = true); + //translate([35, 5, 0]) cube([60, 25, 150], center = true); } } @@ -494,12 +495,14 @@ module debug () { } -PART = "panel"; +PART = "led_housing"; if (PART == "gate_key") { gate_key(KeyRot = 90); } else if (PART == "panel") { rotate([180, 0, 0]) panel(); +} else if (PART == "led_housing"){ + LED_housing(); } else if (PART == "orbital_mount") { orbital_mount(); } else {