Merge remote-tracking branch 'origin/canon_ble' into canon_ble
This commit is contained in:
commit
f958789b20
|
@ -6,7 +6,7 @@
|
|||
"packages": {
|
||||
"": {
|
||||
"name": "mcopy-app",
|
||||
"version": "1.7.7",
|
||||
"version": "1.7.21",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue