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

canon_ble #82

Merged
mattmcw merged 149 commits from canon_ble into main 2023-08-01 03:38:52 +00:00
Conversation 0 Commits 149 Files Changed 138 +18
4 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e09fe7d42f - Show all commits

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

@ -8,6 +8,8 @@ McopySerial::McopySerial (char identity) {
void McopySerial::begin () { void McopySerial::begin () {
Serial.begin(baud); Serial.begin(baud);
Serial.flush();
Serial.setTimeout(serialDelay);
} }
char McopySerial::loop () { char McopySerial::loop () {
@ -52,6 +54,10 @@ void McopySerial::debug (bool state) {
debugOn = state; debugOn = state;
} }
void McopySerial::confirm (char cmd) {
Serial.println(cmd);
}
void McopySerial::log (String message) { void McopySerial::log (String message) {
if (debugOn) { if (debugOn) {
Serial.println(message); Serial.println(message);

3
ino/lib/McopySerial/McopySerial.h
View File

@ -6,6 +6,8 @@
class McopySerial { class McopySerial {
private: private:
const int serialDelay = 5;
volatile int baud = 57600; volatile int baud = 57600;
volatile bool debugOn = false; volatile bool debugOn = false;
volatile char cmdChar = 'z'; volatile char cmdChar = 'z';
@ -67,6 +69,7 @@ class McopySerial {
void setBaud(int baudRate); void setBaud(int baudRate);
void setIdentity(char identity); void setIdentity(char identity);
char loop(); char loop();
void confirm(char cmd);
void debug (bool state); void debug (bool state);
void log (String message); void log (String message);

6
ino/mcopy_cam_canon/McopySerial.cpp
View File

@ -8,6 +8,8 @@ McopySerial::McopySerial (char identity) {
void McopySerial::begin () { void McopySerial::begin () {
Serial.begin(baud); Serial.begin(baud);
Serial.flush();
Serial.setTimeout(serialDelay);
} }
char McopySerial::loop () { char McopySerial::loop () {
@ -52,6 +54,10 @@ void McopySerial::debug (bool state) {
debugOn = state; debugOn = state;
} }
void McopySerial::confirm (char cmd) {
Serial.println(cmd);
}
void McopySerial::log (String message) { void McopySerial::log (String message) {
if (debugOn) { if (debugOn) {
Serial.println(message); Serial.println(message);

3
ino/mcopy_cam_canon/McopySerial.h
View File

@ -6,6 +6,8 @@
class McopySerial { class McopySerial {
private: private:
const int serialDelay = 5;
volatile int baud = 57600; volatile int baud = 57600;
volatile bool debugOn = false; volatile bool debugOn = false;
volatile char cmdChar = 'z'; volatile char cmdChar = 'z';
@ -67,6 +69,7 @@ class McopySerial {
void setBaud(int baudRate); void setBaud(int baudRate);
void setIdentity(char identity); void setIdentity(char identity);
char loop(); char loop();
void confirm(char cmd);
void debug (bool state); void debug (bool state);
void log (String message); void log (String message);