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 +4 -4
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0b71da8e7b - Show all commits

2
ino/mcopy_cam_canon_ble/mcopy_cam_canon_ble.ino
View File

@ -16,7 +16,7 @@
#include "CanonBLERemote.h" #include "CanonBLERemote.h"
#include <Arduino.h> #include <Arduino.h>
#include "McopySerial.h" //#include "McopySerial.h"
#define LOG_LOCAL_LEVEL ESP_LOG_INFO #define LOG_LOCAL_LEVEL ESP_LOG_INFO
#include "esp_log.h" #include "esp_log.h"

0
ino/mcopy_cam_canon_ble/McopySerial.cpp → ino/mcopy_cam_canon_ble_nano/McopySerial.cpp
View File

0
ino/mcopy_cam_canon_ble/McopySerial.h → ino/mcopy_cam_canon_ble_nano/McopySerial.h
View File

2
scripts/ino.sh
View File

@ -18,7 +18,7 @@ fi
SKETCHES=( SKETCHES=(
mcopy_arri_s_firmware mcopy_arri_s_firmware
mcopy_cam_canon_ble mcopy_cam_canon_ble_nano
mcopy_cam_relay mcopy_cam_relay
mcopy_JKMM100 mcopy_JKMM100
components/mcopy_light components/mcopy_light

4
src/arduino/index.ts
View File

@ -101,7 +101,7 @@ class Arduino {
**/ **/
async sendAsync (device : string, cmd : string) { async sendAsync (device : string, cmd : string) {
return new Promise ((resolve, reject) => { return new Promise ((resolve, reject) => {
console.log(`${device} -> ${cmd}`) //this.log.info(`${device} -> ${cmd}`)
this.queue[cmd] = (ms : number) => { this.queue[cmd] = (ms : number) => {
return resolve(ms) return resolve(ms)
} }
@ -172,7 +172,7 @@ class Arduino {
} }
}.bind(this), 1000) }.bind(this), 1000)
} }
console.log(`${device} -> ${cmd}`) //this.log.info(`${device} -> ${cmd}`)
return this.serial[device].write(cmd, (err : any, results : any) => { return this.serial[device].write(cmd, (err : any, results : any) => {
if (err) { if (err) {
//this.log.error(err) //this.log.error(err)