diff --git a/app/data/cfg.json b/app/data/cfg.json index 8666b43..bc5fd0b 100644 --- a/app/data/cfg.json +++ b/app/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.12", + "version": "1.8.13", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/app/package-lock.json b/app/package-lock.json index c346c6d..3b00b6b 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.12", + "version": "1.8.13", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/app/package.json b/app/package.json index 3410a8e..698f133 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "mcopy-app", - "version": "1.8.12", + "version": "1.8.13", "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 8666b43..bc5fd0b 100644 --- a/data/cfg.json +++ b/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.12", + "version": "1.8.13", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/package-lock.json b/package-lock.json index 02ff7be..ae535dd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mcopy", - "version": "1.8.12", + "version": "1.8.13", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mcopy", - "version": "1.8.12", + "version": "1.8.13", "license": "MIT", "dependencies": { "arduino": "file:app/lib/arduino", diff --git a/package.json b/package.json index ed75898..98593d7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mcopy", - "version": "1.8.12", + "version": "1.8.13", "description": "Small gauge film optical printer platform", "main": "build.js", "directories": { diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json index 8666b43..bc5fd0b 100644 --- a/processing/mcopy/cfg.json +++ b/processing/mcopy/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.8.12", + "version": "1.8.13", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/scad/mcopy_rails.scad b/scad/mcopy_rails.scad index 3127d32..8797b30 100644 --- a/scad/mcopy_rails.scad +++ b/scad/mcopy_rails.scad @@ -32,8 +32,8 @@ module m3_bolt_void (pos = [0, 0, 0], BoltH = 20, CapH = 3) { } } -module bolt_voids_2020 (pos = [0, 0, 0]) { - translate(pos) { +module bolt_voids_2020 (pos = [0, 0, 0], rot = [0, 0, 0]) { + translate(pos) rotate (rot) { //translate([0, -25, 0]) rotate([90, 0, 0]) m3_bolt_void(CapH = 6); translate([0, 20, 0]) rotate([-90, 0, 0]) m3_bolt_void(CapH = 20); translate([-16, 0, 0]) rotate([0, -90, 0]) m3_bolt_void(CapH = 6, BoltH = 10); @@ -94,8 +94,8 @@ module rail_end (pos = [0, 0, 0], rot = [90, 0, 0], Motors = true) { translate([RailSpacing / 2, 0, 5]) cube([RailVoid, RailVoid, 40], center = true); //rails bolts - bolt_voids_2020([-RailSpacing / 2, 0, -15 + 5 + 6 ]); - rotate([0, 180, 0]) bolt_voids_2020([-RailSpacing / 2, 0, -15 + 5 + 6]); + bolt_voids_2020([-RailSpacing / 2, 0, -15 + 5 + 7 ]); + bolt_voids_2020([RailSpacing / 2, 0, -15 + 5 + 7], [0, 180, 0]); if (Motors) { //camera drive motor @@ -110,8 +110,8 @@ module rail_end (pos = [0, 0, 0], rot = [90, 0, 0], Motors = true) { bolt_voids_motor([0, 0, 16 - 21]); } } else { - translate([-ThreadedRodSpacing / 2, 0, 0]) cylinder(r = R(LinearBearingOuterDiameter + 0.5), h = 60, center = true, $fn = 100); - translate([-ThreadedRodSpacing / 2, 0, 0]) cylinder(r = R(LinearBearingOuterDiameter + 0.5), h = 60, center = true, $fn = 100); + translate([ThreadedRodSpacing / 2, 0, 0]) cylinder(r = R(LinearBearingOuterDiameter + 0.4), h = 60, center = true, $fn = 100); + translate([-ThreadedRodSpacing / 2, 0, 0]) cylinder(r = R(LinearBearingOuterDiameter + 0.4), h = 60, center = true, $fn = 100); } //linear motion rod @@ -293,10 +293,12 @@ module debug () { } -PART = "bearing_rollerx"; +PART = "rail_end"; if (PART == "rail_end") { rail_end(); +} else if (PART == "rail_end_idle") { + rail_end(Motors = false); } else if (PART == "lens_sled") { lens_sled(); } else if (PART == "bearing_roller") { diff --git a/scripts/openscadPart.sh b/scripts/openscadPart.sh index 68579fd..4962827 100644 --- a/scripts/openscadPart.sh +++ b/scripts/openscadPart.sh @@ -1,6 +1,6 @@ #!/bin/bash -openscad -o "./stl/${3}" -D"PART=\"${2}\"" "./scad/${1}" +openscad --enable=fast-csg -o "./stl/${3}" -D"PART=\"${2}\"" "./scad/${1}" echo "Compiled ${3} from ${1}" if [ -f "./scad/common/c14n_stl.py" ]; then python3 ./scad/common/c14n_stl.py "./stl/${3}"