Compare commits

...

2 Commits

9 changed files with 42042 additions and 40530 deletions

View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.68", "version": "1.8.70",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

2
app/package-lock.json generated
View File

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

View File

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

View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.68", "version": "1.8.70",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

4
package-lock.json generated
View File

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

View File

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

View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.68", "version": "1.8.70",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

View File

@ -25,7 +25,7 @@ LensRodsOffsetZ = -15;
ProjectorFrameSpacingX = (5 * IN) - 20; ProjectorFrameSpacingX = (5 * IN) - 20;
OrbitalPlateD = 136; OrbitalPlateD = 137;
module m5_nut (H = 5, DIAG = 9.1) { module m5_nut (H = 5, DIAG = 9.1) {
hex(diag = DIAG, h = H); hex(diag = DIAG, h = H);
@ -141,6 +141,7 @@ module rail_end (pos = [0, 0, 0], rot = [90, 0, 0], Motors = true, Projector = f
end_2020([RailSpacing / 2, 0, -15 + 2.4]); end_2020([RailSpacing / 2, 0, -15 + 2.4]);
} }
if (Projector) { if (Projector) {
translate(pos) rotate([rot[0] - 90, rot[1], rot[2]]) {
difference () { difference () {
union () { union () {
extrusion_block([ProjectorFrameSpacingX / 2, 0, 52], [90, 0, 0], End = true); extrusion_block([ProjectorFrameSpacingX / 2, 0, 52], [90, 0, 0], End = true);
@ -151,6 +152,7 @@ module rail_end (pos = [0, 0, 0], rot = [90, 0, 0], Motors = true, Projector = f
lens_sled_m3_bolt_voids([-ProjectorFrameSpacingX / 2, 0, 55], [90, 0, 0]); lens_sled_m3_bolt_voids([-ProjectorFrameSpacingX / 2, 0, 55], [90, 0, 0]);
} }
} }
}
} }
echo("sled"); echo("sled");
@ -524,12 +526,12 @@ module lens_frame_top_gantry (pos = [0, 0, 0], rot = [0, 0, 0]) {
module projector_orbital_brace (pos = [0, 0, 0], rot = [0, 0, 0]) { module projector_orbital_brace (pos = [0, 0, 0], rot = [0, 0, 0]) {
X = 5 * IN; X = 5 * IN;
Y = 150; Y = 160;
Z = 9; Z = 9;
PlateD = OrbitalPlateD; PlateD = OrbitalPlateD;
InnerD = 63.5; InnerD = 63.5;
M5SpacingX = 70; M5SpacingX = 70 - 18; // - 12
M5SpacingY = 123; M5SpacingY = 123 + 8.5;// + 6
M3BoltY = 20; M3BoltY = 20;
Corner = 20; Corner = 20;
VoidD = 11.25; VoidD = 11.25;
@ -599,14 +601,26 @@ module projector_orbital_brace_corner (pos = [0, 0, 0], rot = [0, 0, 0]) {
module debug () { module debug () {
//translate([50 , -90 - 10, 22]) rotate([0, 90, 0]) bearing_void(); //translate([50 , -90 - 10, 22]) rotate([0, 90, 0]) bearing_void();
//rail_end(Projector = true); rail_end([0, 20, 0], Projector = true);
//color("green") translate([(ProjectorFrameSpacingX / 2), 0, 50]) rotate([0, 0, 0]) linear_extrude(height=240) 2020_profile(); color("green") translate([(ProjectorFrameSpacingX / 2), 0, 37.25]) rotate([0, 0, 0]) linear_extrude(height=255) 2020_profile();
//color("green") translate([-(ProjectorFrameSpacingX / 2), 0, 50]) rotate([0, 0, 0]) linear_extrude(height=240) 2020_profile(); color("green") translate([-(ProjectorFrameSpacingX / 2), 0, 37.35]) rotate([0, 0, 0]) linear_extrude(height=255) 2020_profile();
//color("green") translate([-((ProjectorFrameSpacingX - 20) / 2), 0, 280]) rotate([0, 90, 0]) linear_extrude(height=ProjectorFrameSpacingX-20) 2020_profile(); echo("cross", ProjectorFrameSpacingX-20, "mm");
//projector_orbital_brace([0, 14.5, 180], [90, 0, 0]); color("green") translate([-((ProjectorFrameSpacingX - 20) / 2), 0, 282.25]) rotate([0, 90, 0]) linear_extrude(height=ProjectorFrameSpacingX-20) 2020_profile();
//translate([0, 0, 110]) cube([10, 10, 150], center = true);
//corner_bracket([30, 0, 260], [0, 180, 90]); projector_orbital_brace([0, 14.5, 180], [90, 0, 0]);
//corner_outer_bracket([55, 0, 290], [0, 180, 0]); translate ([0, 14.5, 180]) rotate([90, 0, 0]) {
projector_orbital_brace_corner([0, -105, -8], [0, 0, -90]);
//translate([35-9, -62-3.5, 0]) cylinder(r = R(5), h = 30, center = true, $fn = 60);
}
translate([0, 0, 110]) cube([10, 10, 150], center = true);
corner_bracket([30, 0, 260], [0, 180, 90]);
corner_outer_bracket([55, 10, 290], [0, 180, 0]);
corner_bracket([-30, 0, 260], [180, 0, 90]);
corner_outer_bracket([-55, 0, 290], [180, 0, 0]);
//camera_sled([0, -90, 0]); //camera_sled([0, -90, 0]);
//difference () { //difference () {
//lens_sled([0, -90, 0]); //lens_sled([0, -90, 0]);
@ -663,8 +677,8 @@ module debug () {
} }
translate([0, 0, 10]) cube([50, 30, 10], center = true); translate([0, 0, 10]) cube([50, 30, 10], center = true);
}*/ }*/
projector_orbital_brace(); //projector_orbital_brace();
projector_orbital_brace_corner([0, 0, -8]); //projector_orbital_brace_corner([0, 0, -8]);
} }

File diff suppressed because it is too large Load Diff