Compare commits

...

4 Commits

11 changed files with 27 additions and 18 deletions

View File

@ -1,5 +1,5 @@
{
"version": "1.8.77",
"version": "1.8.81",
"ext_port": 1111,
"profiles": {
"mcopy": {

2
app/package-lock.json generated
View File

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

View File

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

View File

@ -1,5 +1,5 @@
{
"version": "1.8.77",
"version": "1.8.81",
"ext_port": 1111,
"profiles": {
"mcopy": {

View File

@ -15,6 +15,10 @@
* - controls the directional relays of the primary projector.
* 07 - CH8 - 4 pronged trigger cable
* - triggers the primary projectory
*
* Pins - 4CH Sainsmart Solid State Relay Board
* 06 - CH1 - FWD PROJ2
* 05 - CH2 - FWD PROJ2
*/
boolean debug_state = false;
@ -30,7 +34,7 @@ const int proj_second_fwd_pin = 6;
const int proj_second_bwd_pin = 5;
const int proj_second_pin = 4;
const int proj_momentary = 60;
const int proj_momentary = 90;
const int proj_time = 950; //secondary projector speed
const int proj_delay = 42;
@ -58,7 +62,8 @@ const char cmd_debug = 'd';
const char cmd_connect = 'i';
volatile char cmd_char = 'z';
const char cmd_mcopy_identifier = 'm';
const char cmd_proj_identifier = 'd'; //dual projector identifier
const char cmd_proj_identifier = 'x'; //dual projector identifier
//const char cmd_proj_identifier = 'j'; //single projector identifier
const int serialDelay = 5;

4
package-lock.json generated
View File

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

View File

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

View File

@ -1,5 +1,5 @@
{
"version": "1.8.77",
"version": "1.8.81",
"ext_port": 1111,
"profiles": {
"mcopy": {

View File

@ -4,21 +4,21 @@
include <./common/common.scad>;
PART="9pin_socket";
PART="9pin_plugx";
FN = 120;
PlugD = 15.75;
PlugD = 16.15 - 0.6;
PlugH = 11.65;
PlugGuideD = 17;
PlugGuideD = 17 - 0.6;
PlugPinD = 3.1;
PlugGuideRetraction = 1.25;
PinSpacing = 3.85;
SocketD = PlugD + 0.4;
SocketGuideD = PlugGuideD + 0.5;
SocketD = 16.15;
SocketGuideD = 17.5;
SocketOuterD = 20;
SocketH = 10.5;

View File

@ -563,15 +563,17 @@ module bearing_roller (pos = [0, 0, 0], rot = [0, 0, 0]) {
}
}
module bearing_roller_inner (pos = [0, 0, 0], rot = [0, 0, 0]) {
module bearing_roller_inner (pos = [0, 0, 0], rot = [0, 0, 0], Solid = false) {
translate(pos) rotate(rot) difference () {
union () {
cylinder(r = R(7.8), h = 15, center = true, $fn = 60);
translate([0, 0, 4.5]) cylinder(r = R(11), h = 1, center = true, $fn = 80);
}
if (!Solid) {
cylinder(r = R(5.25), h = 20 + 1, center = true, $fn = 60);
}
}
}
module corner_bracket (pos = [0, 0, 0], rot = [0, 0, 0]) {
W = 19;
@ -904,7 +906,7 @@ module rail_sizing (L = 1000) {
}
PART = "camera_sled_bolexx";
PART = "bearing_roller_inner_solid";
if (PART == "rail_end") {
rail_end(Projector = true);
@ -920,6 +922,8 @@ if (PART == "rail_end") {
bearing_roller();
} else if (PART == "bearing_roller_inner") {
rotate([180, 0, 0]) bearing_roller_inner();
} else if (PART == "bearing_roller_inner_solid") {
rotate([180, 0, 0]) bearing_roller_inner(Solid = true);
} else if (PART == "side_lens_sled_bearing_plate") {
rotate([0, 90, 0]) side_lens_sled_bearing_plate();
} else if (PART == "corner_bracket") {