Compare commits

...

2 Commits

13 changed files with 49 additions and 5 deletions

View File

@ -32,11 +32,13 @@ void McopySerial::_internal () {
} }
void McopySerial::_connect () { void McopySerial::_connect () {
connected = true;
Serial.println(CONNECT); Serial.println(CONNECT);
log("connect()"); log("connect()");
} }
void McopySerial::_identify () { void McopySerial::_identify () {
identified = true;
Serial.println(id); Serial.println(id);
log("identify()"); log("identify()");
} }

View File

@ -20,6 +20,9 @@ class McopySerial {
public: public:
volatile bool connected = false;
volatile bool identified = false;
/* CMD FLAGS */ /* CMD FLAGS */
const char BLACK = 'b'; const char BLACK = 'b';
const char CAMERA = 'c'; const char CAMERA = 'c';

View File

@ -32,11 +32,13 @@ void McopySerial::_internal () {
} }
void McopySerial::_connect () { void McopySerial::_connect () {
connected = true;
Serial.println(CONNECT); Serial.println(CONNECT);
log("connect()"); log("connect()");
} }
void McopySerial::_identify () { void McopySerial::_identify () {
identified = true;
Serial.println(id); Serial.println(id);
log("identify()"); log("identify()");
} }

View File

@ -20,6 +20,9 @@ class McopySerial {
public: public:
volatile bool connected = false;
volatile bool identified = false;
/* CMD FLAGS */ /* CMD FLAGS */
const char BLACK = 'b'; const char BLACK = 'b';
const char CAMERA = 'c'; const char CAMERA = 'c';

View File

@ -32,11 +32,13 @@ void McopySerial::_internal () {
} }
void McopySerial::_connect () { void McopySerial::_connect () {
connected = true;
Serial.println(CONNECT); Serial.println(CONNECT);
log("connect()"); log("connect()");
} }
void McopySerial::_identify () { void McopySerial::_identify () {
identified = true;
Serial.println(id); Serial.println(id);
log("identify()"); log("identify()");
} }

View File

@ -20,6 +20,9 @@ class McopySerial {
public: public:
volatile bool connected = false;
volatile bool identified = false;
/* CMD FLAGS */ /* CMD FLAGS */
const char BLACK = 'b'; const char BLACK = 'b';
const char CAMERA = 'c'; const char CAMERA = 'c';

View File

@ -32,11 +32,13 @@ void McopySerial::_internal () {
} }
void McopySerial::_connect () { void McopySerial::_connect () {
connected = true;
Serial.println(CONNECT); Serial.println(CONNECT);
log("connect()"); log("connect()");
} }
void McopySerial::_identify () { void McopySerial::_identify () {
identified = true;
Serial.println(id); Serial.println(id);
log("identify()"); log("identify()");
} }

View File

@ -20,6 +20,9 @@ class McopySerial {
public: public:
volatile bool connected = false;
volatile bool identified = false;
/* CMD FLAGS */ /* CMD FLAGS */
const char BLACK = 'b'; const char BLACK = 'b';
const char CAMERA = 'c'; const char CAMERA = 'c';

View File

@ -32,11 +32,13 @@ void McopySerial::_internal () {
} }
void McopySerial::_connect () { void McopySerial::_connect () {
connected = true;
Serial.println(CONNECT); Serial.println(CONNECT);
log("connect()"); log("connect()");
} }
void McopySerial::_identify () { void McopySerial::_identify () {
identified = true;
Serial.println(id); Serial.println(id);
log("identify()"); log("identify()");
} }

View File

@ -20,6 +20,9 @@ class McopySerial {
public: public:
volatile bool connected = false;
volatile bool identified = false;
/* CMD FLAGS */ /* CMD FLAGS */
const char BLACK = 'b'; const char BLACK = 'b';
const char CAMERA = 'c'; const char CAMERA = 'c';

View File

@ -34,6 +34,7 @@ CanonBLERemote canon_ble(name_remote);
McopySerial mc; McopySerial mc;
volatile boolean connected = false; volatile boolean connected = false;
volatile boolean bleInit = false;
volatile long now; volatile long now;
volatile long last = -1; volatile long last = -1;
@ -44,13 +45,18 @@ volatile char cmdChar = 'z';
void setup() void setup()
{ {
esp_log_level_set("*", ESP_LOG_INFO); esp_log_level_set("*", ESP_LOG_NONE);
pins(); pins();
mc.begin(mc.CAMERA_IDENTIFIER); mc.begin(mc.CAMERA_IDENTIFIER);
canon_ble.init();
delay(1000); digitalWrite(RED_LED, HIGH);
digitalWrite(GREEN_LED, HIGH);
delay(42);
digitalWrite(RED_LED, LOW);
digitalWrite(GREEN_LED, LOW);
} }
void pins () { void pins () {
@ -88,7 +94,7 @@ void loop()
cmd(cmdChar); cmd(cmdChar);
// Shutter // Shutter
if (digitalRead(SHUTTTER_BTN) == LOW && last + 1000 < now){ if (digitalRead(SHUTTTER_BTN) == LOW && connected){
camera(); camera();
} }
@ -96,7 +102,15 @@ void loop()
connected = false; connected = false;
} }
if (!connected) { if (!bleInit && mc.connected && mc.identified) {
mc.log("Initializing BLE...");
canon_ble.init();
bleInit = true;
delay(1000);
}
if (!connected && mc.connected && mc.identified) {
mc.log("Connecting BLE...");
connectBLE(); connectBLE();
} }
} }

View File

@ -32,11 +32,13 @@ void McopySerial::_internal () {
} }
void McopySerial::_connect () { void McopySerial::_connect () {
connected = true;
Serial.println(CONNECT); Serial.println(CONNECT);
log("connect()"); log("connect()");
} }
void McopySerial::_identify () { void McopySerial::_identify () {
identified = true;
Serial.println(id); Serial.println(id);
log("identify()"); log("identify()");
} }

View File

@ -20,6 +20,9 @@ class McopySerial {
public: public:
volatile bool connected = false;
volatile bool identified = false;
/* CMD FLAGS */ /* CMD FLAGS */
const char BLACK = 'b'; const char BLACK = 'b';
const char CAMERA = 'c'; const char CAMERA = 'c';