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

Merge in 9 months of work on capper branch #71

Merged
mattmcw merged 95 commits from capper into main 2023-02-19 05:28:46 +00:00
Conversation 0 Commits 95 Files Changed 120 +19 -1
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3f759f5678 - Show all commits

10
app/lib/devices/index.js
View File

@ -362,6 +362,16 @@ class Devices {
return false; return false;
} }
} }
else if (type === 'capper') {
this.connected.capper = device;
try {
connectSuccess = await this.arduino.connect('capper', device, false);
}
catch (err) {
this.log.error('Error connecting capper', err);
return false;
}
}
else if (type === 'camera,capper') { else if (type === 'camera,capper') {
this.connected.camera = device; this.connected.camera = device;
this.connected.capper = device; this.connected.capper = device;

2
app/lib/devices/index.js.map
View File

File diff suppressed because one or more lines are too long

8
src/devices/index.ts
View File

@ -351,6 +351,14 @@ class Devices {
this.log.error('Error connecting to camera, camera_second, projector and projector_second', err) this.log.error('Error connecting to camera, camera_second, projector and projector_second', err)
return false return false
} }
} else if (type === 'capper') {
this.connected.capper = device
try {
connectSuccess = await this.arduino.connect('capper', device, false)
} catch (err) {
this.log.error('Error connecting capper', err)
return false
}
} else if (type === 'camera,capper') { } else if (type === 'camera,capper') {
this.connected.camera = device this.connected.camera = device
this.connected.capper = device this.connected.capper = device