From 0b71da8e7b34ef833cf4db9720d68d7f079821dc Mon Sep 17 00:00:00 2001 From: mattmcw Date: Tue, 27 Jun 2023 23:16:16 -0400 Subject: [PATCH] Canon BLE two-Arduino rewrite WIP --- ino/mcopy_cam_canon_ble/mcopy_cam_canon_ble.ino | 2 +- .../McopySerial.cpp | 0 .../McopySerial.h | 0 scripts/ino.sh | 2 +- src/arduino/index.ts | 4 ++-- 5 files changed, 4 insertions(+), 4 deletions(-) rename ino/{mcopy_cam_canon_ble => mcopy_cam_canon_ble_nano}/McopySerial.cpp (100%) rename ino/{mcopy_cam_canon_ble => mcopy_cam_canon_ble_nano}/McopySerial.h (100%) diff --git a/ino/mcopy_cam_canon_ble/mcopy_cam_canon_ble.ino b/ino/mcopy_cam_canon_ble/mcopy_cam_canon_ble.ino index e236a08..e78e457 100644 --- a/ino/mcopy_cam_canon_ble/mcopy_cam_canon_ble.ino +++ b/ino/mcopy_cam_canon_ble/mcopy_cam_canon_ble.ino @@ -16,7 +16,7 @@ #include "CanonBLERemote.h" #include -#include "McopySerial.h" +//#include "McopySerial.h" #define LOG_LOCAL_LEVEL ESP_LOG_INFO #include "esp_log.h" diff --git a/ino/mcopy_cam_canon_ble/McopySerial.cpp b/ino/mcopy_cam_canon_ble_nano/McopySerial.cpp similarity index 100% rename from ino/mcopy_cam_canon_ble/McopySerial.cpp rename to ino/mcopy_cam_canon_ble_nano/McopySerial.cpp diff --git a/ino/mcopy_cam_canon_ble/McopySerial.h b/ino/mcopy_cam_canon_ble_nano/McopySerial.h similarity index 100% rename from ino/mcopy_cam_canon_ble/McopySerial.h rename to ino/mcopy_cam_canon_ble_nano/McopySerial.h diff --git a/scripts/ino.sh b/scripts/ino.sh index 106f6c7..1d1b0e7 100644 --- a/scripts/ino.sh +++ b/scripts/ino.sh @@ -18,7 +18,7 @@ fi SKETCHES=( mcopy_arri_s_firmware - mcopy_cam_canon_ble + mcopy_cam_canon_ble_nano mcopy_cam_relay mcopy_JKMM100 components/mcopy_light diff --git a/src/arduino/index.ts b/src/arduino/index.ts index 98d9cec..2a9d693 100644 --- a/src/arduino/index.ts +++ b/src/arduino/index.ts @@ -101,7 +101,7 @@ class Arduino { **/ async sendAsync (device : string, cmd : string) { return new Promise ((resolve, reject) => { - console.log(`${device} -> ${cmd}`) + //this.log.info(`${device} -> ${cmd}`) this.queue[cmd] = (ms : number) => { return resolve(ms) } @@ -172,7 +172,7 @@ class Arduino { } }.bind(this), 1000) } - console.log(`${device} -> ${cmd}`) + //this.log.info(`${device} -> ${cmd}`) return this.serial[device].write(cmd, (err : any, results : any) => { if (err) { //this.log.error(err)