From 6d379d284baf1a2d9f1b8dc00f1e1c2a2d906d4c Mon Sep 17 00:00:00 2001 From: Matthew McWilliams Date: Sat, 1 Jul 2023 16:34:07 -0400 Subject: [PATCH] on site work at MONO --- app/package-lock.json | 2 +- .../mcopy_mono_firmware_projectors.ino | 2 +- .../mcopy_mono_firmware_projectors_secondary.ino | 6 +++--- scad/mcopy_projector.scad | 9 ++++++--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/package-lock.json b/app/package-lock.json index 03b2312..16f856b 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "mcopy-app", - "version": "1.7.7", + "version": "1.7.21", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/ino/mcopy_mono_firmware_projectors/mcopy_mono_firmware_projectors.ino b/ino/mcopy_mono_firmware_projectors/mcopy_mono_firmware_projectors.ino index 90637c6..d9f6bdb 100644 --- a/ino/mcopy_mono_firmware_projectors/mcopy_mono_firmware_projectors.ino +++ b/ino/mcopy_mono_firmware_projectors/mcopy_mono_firmware_projectors.ino @@ -58,7 +58,7 @@ 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 = 't'; //dual projector identifier const int serialDelay = 5; diff --git a/ino/mcopy_mono_firmware_projectors_secondary/mcopy_mono_firmware_projectors_secondary.ino b/ino/mcopy_mono_firmware_projectors_secondary/mcopy_mono_firmware_projectors_secondary.ino index df9d046..f7495cc 100644 --- a/ino/mcopy_mono_firmware_projectors_secondary/mcopy_mono_firmware_projectors_secondary.ino +++ b/ino/mcopy_mono_firmware_projectors_secondary/mcopy_mono_firmware_projectors_secondary.ino @@ -19,9 +19,9 @@ boolean debug_state = false; -const int proj_fwd_pin = 12; -const int proj_bwd_pin = 11; -const int proj_pin = 10; +const int proj_fwd_pin = 6; +const int proj_bwd_pin = 5; +const int proj_pin = 4; const int proj_momentary = 60; const int proj_time = 950; //secondary projector speed diff --git a/scad/mcopy_projector.scad b/scad/mcopy_projector.scad index 5da81b2..88ddd08 100644 --- a/scad/mcopy_projector.scad +++ b/scad/mcopy_projector.scad @@ -260,7 +260,7 @@ module projector () { } -PART = "panel"; +PART = "panelx"; if (PART == "gate_key") { gate_key(); @@ -268,7 +268,10 @@ if (PART == "gate_key") { rotate([180, 0, 0]) panel(); } else { difference () { - debug(); - translate([45-15, 0, 0]) cube([89, 200, 150], center = true); + 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); } } \ No newline at end of file