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

Work in progress: Serial does not work from external library

This commit is contained in:
Matt McWilliams 2023-03-20 19:45:32 -04:00
parent 77a0f7d8a0
commit 5c6b9191e5
7 changed files with 38 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ino/components/mcopy_light/McopySerial.cpp
View File

@ -2,14 +2,14 @@
#include "McopySerial.h" #include "McopySerial.h"
McopySerial::McopySerial (char identity) { McopySerial::McopySerial ( char identity) {
id = identity; id = identity;
} }
void McopySerial::begin () { void McopySerial::begin () {
Serial.begin(baud); Serial.begin(baud);
Serial.flush(); Serial.flush();
Serial.setTimeout(serialDelay); Serial.setTimeout(serialDelay);
} }
char McopySerial::loop () { char McopySerial::loop () {

4
ino/lib/McopySerial/McopySerial.cpp
View File

@ -2,14 +2,14 @@
#include "McopySerial.h" #include "McopySerial.h"
McopySerial::McopySerial (char identity) { McopySerial::McopySerial ( char identity) {
id = identity; id = identity;
} }
void McopySerial::begin () { void McopySerial::begin () {
Serial.begin(baud); Serial.begin(baud);
Serial.flush(); Serial.flush();
Serial.setTimeout(serialDelay); Serial.setTimeout(serialDelay);
} }
char McopySerial::loop () { char McopySerial::loop () {

4
ino/mcopy_JKMM100/McopySerial.cpp
View File

@ -2,14 +2,14 @@
#include "McopySerial.h" #include "McopySerial.h"
McopySerial::McopySerial (char identity) { McopySerial::McopySerial ( char identity) {
id = identity; id = identity;
} }
void McopySerial::begin () { void McopySerial::begin () {
Serial.begin(baud); Serial.begin(baud);
Serial.flush(); Serial.flush();
Serial.setTimeout(serialDelay); Serial.setTimeout(serialDelay);
} }
char McopySerial::loop () { char McopySerial::loop () {

16
ino/mcopy_JKMM100/mcopy_JKMM100.ino
View File

@ -65,6 +65,8 @@ McopySerial mc(McopySerial::PROJECTOR_IDENTIFIER);
void setup () { void setup () {
mc.begin(); mc.begin();
pins(); pins();
proj_dir = false;
cmdChar = 'p';
} }
void loop () { void loop () {
@ -73,7 +75,7 @@ void loop () {
if (proj_running) { if (proj_running) {
proj_microswitch(); proj_microswitch();
} else { } else {
cmdChar = mc.loop(); //cmdChar = mc.loop();
cmd(cmdChar); cmd(cmdChar);
} }
} }
@ -83,8 +85,8 @@ void pins () {
pinMode(PROJECTOR_FWD, OUTPUT); pinMode(PROJECTOR_FWD, OUTPUT);
pinMode(PROJECTOR_BWD, OUTPUT); pinMode(PROJECTOR_BWD, OUTPUT);
digitalWrite(PROJECTOR_FWD, LOW); digitalWrite(PROJECTOR_FWD, HIGH);
digitalWrite(PROJECTOR_BWD, LOW); digitalWrite(PROJECTOR_BWD, HIGH);
} }
void cmd (char val) { void cmd (char val) {
@ -103,9 +105,9 @@ void proj_start () {
proj_time = millis(); proj_time = millis();
if (proj_dir) { if (proj_dir) {
digitalWrite(PROJECTOR_FWD, HIGH); digitalWrite(PROJECTOR_FWD, LOW);
} else { } else {
digitalWrite(PROJECTOR_BWD, HIGH); digitalWrite(PROJECTOR_BWD, LOW);
} }
proj_running = true; proj_running = true;
@ -114,8 +116,8 @@ void proj_start () {
void proj_stop () { void proj_stop () {
//stop both directions //stop both directions
delay(10); delay(10);
digitalWrite(PROJECTOR_FWD, LOW); digitalWrite(PROJECTOR_FWD, HIGH);
digitalWrite(PROJECTOR_BWD, LOW); digitalWrite(PROJECTOR_BWD, HIGH);
mc.confirm(McopySerial::PROJECTOR); mc.confirm(McopySerial::PROJECTOR);
mc.log("projector()"); mc.log("projector()");

4
ino/mcopy_cam_canon/McopySerial.cpp
View File

@ -2,14 +2,14 @@
#include "McopySerial.h" #include "McopySerial.h"
McopySerial::McopySerial (char identity) { McopySerial::McopySerial ( char identity) {
id = identity; id = identity;
} }
void McopySerial::begin () { void McopySerial::begin () {
Serial.begin(baud); Serial.begin(baud);
Serial.flush(); Serial.flush();
Serial.setTimeout(serialDelay); Serial.setTimeout(serialDelay);
} }
char McopySerial::loop () { char McopySerial::loop () {

34
scad/jk.scad
View File

@ -1,34 +0,0 @@
/*
JK modules
Directional switch connector =
Philmore
Mobile Connector
Panel Mount 3 Pin Male/Female
No. 61-623
.625" Diameter
*/
module jk_male_connector_mount () {
$fn = 200;
D = 17;
OD = 28;
H = 25;
difference () {
union () {
cylinder(r = OD / 2, h = H, center = true);
//cube([12, 48, 3], center = true);
}
//main void
translate([0, 0, -3]) cylinder(r = (OD / 2) - 3, h = H, center = true);
//connector void
cylinder(r = D / 2, h = H * 2, center = true);
}
}
rotate([180, 0, 0]) jk_male_connector_mount();

21
scad/mcopy_projector.scad Normal file
View File

@ -0,0 +1,21 @@
include <./common/common.scad>;
PART = "debug";
module debug () {
cube();
}
module projector () {
}
module key () {
}
if (PART == "projector") {
} else {
debug();
}