16mm
/
mcopy
1
0
Fork 0
Code Issues 15 Pull Requests Projects 2 Releases 13 Wiki Activity

Merge remote-tracking branch 'origin/canon_ble' into canon_ble

This commit is contained in:
Matt McWilliams 2023-07-02 13:56:11 -04:00
parent 4beef04a3f 6d379d284b
commit f958789b20
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/package-lock.json generated
View File

@ -6,7 +6,7 @@
"packages": { "packages": {
"": { "": {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.7.7", "version": "1.7.21",
"hasInstallScript": true, "hasInstallScript": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {

2
ino/mcopy_mono_firmware_projectors/mcopy_mono_firmware_projectors.ino
View File

@ -58,7 +58,7 @@ const char cmd_debug = 'd';
const char cmd_connect = 'i'; const char cmd_connect = 'i';
volatile char cmd_char = 'z'; volatile char cmd_char = 'z';
const char cmd_mcopy_identifier = 'm'; 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; const int serialDelay = 5;

6
ino/mcopy_mono_firmware_projectors_secondary/mcopy_mono_firmware_projectors_secondary.ino
View File

@ -19,9 +19,9 @@
boolean debug_state = false; boolean debug_state = false;
const int proj_fwd_pin = 12; const int proj_fwd_pin = 6;
const int proj_bwd_pin = 11; const int proj_bwd_pin = 5;
const int proj_pin = 10; const int proj_pin = 4;
const int proj_momentary = 60; const int proj_momentary = 60;
const int proj_time = 950; //secondary projector speed const int proj_time = 950; //secondary projector speed

9
scad/mcopy_projector.scad
View File

@ -260,7 +260,7 @@ module projector () {
} }
PART = "panel"; PART = "panelx";
if (PART == "gate_key") { if (PART == "gate_key") {
gate_key(); gate_key();
@ -268,7 +268,10 @@ if (PART == "gate_key") {
rotate([180, 0, 0]) panel(); rotate([180, 0, 0]) panel();
} else { } else {
difference () { difference () {
debug(); intersection () {
translate([45-15, 0, 0]) cube([89, 200, 150], center = true); 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);
} }
} }