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

Merge branch 'capper' of git.sixteenmillimeter.com:16mm/mcopy into capper

This commit is contained in:
Matt McWilliams 2022-05-31 17:44:56 -04:00
parent 17d4ff459f c15c376a2f
commit 96e0ce6050
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/cfg.json
View File

@ -178,7 +178,10 @@
"cameras": "4", "cameras": "4",
"camera_projectors_identifier": "5", "camera_projectors_identifier": "5",
"cameras_projector_identifier": "6", "cameras_projector_identifier": "6",
"cameras_projectors_identifier": "7" "cameras_projectors_identifier": "7",
"camera_capper_identifier" : "8",
"camera_capper_projector_identifier" : "9",
"camera_capper_projectors_identifier" : "0"
} }
} }
} }

11
src/arduino/index.ts
View File

@ -252,7 +252,10 @@ class Arduino {
|| data === cfg.arduino.cmd.camera_second_forward || data === cfg.arduino.cmd.camera_second_forward
|| data === cfg.arduino.cmd.camera_second_backward || data === cfg.arduino.cmd.camera_second_backward
|| data === cfg.arduino.cmd.camera_second || data === cfg.arduino.cmd.camera_second
|| data === cfg.arduino.cmd.cameras) { || data === cfg.arduino.cmd.cameras
|| data === cfg.arduino.cmd.camera_capper_identifier
|| data === cfg.arduino.cmd.camera_capper_projector_identifier
|| data === cfg.arduino.cmd.camera_capper_projectors_identifier) {
this.confirmExec(null, data); this.confirmExec(null, data);
this.confirmExec = {}; this.confirmExec = {};
@ -314,6 +317,12 @@ class Arduino {
type = 'camera,camera_second,projector' type = 'camera,camera_second,projector'
} else if (data === cfg.arduino.cmd.cameras_projectors_identifier) { } else if (data === cfg.arduino.cmd.cameras_projectors_identifier) {
type = 'camera,camera_second,projector,projector_second' type = 'camera,camera_second,projector,projector_second'
} else if (data === cfg.arduino.cmd.camera_capper_identifier) {
type = 'camera,capper'
} else if (data === cfg.arduino.cmd.camera_capper_projector_identifier) {
type = 'camera,capper,projector'
} else if (data === cfg.arduino.cmd.camera_capper_projectors_identifier) {
type = 'camera,capper,projector,projector_second'
} }
return resolve(type) return resolve(type)
} }

2
src/devices/index.ts
View File

@ -419,7 +419,7 @@ class Devices {
}) })
if (match.length === 0) { if (match.length === 0) {
deviceEntry = { deviceEntry = {
type : type type
} }
deviceEntry[which] = device deviceEntry[which] = device
this.settings.state.devices.push(deviceEntry) this.settings.state.devices.push(deviceEntry)