restore work from tonight

This commit is contained in:
Matt McWilliams 2023-08-29 23:11:24 -04:00
parent b6b1f5d5ba
commit 6714374639
8 changed files with 68 additions and 32 deletions

View File

@ -1,5 +1,5 @@
{
"version": "1.8.13",
"version": "1.8.14",
"ext_port": 1111,
"profiles": {
"mcopy": {

2
app/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "mcopy-app",
"version": "1.8.13",
"version": "1.8.14",
"lockfileVersion": 2,
"requires": true,
"packages": {

View File

@ -1,6 +1,6 @@
{
"name": "mcopy-app",
"version": "1.8.13",
"version": "1.8.14",
"description": "GUI for the mcopy small gauge film optical printer platform",
"main": "main.js",
"scripts": {

View File

@ -1,5 +1,5 @@
{
"version": "1.8.13",
"version": "1.8.14",
"ext_port": 1111,
"profiles": {
"mcopy": {

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "mcopy",
"version": "1.8.13",
"version": "1.8.14",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "mcopy",
"version": "1.8.13",
"version": "1.8.14",
"license": "MIT",
"dependencies": {
"arduino": "file:app/lib/arduino",

View File

@ -1,6 +1,6 @@
{
"name": "mcopy",
"version": "1.8.13",
"version": "1.8.14",
"description": "Small gauge film optical printer platform",
"main": "build.js",
"directories": {

View File

@ -1,5 +1,5 @@
{
"version": "1.8.13",
"version": "1.8.14",
"ext_port": 1111,
"profiles": {
"mcopy": {

View File

@ -195,8 +195,8 @@ module stepper_mount_block (pos = [0, 0, 0]) {
bolt_and_cap_void([BoltX, -BoltY, 10], H, H);
bolt_and_cap_void([-BoltX, -BoltY, 10], H, H);
//
LED_void([0, 19, -4.5], [0, 0, 45]);
LED_void([0, -19, 1.5], [0, 0, 45], true);
LED_void([0, 17.25, -4.5], [0, 0, 45]);
LED_void([0, -17.25, 1.5], [0, 0, 45], true);
}
}
}
@ -243,24 +243,53 @@ module gate_key_set_screw_void (pos = [0, 0, 0]) {
}
module gate_key (pos = [0, 0, 0], rot = [0, 0, 0]) {
Extension = 8.75;
KeyZ = (13 / 2) + (10 / 2) + 6;
OctoVoidX = 12;
OctoVoidZ = 2.0;
translate(pos) rotate(rot) {
difference () {
union () {
cylinder(r = R(29), h = 12, center = true, $fn = 120);
translate([0, 0, -Extension / 2]) cylinder(r = R(29), h = 12 + Extension, center = true, $fn = 120);
translate([0, 0, 1]) cylinder(r = R(11), h = 12, center = true, $fn = 60);
translate([0, 0, (13 / 2) + (10 / 2)]) cylinder(r = R(BearingInnerDiameter - 0.3), h = 10, center = true, $fn = 60);
translate([0, 0, (13 / 2) + (10 / 2)]) {
cylinder(r = R(BearingInnerDiameter - 0.3), h = 10, center = true, $fn = 60);
}
}
translate([0, 0, -3]) scale([1.07, 1.07, 1]) {
NEMA17_motor_shaft([0, 0, -5]);
}
//octagon_void([0, 0, 3.5]);
translate([0, 0, OctoVoidZ]) {
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);
}
}
}
translate([0, 0, -3]) scale([1.07, 1.07, 1]) NEMA17_motor_shaft([0, 0, -5]);
octagon_void([0, 0, 3.5]);
//normalization flat
translate([0, 27, -3.5]) cube([29, 29, 10], center = true);
translate([0, 27, -3.5 - (Extension / 2)]) cube([29, 29, 10 + Extension + 1], center = true);
//key
rotate ([0, 0, 45]) {
translate([0, (10 / 2) + (KeyWidth / 2), (13 / 2) + (10 / 2) + 6]) cube([10, 10, 10], center = true);
translate([0, -(10 / 2) - (KeyWidth / 2), (13 / 2) + (10 / 2) + 6]) cube([10, 10, 10], center = true);
translate([0, (10 / 2) + (KeyWidth / 2), KeyZ]) cube([10, 10, 10], center = true);
translate([0, -(10 / 2) - (KeyWidth / 2), KeyZ]) cube([10, 10, 10], center = true);
}
gate_key_set_screw_void([0, 6, -1.5]);
translate([0, 0, KeyZ]) difference () {
cylinder(r = R(BearingInnerDiameter + 1), h = 10, center = true, $fn = 60);
cylinder(r = R(BearingInnerDiameter - 1), h = 10, center = true, $fn = 60);
}
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);
}
}
}*/
}
}
@ -281,6 +310,7 @@ module panel (pos = [0, 0, 0], rot = [0, 0, 0]) {
key_void([0, KeyDistance / 2, 0]);
key_void([0, -KeyDistance / 2, 0]);
panel_cap_voids([0, 0, -1]);
//
@ -299,25 +329,31 @@ module projector () {
}
module debug () {
panel();
NEMA17([0, KeyDistance / 2, -50]);
//NEMA17([0, -KeyDistance / 2, -50]);
gate_key([0, KeyDistance / 2, -14], [0, 0, 45]);
gate_key([0, -KeyDistance / 2, -14], [0, 0, 45]);
//panel();
//NEMA17([0, KeyDistance / 2, -50]);
NEMA17([0, -KeyDistance / 2, -50]);
//gate_key([0, KeyDistance / 2, -14], [0, 0, 45]);
//gate_key([0, -KeyDistance / 2, -14], [0, 0, 45]);
difference () {
union () {
intersection () {
panel();
translate([0, -50, 0]) cube([60, 100, 150], center = true);
}
gate_key([0, -KeyDistance / 2, -13.5], [0, 0, 0]);
}
translate([50, 0, 0]) rotate([0, 0, 45]) cube([100, 250, 150], center = true);
}
}
PART = "panelx";
PART = "gate_keyx";
if (PART == "gate_key") {
gate_key();
} else if (PART == "panel") {
rotate([180, 0, 0]) panel();
} else {
difference () {
intersection () {
panel();
translate([0, -50, 0]) cube([60, 100, 150], center = true);
}
translate([50, 0, 0]) rotate([0, 0, 45]) cube([100, 250, 150], center = true);
}
debug();
}