Work on neopixel light.

Thanks Tom!

.gitignore

@@ -3,4 +3,14 @@
 *.Parent
 
 node_modules
-dist
+dist
+
+*.svd
+*debug_custom.json
+*debug.cfg
+
+notes/mphd
+
+./lib
+
+./debug

.gitmodules

@@ -0,0 +1,17 @@
+[submodule "scad/common"]
+	path = scad/common
+	url = https://git.sixteenmillimeter.com/modules/common.git
+	ignore = dirty
+[submodule "scad/takeup"]
+	path = scad/takeup
+	url = https://git.sixteenmillimeter.com/modules/takeup.git
+	ignore = dirty
+[submodule "scad/sprocketed_roller"]
+	path = scad/sprocketed_roller
+	url = https://git.sixteenmillimeter.com/modules/sprocketed_roller.git
+	ignore = dirty
+[submodule "scad/MCAD"]
+	path = scad/MCAD
+	url = https://github.com/openscad/MCAD.git
+	branch = master
+	ignore = dirty

Readme.md

@@ -1,85 +1,93 @@
-# mcopy
-
-An open platform for controlling small-gauge film optical printers (16mm, Super8, 8mm).
-
--------
-1. <a href="#intro">Introduction</a>
-2. <a href="#downloads">Downloads</a>
-1. <a href="#usage">Usage</a>
-2. <a href="#software">Software</a>
-3. <a href="#firmware">Firmware</a>
-3. <a href="#hardware">Hardware</a>
-4. <a href="#why">Why?</a>
-
--------
-
-## Introduction <a name="intro"></a>
-
-The `mcopy` project is comprised of software and hardware for optical printers, built with re-purposed broken projectors.
-
-#### Components
-
-* Sequencer desktop app
-* Scripting language, called `mscript`, for orchestrating complex sequences
-* Arduino firmware for projectors, cameras, lights and existing printers
-* 3D models of parts used for modifying projectors and printers
-* Schematics for simple Arduino-based electronics
-* Filmout feature for digitally transferring video and images to analog film
-* Interoperability with the [intval3](https://github.com/sixteenmillimeter/intval3) intervalometer
-
-## Downloads <a name="downloads"></a>
-
-### Latest Installers
-* [1.6.2](https://github.com/sixteenmillimeter/mcopy/releases/tag/1.6.2) for macOS, Linux (.deb) and Windows (.msi)
-
-
-### Older Versions
-* [1.6.1](https://github.com/sixteenmillimeter/mcopy/releases/tag/1.6.1) for macOS
-* [1.5.2](https://github.com/sixteenmillimeter/mcopy/releases/tag/1.5.2) for macOS
-* [1.4.9](https://github.com/sixteenmillimeter/mcopy/releases/tag/1.4.9) for macOS and Linux (.deb)
-* [1.2.0](https://github.com/sixteenmillimeter/mcopy/releases/tag/1.2.0) for macOS and Linux (.deb)
-* [1.0.3](https://github.com/sixteenmillimeter/mcopy/releases/tag/1.0.3) for macOS and Linux (.deb)
-
-For Windows, you can [install from source](https://github.com/sixteenmillimeter/mcopy/tree/master/app#mcopy-desktop-app) for now.
-
-## Usage <a name="usage"></a>
-
-The software requires your hardware to be in place before the mcopy control app is useful.
-
-![mcopy app](docs/mcopy.png?raw=true "mcopy app")
-
-## Software <a name="software"></a>
-
-The mcopy desktop app is an Electron-based project which can be built for Linux, Windows and macOS.
-Pre-built packages will be made available for macOS, initially, with the other two target platforms to follow.
-To build the desktop app from source, see the [installation and running instructions](https://github.com/sixteenmillimeter/mcopy/tree/master/app#mcopy-desktop-app).
-The desktop software also interoperates with two related projects; the Bluetooth + Wifi capable, Raspberry Pi-based [INTVAL3](https://github.com/sixteenmillimeter/intval3) and the Arduino-based [intval2](https://github.com/sixteenmillimeter/intval2).
-
-## Firmware <a name="firmware"></a>
-
-This project contains Arduino formware for controlling: 
-
-* a projector
-* a camera (see [intval2](https://github.com/sixteenmillimeter/intval2) for more info)
-* a light
-* a projector + a camera
-* a projector + a light
-* a camera + a light
-* a camera + a projector + a light
-
-Using a simple serial interface, this modular platform can be used to control DIY components, modified existing optical printers or a mixture of components.
-The desktop app can connect to multiple serial devices, so your mcopy optical printer can be built from various designs that suit your hardware tastes/needs/available parts.
-
-
-## Hardware <a name="hardware"></a>
-
-All non-electronic hardware for this project is available as plaintext OpenSCAD files and 3D print-able .STL files. 
-The hardware component of this project is aimed at modifying broken Bell & Howell projectors into USB serial-controlled projectors to be used in optical printing.
-
-As a secondary capability, this desktop software and firmware package can be used to replace the sequencers for early-model JK optical printers, with some modification.
-
-
-## Why? <a name="why"></a>
-
-I'm interested in expanding the viability and access of the 16mm film format and to repurpose thre rising tide of discarded film technology.
-
+# mcopy
+
+An open platform for controlling small-gauge film optical printers (16mm, Super8, 8mm).
+
+## [Project Home - git.sixteenmillimeter.com/16mm/mcopy](https://git.sixteenmillimeter.com/16mm/mcopy)
+
+* Github Mirror - [github.com/sixteenmillimeter/mcopy](https://github.com/sixteenmillimeter/mcopy)
+* Gitlab Mirror - [gitlab.com/16mm/mcopy](https://gitlab.com/16mm/mcopy)
+
+-------
+1. <a href="#intro">Introduction</a>
+2. <a href="#downloads">Downloads</a>
+1. <a href="#usage">Usage</a>
+2. <a href="#software">Software</a>
+3. <a href="#firmware">Firmware</a>
+3. <a href="#hardware">Hardware</a>
+4. <a href="#why">Why?</a>
+
+-------
+
+## Introduction <a name="intro"></a>
+
+The `mcopy` project is comprised of software and hardware for optical printers, built with re-purposed broken projectors.
+
+#### Components
+
+* Sequencer desktop app
+* Scripting language, called `mscript`, for orchestrating complex sequences
+* Arduino firmware for projectors, cameras, lights and existing printers
+* 3D models of parts used for modifying projectors and printers
+* Schematics for simple Arduino-based electronics
+* Filmout feature for digitally transferring video and images to analog film
+* Interoperability with the [intval3](https://github.com/sixteenmillimeter/intval3) intervalometer
+
+## Downloads <a name="downloads"></a>
+
+### Latest Installers
+
+* [1.6.9](https://github.com/sixteenmillimeter/mcopy/releases/tag/1.6.9) for macOS, Linux (.deb) and Windows (.msi)
+
+### Older Versions
+* [1.6.7](https://github.com/sixteenmillimeter/mcopy/releases/tag/1.6.7) for macOS and Linux (.deb)
+* [1.6.4](https://github.com/sixteenmillimeter/mcopy/releases/tag/1.6.4) for macOS, Linux (.deb) and Windows (.msi)
+* [1.6.2](https://github.com/sixteenmillimeter/mcopy/releases/tag/1.6.2) for macOS
+* [1.6.1](https://github.com/sixteenmillimeter/mcopy/releases/tag/1.6.1) for macOS
+* [1.5.2](https://github.com/sixteenmillimeter/mcopy/releases/tag/1.5.2) for macOS
+* [1.4.9](https://github.com/sixteenmillimeter/mcopy/releases/tag/1.4.9) for macOS and Linux (.deb)
+* [1.2.0](https://github.com/sixteenmillimeter/mcopy/releases/tag/1.2.0) for macOS and Linux (.deb)
+* [1.0.3](https://github.com/sixteenmillimeter/mcopy/releases/tag/1.0.3) for macOS and Linux (.deb)
+
+For Windows, you can [install from source](https://github.com/sixteenmillimeter/mcopy/tree/master/app#mcopy-desktop-app) for now.
+
+## Usage <a name="usage"></a>
+
+The software requires your hardware to be in place before the mcopy control app is useful.
+
+![mcopy app](docs/mcopy.png?raw=true "mcopy app")
+
+## Software <a name="software"></a>
+
+The mcopy desktop app is an Electron-based project which can be built for Linux, Windows and macOS.
+Pre-built packages will be made available for macOS, initially, with the other two target platforms to follow.
+To build the desktop app from source, see the [installation and running instructions](https://github.com/sixteenmillimeter/mcopy/tree/master/app#mcopy-desktop-app).
+The desktop software also interoperates with two related projects; the Bluetooth + Wifi capable, Raspberry Pi-based [INTVAL3](https://github.com/sixteenmillimeter/intval3) and the Arduino-based [intval2](https://github.com/sixteenmillimeter/intval2).
+
+## Firmware <a name="firmware"></a>
+
+This project contains Arduino formware for controlling: 
+
+* a projector
+* a camera (see [intval2](https://github.com/sixteenmillimeter/intval2) for more info)
+* a light
+* a projector + a camera
+* a projector + a light
+* a camera + a light
+* a camera + a projector + a light
+
+Using a simple serial interface, this modular platform can be used to control DIY components, modified existing optical printers or a mixture of components.
+The desktop app can connect to multiple serial devices, so your mcopy optical printer can be built from various designs that suit your hardware tastes/needs/available parts.
+
+
+## Hardware <a name="hardware"></a>
+
+All non-electronic hardware for this project is available as plaintext OpenSCAD files and 3D print-able .STL files. 
+The hardware component of this project is aimed at modifying broken Bell & Howell projectors into USB serial-controlled projectors to be used in optical printing.
+
+As a secondary capability, this desktop software and firmware package can be used to replace the sequencers for early-model JK optical printers, with some modification.
+
+
+## Why? <a name="why"></a>
+
+I'm interested in expanding the viability and access of the 16mm film format and to repurpose thre rising tide of discarded film technology.
+

app/.gitignore

@@ -1,3 +1,6 @@
 node_modules/*
 logs/*
-data/transfer*.json
+data/transfer*.json
+.appleId*
+.applePwd*
+.appleIdentity*

app/css/app.css

@@ -194,8 +194,8 @@ button:focus {
   width: 66px;
   height: 66px;
   position: absolute;
-  top: 7px;
-  left: 7px;
+  top: 14px / 2;
+  left: 14px / 2;
 }
 .dial-wrapper input {
   margin-top: 94px;
@@ -210,10 +210,10 @@ button:focus {
   top: 0;
   bottom: 0;
   overflow: hidden;
-  width: 40px;
+  width: 80px / 2;
 }
 .dial-container.dial-container1 {
-  left: 40px;
+  left: 80px / 2;
 }
 .dial-container.dial-container1 .dial-wedge {
   transform: rotateZ(0deg);
@@ -227,16 +227,16 @@ button:focus {
 .dial-container.dial-container2 .dial-wedge {
   transform: rotateZ(0deg);
   border-radius: 80px 0 0 80px;
-  transform-origin: 40px 40px;
+  transform-origin: 80px/2 80px/2;
 }
 .dial-wedge {
   height: 80px;
-  width: 40px;
+  width: 80px / 2;
 }
 .dial-marker {
   border-radius: 50%;
-  height: 7px;
-  width: 7px;
+  height: 14px / 2;
+  width: 14px / 2;
   position: absolute;
   top: 0;
   left: calc(50% - (14px * 2));
@@ -367,6 +367,7 @@ button:focus {
   float: right;
   width: 90px;
   margin-right: 60px;
+  height: 32px;
 }
 #seq_stats {
   width: 40%;
@@ -484,6 +485,9 @@ button:focus {
 #sequence #projector_second_backward > div {
   color: #bf2e39;
 }
+#sequence #black input[type=checkbox]:checked {
+  background: white;
+}
 #sequence input[type=checkbox] {
   -webkit-appearance: none;
   -moz-appearance: none;
@@ -500,6 +504,10 @@ button:focus {
   box-sizing: border-box;
   cursor: pointer;
 }
+#sequence input[type=checkbox].disabled {
+  cursor: not-allowed;
+  border-color: #646464;
+}
 #sequence .L {
   display: inline-block;
   width: 35px;
@@ -627,6 +635,11 @@ button:focus {
   background: #AB1A25;
   border-color: #AB1A25;
 }
+.cmd:active.capper,
+.cmd.active.capper {
+  background: white;
+  color: #272b30;
+}
 .cmd:active i,
 .cmd.active i {
   color: #272b30;
@@ -650,14 +663,44 @@ button:focus {
 ::-webkit-scrollbar-thumb:window-inactive {
   background: rgba(0, 0, 0, 0.05);
 }
+#settings h4 {
+  margin-bottom: 1px;
+}
 #settings > div {
   width: 300px;
-  margin: 0 auto;
+}
+#settings > div.left {
+  float: left;
+  padding-left: 30px;
+}
+#settings > div.right {
+  float: right;
+  padding-right: 30px;
+}
+#settings > div.right input[type=number] {
+  min-width: 200px;
+  width: 200px;
+}
+#settings > div.right input[readonly] {
+  cursor: not-allowed;
+}
+#settings > div.right .spacer {
+  height: 62px;
+}
+#settings > div.right .proj_time {
+  height: 111px;
+}
+#settings > div.right .cam_time {
+  height: 111px;
+}
+#settings > div.right > div {
+  width: 270px;
 }
 #settings > div > div {
   width: 360px;
 }
 #settings input[type=text],
+#settings input[type=number],
 #settings select {
   display: block;
   border-radius: 5px;
@@ -672,33 +715,43 @@ button:focus {
   padding: 6px 12px;
   font-size: 21px;
   min-width: 300px;
+  max-width: 300px;
 }
 #settings input[type=text] span,
+#settings input[type=number] span,
 #settings select span {
   display: block;
   font-size: 16px;
   font-weight: 200;
 }
 #settings input[type=text]:active,
+#settings input[type=number]:active,
 #settings select:active,
 #settings input[type=text] .active,
+#settings input[type=number] .active,
 #settings select .active {
   background: #fff;
   color: #272b30;
   outline: none;
 }
 #settings input[type=text]:focus,
+#settings input[type=number]:focus,
 #settings select:focus {
   outline: none;
 }
 #settings input[type=text].active,
+#settings input[type=number].active,
 #settings select.active {
   border-color: #DAE035;
   color: #DAE035;
 }
+#settings input[type=text] {
+  width: 200px;
+}
 #settings button {
-  margin-top: -1px;
+  margin-top: 0px;
   float: right;
+  padding: 8px 16px 9px;
 }
 #settings input[type=radio] {
   float: right;
@@ -707,6 +760,17 @@ button:focus {
 #settings .spacer {
   margin-top: 10px;
 }
+#settings #version {
+  position: absolute;
+  right: 20px;
+  bottom: 10px;
+  z-index: 1000;
+  height: 14px;
+  width: auto;
+  font-size: 14px;
+  line-height: 14px;
+  color: #999;
+}
 .cm-s-monokai.CodeMirror {
   background: #272b30 !important;
 }
@@ -795,9 +859,11 @@ button:focus {
 }
 #path_bar select {
   line-height: 41px;
-  height: 41px;
+  height: 37px;
   margin-right: 5px;
   float: right;
+  box-sizing: content-box;
+  padding: 0 0 0 8px;
 }
 #filmout_monitor {
   display: none;
@@ -837,20 +903,22 @@ button:focus {
 #filmout_position_wrap input {
   margin-right: 5px;
   margin-left: 5px;
+  width: 308px !important;
+  box-sizing: border-box;
 }
 #filmout_position_wrap button,
 #filmout_position_wrap input {
   float: left;
 }
 #filmout_position_wrap > div {
-  width: 410px;
+  width: 425px;
   margin: 0 auto;
 }
 #filmout_functions {
   padding-top: 5px;
 }
 #filmout_functions > div {
-  width: 410px;
+  width: 425px;
   margin: 0 auto;
 }
 #filmout_stats_video,
@@ -872,6 +940,12 @@ button:focus {
 #filmout_stats_monitor {
   right: 5px;
 }
+.hide {
+  display: none;
+}
+.show {
+  display: block;
+}
 #screens {
   overflow-x: hidden;
 }
@@ -1124,19 +1198,23 @@ button:focus {
   float: right;
 }
 .cam2,
-.proj2 {
+.proj2,
+.black {
   display: none;
 }
 .cam2 > *,
-.proj2 > * {
+.proj2 > *,
+.black > * {
   visibility: hidden;
 }
 .cam2.on,
-.proj2.on {
+.proj2.on,
+.black.on {
   display: block;
 }
 .cam2.on > *,
-.proj2.on > * {
+.proj2.on > *,
+.black.on > * {
   visibility: visible;
 }
 #overlay {

app/data/cfg.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.6.7",
+  "version": "1.8.164",
   "ext_port": 1111,
   "profiles": {
     "mcopy": {
@@ -15,8 +15,8 @@
         "momentary": 0
       },
       "black": {
-        "before": 0,
-        "after": 0
+        "before": 100,
+        "after": 100
       },
       "light": false
     },
@@ -178,7 +178,22 @@
       "cameras": "4",
       "camera_projectors_identifier": "5",
       "cameras_projector_identifier": "6",
-      "cameras_projectors_identifier": "7"
+      "cameras_projectors_identifier": "7",
+      "capper_identifier": "C",
+      "camera_capper_identifier": "8",
+      "camera_capper_projector_identifier": "9",
+      "camera_capper_projectors_identifier": "0",
+      "capper_on": "A",
+      "capper_off": "B",
+      "camera_open": "J",
+      "camera_close": "K",
+      "takeup_forward": "D",
+      "takeup_backward": "F",
+      "error": "E",
+      "camera_exposure": "G",
+      "state": "H",
+      "home": "I",
+      "offset": "O"
     }
   }
 }

app/display.html

@@ -13,6 +13,16 @@
 	body.meter {
 		background: rgb(117, 117, 117);
 	}
+	body.meter #img,
+	body.meter #can {
+		display: none;
+	}
+	body.image #can{
+		display: none;
+	}
+	body.image #img {
+		display: block;
+	}
 	#img {
 		position: absolute;
 	    /*background-image: url(".../img/background.jpg");*/
@@ -46,35 +56,48 @@
 	</canvas>
 	<script>
 		'use strict';
-		const { remote, ipcRenderer } = require('electron')
+		const { ipcRenderer } = require('electron')
+		const remote = require('@electron/remote')
 		let imgTmp; 
+		function delay (ms) {
+			return new Promise((resolve) => {
+				return setTimeout(resolve, ms)
+			})
+		}
 		async function setImage (src) {
 			return new Promise(async (resolve, reject) => {
 				imgTmp = new Image()
 				let img = document.getElementById('img')
 				let body = document.querySelector('body')
-				if (body.classList.contains('meter')) {
-					body.classList.remove('meter')
-				}
+				body.className = ''
+				body.classList.add('image')
 				imgTmp.onload = function () {
-					img.style.backgroundImage = `url('${src}')`;
-					return resolve(src);
-				};
-				imgTmp.src = src;
-			});
+					img.style.backgroundImage = `url('${src}')`
+					return resolve(src)
+				}
+				imgTmp.src = src
+			})
+		}
+
+		function setBlank () {
+			let img = document.getElementById('img')
+			img.style.background = ''
+			img.style.backgroundUrl = ''
+			img.style.backgroundColor = 'black'
 		}
 		async function onMeter () {
 			console.log('meter')
 			const body = document.querySelector('body')
-			if (!body.classList.contains('meter')) {
-				body.classList.add('meter')
-			}
+			body.className = ''
+			body.classList.add('meter')
 		}
 		async function onFocus () {
 			console.log('focus')
 			const can = document.getElementById('can')
 			const dpr = window.devicePixelRatio || 1
+			const body = document.querySelector('body')
 			let ctx;
+			body.className = ''
 			if (!can.classList.contains('show')) {
 				can.classList.add('show')
 			}
@@ -122,7 +145,9 @@
 			const can = document.getElementById('can')
 			const dpr = window.devicePixelRatio || 1
 			const screen = window.outerWidth / window.outerHeight
-			let ctx;
+			const body = document.querySelector('body')
+			let ctx
+			body.className = ''
 			if (!can.classList.contains('show')) {
 				can.classList.add('show')
 			}
@@ -131,7 +156,7 @@
 					can.width = (window.innerHeight * arg.ratio) * dpr
 					can.height = window.innerHeight * dpr
 				} else {
-					can.width =window.innerWidth * dpr
+					can.width = window.innerWidth * dpr
 					can.height = (window.innerWidth / arg.ratio) * dpr
 				}
 			} else {
@@ -145,7 +170,7 @@
        				can.style.width = `${window.innerHeight * arg.ratio}px`
        				can.style.height = `${window.innerHeight}px`
        			} else {
-       				can.style.width = `${window.inneWidth}px`
+       				can.style.width = `${window.innerWidth}px`
        				can.style.height = `${window.innerWidth / arg.ratio}px`
        			}
        		} else {
@@ -208,18 +233,28 @@
 		}
 		async function onDigital (event, arg) {
 			if (arg.src) {
+				if (arg.exposure) {
+					setBlank()
+					await delay(10)
+				}
 				try {
-					await setImage(arg.src)
+					await setImage(arg.src) 
 				} catch (err) {
 					console.error(err)
 				}
-				ipcRenderer.send('display_load', { src : arg.src });
+				if (arg.exposure) {
+					await delay(arg.exposure)
+					setBlank()
+				}
+				ipcRenderer.send('display_load', { src : arg.src })
 			}
 			return event.returnValue = true
 		}
+
 		async function onEscape (evt) {
 			let isEscape = false
 			let win
+
 			evt = evt || window.event
 			
 			if ('key' in evt) {
@@ -227,6 +262,7 @@
 			} else {
 				isEscape = (evt.keyCode == 27)
 			}
+
 			if (isEscape) {
 				win = remote.getCurrentWindow()
        			win.close()

app/entitlements.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.debugger</key>
+    <true/>
+  </dict>
+</plist>

app/index.html

@@ -13,7 +13,7 @@
   </head>
   <body onload="init();" style="background:#272b30;">
     <nav id="toolbar"></nav>
-    <div id="screens">
+    <div id="screens" class="hide">
       <div id="sequencer" class="screen" style="display: block;">
         <div id="counters">
           <div class="cam">
@@ -45,6 +45,8 @@
             <div id="camera_second_backward" class="row cam2" y="2"></div>
             <div id="projector_backward" class="row" y="1"></div>
             <div id="projector_second_backward" class="row proj2" y="3"></div>
+
+            <div id="black" class="row black"></div>
             
             <div id="light_set" class="row spacer"></div>
             <div id="numbers" class="row"></div>
@@ -60,6 +62,8 @@
             <div><span>PROJ </span><i class="fa fa-minus"></i></div>
             <div class="proj2"><span>PROJ2 </span><i class="fa fa-minus"></i></div>
 
+            <div class="black"><span>BLANK </span><i class="fa fa-times"></i></div>
+
             <div class="spacer"><span>LIGHT</span></div>
           </div>
         </div>
@@ -144,20 +148,34 @@
                 <i class="fa fa-step-backward"></i>
               </button>
             </div>
-            <div>
+            <div class="hide">
               <button id="cmd_black_forward" onclick="cmd.black_forward();" class="cmd fwd">
                 <i class="fa fa-times-circle"></i> 
                 BLANK +1
                 <i class="fa fa-step-forward"></i>
               </button>
             </div>
-            <div>
+            <div class="hide">
               <button id="cmd_black_backward" onclick="cmd.black_backward();" class="cmd bwd">
                 <i class="fa fa-times-circle"></i> 
                 BLANK -1
                 <i class="fa fa-step-backward"></i>
               </button>
             </div>
+            <div class="hide">
+              <button id="cmd_capper_on" onclick="cmd.capper_on();" class="cmd capper">
+                <i class="fa fa-times-circle"></i> 
+                CAPPER ON
+                <i class="fa fa-eye"></i> 
+              </button>
+            </div>
+            <div class="hide">
+              <button id="cmd_capper_off" onclick="cmd.capper_off();" class="cmd capper active">
+                <i class="fa fa-eye"></i> 
+                CAPPER OFF
+                <i class="fa fa-eye"></i> 
+              </button>
+            </div>
           </div>
           <div>
             <div>
@@ -389,7 +407,7 @@
         </div>
       </div>
       <div id="settings" class="screen">
-        <div>
+        <div class="left">
           <div>
             <h4>Devices</h4>
             <select id="devices">
@@ -419,6 +437,13 @@
             <input type="text" id="intval" name="intval" placeholder="INTVAL3 URL"/>
             <input type="radio" id="camera_type_intval" name="camera_type" value="intval" onclick="devices.intval();" />
           </div>
+          <div class="spacer">
+            <input type="text" id="processing" name="processing" placeholder="PROCESSING URL" />
+            <input type="radio" id="camera_type_processing" name="camera_type" value="processing" onclick="devices.processing();" />
+          </div>
+          <div>
+            <div id="version"></div>
+          </div>
           <div>
             <h4>Light</h4>
             <select id="light_device">
@@ -432,6 +457,19 @@
               </select>
           </div>
         </div>
+        <div class="right">
+          <div class="spacer"></div>
+          <div class="proj_time">
+            <h4>Projector Time (ms)</h4>
+            <input type="number" readonly id="proj_time" value="0" />
+            <button id="submit_proj_time" class="hide">✓</button>
+          </div>
+          <div class="cam_time">
+            <h4>Camera Time (ms)</h4>
+            <input type="number" readonly id="cam_time" value="0" />
+            <button id="submit_cam_time" class="hide" onclick="cam.exposure($('#cam_time').val());">✓</button>
+          </div>
+        </div>
       </div>
     </div>
     <div id="overlay" onclick="gui.overlay(false);gui.spinner(false);"></div>

app/js/app.js

@@ -2474,8 +2474,9 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 !function(a,b){"object"==typeof exports?module.exports=b():"function"==typeof define&&define.amd?define(b):a.Spinner=b()}(this,function(){"use strict";function a(a,b){var c,d=document.createElement(a||"div");for(c in b)d[c]=b[c];return d}function b(a){for(var b=1,c=arguments.length;c>b;b++)a.appendChild(arguments[b]);return a}function c(a,b,c,d){var e=["opacity",b,~~(100*a),c,d].join("-"),f=.01+c/d*100,g=Math.max(1-(1-a)/b*(100-f),a),h=j.substring(0,j.indexOf("Animation")).toLowerCase(),i=h&&"-"+h+"-"||"";return l[e]||(m.insertRule("@"+i+"keyframes "+e+"{0%{opacity:"+g+"}"+f+"%{opacity:"+a+"}"+(f+.01)+"%{opacity:1}"+(f+b)%100+"%{opacity:"+a+"}100%{opacity:"+g+"}}",m.cssRules.length),l[e]=1),e}function d(a,b){var c,d,e=a.style;for(b=b.charAt(0).toUpperCase()+b.slice(1),d=0;d<k.length;d++)if(c=k[d]+b,void 0!==e[c])return c;return void 0!==e[b]?b:void 0}function e(a,b){for(var c in b)a.style[d(a,c)||c]=b[c];return a}function f(a){for(var b=1;b<arguments.length;b++){var c=arguments[b];for(var d in c)void 0===a[d]&&(a[d]=c[d])}return a}function g(a,b){return"string"==typeof a?a:a[b%a.length]}function h(a){this.opts=f(a||{},h.defaults,n)}function i(){function c(b,c){return a("<"+b+' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">',c)}m.addRule(".spin-vml","behavior:url(#default#VML)"),h.prototype.lines=function(a,d){function f(){return e(c("group",{coordsize:k+" "+k,coordorigin:-j+" "+-j}),{width:k,height:k})}function h(a,h,i){b(m,b(e(f(),{rotation:360/d.lines*a+"deg",left:~~h}),b(e(c("roundrect",{arcsize:d.corners}),{width:j,height:d.width,left:d.radius,top:-d.width>>1,filter:i}),c("fill",{color:g(d.color,a),opacity:d.opacity}),c("stroke",{opacity:0}))))}var i,j=d.length+d.width,k=2*j,l=2*-(d.width+d.length)+"px",m=e(f(),{position:"absolute",top:l,left:l});if(d.shadow)for(i=1;i<=d.lines;i++)h(i,-2,"progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)");for(i=1;i<=d.lines;i++)h(i);return b(a,m)},h.prototype.opacity=function(a,b,c,d){var e=a.firstChild;d=d.shadow&&d.lines||0,e&&b+d<e.childNodes.length&&(e=e.childNodes[b+d],e=e&&e.firstChild,e=e&&e.firstChild,e&&(e.opacity=c))}}var j,k=["webkit","Moz","ms","O"],l={},m=function(){var c=a("style",{type:"text/css"});return b(document.getElementsByTagName("head")[0],c),c.sheet||c.styleSheet}(),n={lines:12,length:7,width:5,radius:10,rotate:0,corners:1,color:"#000",direction:1,speed:1,trail:100,opacity:.25,fps:20,zIndex:2e9,className:"spinner",top:"50%",left:"50%",position:"absolute"};h.defaults={},f(h.prototype,{spin:function(b){this.stop();{var c=this,d=c.opts,f=c.el=e(a(0,{className:d.className}),{position:d.position,width:0,zIndex:d.zIndex});d.radius+d.length+d.width}if(e(f,{left:d.left,top:d.top}),b&&b.insertBefore(f,b.firstChild||null),f.setAttribute("role","progressbar"),c.lines(f,c.opts),!j){var g,h=0,i=(d.lines-1)*(1-d.direction)/2,k=d.fps,l=k/d.speed,m=(1-d.opacity)/(l*d.trail/100),n=l/d.lines;!function o(){h++;for(var a=0;a<d.lines;a++)g=Math.max(1-(h+(d.lines-a)*n)%l*m,d.opacity),c.opacity(f,a*d.direction+i,g,d);c.timeout=c.el&&setTimeout(o,~~(1e3/k))}()}return c},stop:function(){var a=this.el;return a&&(clearTimeout(this.timeout),a.parentNode&&a.parentNode.removeChild(a),this.el=void 0),this},lines:function(d,f){function h(b,c){return e(a(),{position:"absolute",width:f.length+f.width+"px",height:f.width+"px",background:b,boxShadow:c,transformOrigin:"left",transform:"rotate("+~~(360/f.lines*k+f.rotate)+"deg) translate("+f.radius+"px,0)",borderRadius:(f.corners*f.width>>1)+"px"})}for(var i,k=0,l=(f.lines-1)*(1-f.direction)/2;k<f.lines;k++)i=e(a(),{position:"absolute",top:1+~(f.width/2)+"px",transform:f.hwaccel?"translate3d(0,0,0)":"",opacity:f.opacity,animation:j&&c(f.opacity,f.trail,l+k*f.direction,f.lines)+" "+1/f.speed+"s linear infinite"}),f.shadow&&b(i,e(h("#000","0 0 4px #000"),{top:"2px"})),b(d,b(i,h(g(f.color,k),"0 0 1px rgba(0,0,0,.1)")));return d},opacity:function(a,b,c){b<a.childNodes.length&&(a.childNodes[b].style.opacity=c)}});var o=e(a("group"),{behavior:"url(#default#VML)"});return!d(o,"transform")&&o.adj?i():j=d(o,"animation"),h});
 const mcopy = {};
 
-const { remote, ipcRenderer } = require('electron');
-const dialog 	= require('electron').remote.dialog;
+const remote = require('@electron/remote');
+const { ipcRenderer } = require('electron');
+const { dialog } = remote;
 const notifier 	= require('node-notifier');
 const fs 		= require('fs');
 const uuid 		= require('uuid').v4;
@@ -2495,8 +2496,14 @@ const cmd 		= require('./lib/ui/cmd.js');
 const devices 	= require('./lib/ui/devices.js');
 const filmout 	= require('./lib/ui/filmout.js');
 const mse 		= require('./lib/ui/mscript.js');
+const capper    = require('./lib/ui/capper.js');
+const timing    = require('./lib/ui/timing.js');
 const Mscript 	= require('./lib/mscript');
 const { delay }	= require('./lib/delay');
+const alertObj  = require('./lib/ui/alert.js');
+const gamecontroller       = require('./lib/ui/gamecontroller.js');
+const { Log }   = require('./lib/log');
+
 let log;
 
 /******
@@ -2510,9 +2517,10 @@ mcopy.state = {
 async function init () {
 	'use strict';
 
-	log = await require('log')({})
+	log = await Log({ label : 'ui' })
 
 	nav.init();
+	gui.init();
 	grid.init();
 	mse.mscript.init();
 	mse.console.init();
@@ -2523,4 +2531,8 @@ async function init () {
 	proj.init();
 	cam.init();
 	seq.init();
+	capper.init();
+	alertObj.init();
+	timing.init();
+	gamecontroller.init(seq, cmd, cam, proj);
 };

app/less/app.less

@@ -10,6 +10,13 @@
 @import "./mscript.less";
 @import "./filmout.less";
 
+.hide {
+	display: none;
+}
+.show {
+	display: block;
+}
+
 #screens{
 	overflow-x: hidden;
 }
@@ -168,7 +175,8 @@
 }
 
 .cam2,
-.proj2{
+.proj2,
+.black{
 	display : none;
 	> * {
 		visibility: hidden;

app/less/cmd.less

@@ -42,6 +42,10 @@
 			background: @BACKWARD;
 			border-color: @BACKWARD;
 		}
+		&.capper{
+			background: white;
+			color: @BG;
+		}
 		i{
 			color: @BG;
 		}

app/less/filmout.less

@@ -27,9 +27,11 @@
 	}
 	select{
 		line-height: 41px;
-		height: 41px;
+		height: 37px;
 		margin-right: 5px;
 		float: right;
+		box-sizing: content-box;
+		padding: 0 0 0 8px;
 	}
 }
 #filmout_file {
@@ -73,12 +75,14 @@
 	input{
 		margin-right: 5px;
 		margin-left: 5px;
+		width: 308px !important;
+		box-sizing: border-box;
 	}
 	button, input{
 		float: left;
 	}
 	> div{
-		width: 410px;
+		width: 425px;
 		margin: 0 auto;
 	}
 }
@@ -86,7 +90,7 @@
 #filmout_functions{
 	padding-top: 5px;
 	> div{
-		width: 410px;
+		width: 425px;
 		margin: 0 auto;
 	}
 }

app/less/seq.less

@@ -28,6 +28,7 @@
 	    float: right;
 	    width: 90px;
 	    margin-right: 60px;
+	    height: 32px;
 	}
 }
 #seq_stats{
@@ -126,6 +127,13 @@
 			color: @BACKWARD + @SECOND;
 		}
 	}
+	#black{
+		input[type=checkbox]{
+			&:checked{
+				background: white;
+			}
+		}
+	}
 	input[type=checkbox]{
 		-webkit-appearance: none;
 		-moz-appearance: none;
@@ -141,6 +149,10 @@
     	display: inline-block;
 		box-sizing: border-box;
 		cursor: pointer;
+		&.disabled{
+			cursor: not-allowed;
+			border-color: rgb(100, 100, 100);
+		}
 	}
 	.L{
 		display: inline-block;

app/less/settings.less

@@ -1,25 +1,61 @@
 #settings{
+	h4{
+		margin-bottom: 1px;
+	}
 	> div{
 		width: 300px;
-		margin: 0 auto;
+		&.left{
+			float: left;
+			padding-left: 30px;
+		}
+		&.right{
+			float: right;
+			padding-right: 30px;
+			input[type=number] {
+				min-width: 200px;
+				width: 200px;
+			}
+			input[readonly]{
+				cursor: not-allowed;
+			}
+			.spacer{
+				height: 62px;
+			}
+			.proj_time{
+				height: 111px;
+			}
+			.cam_time{
+				height: 111px;
+			}
+			& > div {
+				width: 270px;
+			}
+		}
 	}
 	> div > div{
 		width: 360px;
 	}
-	input[type=text], select{
+	input[type=text],
+	input[type=number], 
+	select{
 		.button();
 		display: inline-block;
 		padding: 6px 12px;
 		font-size: 21px;
 		min-width: 300px;
+		max-width: 300px;
 		&.active{
 			border-color: @SELECTED;
 			color: @SELECTED;
 		}
 	}
+	input[type=text]{
+		width: 200px;
+	}
 	button{
-		margin-top: -1px;
-    	float: right;
+		margin-top: 0px;
+		float: right;
+		padding: 8px 16px 9px;
 	}
 	input[type=radio]{
 		float: right;
@@ -28,4 +64,15 @@
 	.spacer{
 		margin-top: 10px;
 	}
+	#version{
+		position: absolute;
+		right: 20px;
+		bottom: 10px;
+		z-index: 1000;
+		height: 14px;
+		width: auto;
+		font-size: 14px;
+		line-height: 14px;
+		color: #999;
+	}
 }

app/lib/alert/Readme.md

@@ -0,0 +1,40 @@
+<a name="module_lib/alert"></a>
+
+## lib/alert
+
+* [lib/alert](#module_lib/alert)
+    * [~Alert](#module_lib/alert..Alert)
+        * [.init()](#module_lib/alert..Alert+init)
+        * [.listen()](#module_lib/alert..Alert+listen)
+        * [.listener()](#module_lib/alert..Alert+listener)
+        * [.start()](#module_lib/alert..Alert+start)
+
+<a name="module_lib/alert..Alert"></a>
+
+### lib/alert~Alert
+Class for pushing an alert to the UI from the backend.
+
+**Kind**: inner class of [<code>lib/alert</code>](#module_lib/alert)  
+
+* [~Alert](#module_lib/alert..Alert)
+    * [.init()](#module_lib/alert..Alert+init)
+    * [.listen()](#module_lib/alert..Alert+listen)
+    * [.listener()](#module_lib/alert..Alert+listener)
+    * [.start()](#module_lib/alert..Alert+start)
+
+<a name="module_lib/alert..Alert+init"></a>
+
+#### alert.init()
+**Kind**: instance method of [<code>Alert</code>](#module_lib/alert..Alert)  
+<a name="module_lib/alert..Alert+listen"></a>
+
+#### alert.listen()
+**Kind**: instance method of [<code>Alert</code>](#module_lib/alert..Alert)  
+<a name="module_lib/alert..Alert+listener"></a>
+
+#### alert.listener()
+**Kind**: instance method of [<code>Alert</code>](#module_lib/alert..Alert)  
+<a name="module_lib/alert..Alert+start"></a>
+
+#### alert.start()
+**Kind**: instance method of [<code>Alert</code>](#module_lib/alert..Alert)  

app/lib/alert/index.d.ts

@@ -0,0 +1,29 @@
+import type { WebContents } from 'electron';
+/** @module lib/alert */
+/**
+ * Class for pushing an alert to the UI from the backend.
+ */
+export declare class Alert {
+    private ipc;
+    private log;
+    private id;
+    private cb;
+    private ui;
+    constructor(ui: WebContents);
+    /**
+     *
+     **/
+    private init;
+    /**
+     *
+     **/
+    private listen;
+    /**
+     *
+     **/
+    private listener;
+    /**
+     *
+     **/
+    start(cmd: string): Promise<number>;
+}

app/lib/alert/index.js

@@ -0,0 +1,62 @@
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Alert = void 0;
+const electron_1 = require("electron");
+const log_1 = require("log");
+/** @module lib/alert */
+/**
+ * Class for pushing an alert to the UI from the backend.
+ */
+class Alert {
+    constructor(ui) {
+        this.ipc = electron_1.ipcMain;
+        this.id = 'alert';
+        this.cb = null;
+        this.ui = ui;
+        this.init();
+    }
+    /**
+     *
+     **/
+    async init() {
+        this.log = await (0, log_1.Log)({ label: this.id });
+        this.listen();
+    }
+    /**
+     *
+     **/
+    listen() {
+        this.ipc.on(this.id, this.listener.bind(this));
+    }
+    /**
+     *
+     **/
+    async listener(event, arg) {
+        if (this.cb !== null) {
+            try {
+                await this.cb(arg.state, arg.id);
+            }
+            catch (err) {
+                this.log.error(err);
+            }
+        }
+        event.returnValue = true;
+    }
+    /**
+     *
+     **/
+    async start(cmd) {
+        const start = +new Date();
+        const msg = (cmd + '').replace('ALERT', '').replace('Alert', '').replace('alert', '').trim();
+        this.ui.send(this.id, { msg });
+        return new Promise(function (resolve, reject) {
+            this.cb = function () {
+                const ms = (+new Date()) - start;
+                return resolve(ms);
+            };
+        }.bind(this));
+    }
+}
+exports.Alert = Alert;
+module.exports = { Alert };
+//# sourceMappingURL=index.js.map

app/lib/alert/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/alert/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;AAEb,uCAAmC;AAEnC,6BAA0B;AAI1B,wBAAwB;AAExB;;GAEG;AAEH,MAAa,KAAK;IAOjB,YAAc,EAAgB;QANtB,QAAG,GAAoB,kBAAO,CAAA;QAE9B,OAAE,GAAY,OAAO,CAAA;QACrB,OAAE,GAAc,IAAI,CAAA;QAI3B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;QACZ,IAAI,CAAC,IAAI,EAAE,CAAA;IACZ,CAAC;IAED;;QAEI;IACI,KAAK,CAAC,IAAI;QACjB,IAAI,CAAC,GAAG,GAAG,MAAM,IAAA,SAAG,EAAC,EAAE,KAAK,EAAG,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;QACzC,IAAI,CAAC,MAAM,EAAE,CAAA;IACd,CAAC;IAED;;QAEI;IACI,MAAM;QACb,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;IAC/C,CAAC;IAED;;QAEI;IACI,KAAK,CAAC,QAAQ,CAAE,KAAoB,EAAE,GAAS;QACtD,IAAI,IAAI,CAAC,EAAE,KAAK,IAAI,EAAE;YACrB,IAAI;gBACH,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,CAAA;aAChC;YAAC,OAAO,GAAG,EAAE;gBACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;aACnB;SACD;QACD,KAAK,CAAC,WAAW,GAAG,IAAI,CAAA;IACzB,CAAC;IAED;;QAEI;IACG,KAAK,CAAC,KAAK,CAAE,GAAY;QAC/B,MAAM,KAAK,GAAY,CAAC,IAAI,IAAI,EAAE,CAAC;QACnC,MAAM,GAAG,GAAY,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAA;QACrG,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;QAC9B,OAAO,IAAI,OAAO,CAAC,UAAU,OAAkB,EAAE,MAAiB;YACjE,IAAI,CAAC,EAAE,GAAG;gBACT,MAAM,EAAE,GAAY,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC;gBAC1C,OAAO,OAAO,CAAC,EAAE,CAAC,CAAC;YACpB,CAAC,CAAA;QACF,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACf,CAAC;CACD;AAvDD,sBAuDC;AAED,MAAM,CAAC,OAAO,GAAG,EAAE,KAAK,EAAE,CAAA"}

app/lib/arduino/Readme.md

@@ -1,43 +1,146 @@
-<a name="Arduino"></a>
+## Modules
 
-## Arduino
-Class representing the arduino communication features
+<dl>
+<dt><a href="#module_lib/arduino">lib/arduino</a></dt>
+<dd></dd>
+</dl>
 
-**Kind**: global class  
+## Constants
 
-* [Arduino](#Arduino)
-    * [.enumerate()](#Arduino+enumerate) ⇒ <code>Promise</code>
-    * [.sendAsync(device, cmd)](#Arduino+sendAsync) ⇒ <code>Promise</code>
-    * [.writeAsync(device, str)](#Arduino+writeAsync) ⇒ <code>Promise</code>
-    * [.openArduino(device)](#Arduino+openArduino) ⇒ <code>Promise</code>
-    * [.closeArduino(device)](#Arduino+closeArduino) ⇒ <code>Promise</code>
+<dl>
+<dt><a href="#delay_1">delay_1</a></dt>
+<dd><p>2023-07-16 Clarification</p>
+<p>Previous versions of this script intermingled and even
+swapped the usage of the terms &#39;serial&#39; and &#39;device&#39;.
+From here on out, the terms will be used as such:</p>
+<p>serial - a hardware address of a serial port
+device - common name of a type of mcopy device (eg. camera,
+projector, light) that is aliased to a serial port</p>
+</dd>
+</dl>
 
-<a name="Arduino+enumerate"></a>
+<a name="module_lib/arduino"></a>
 
-### arduino.enumerate() ⇒ <code>Promise</code>
+## lib/arduino
+
+* [lib/arduino](#module_lib/arduino)
+    * [~Arduino](#module_lib/arduino..Arduino)
+        * [.enumerate()](#module_lib/arduino..Arduino+enumerate) ⇒ <code>Promise</code>
+        * [.sendAsync(device, cmd)](#module_lib/arduino..Arduino+sendAsync) ⇒ <code>Promise</code>
+        * [.send(device, cmd)](#module_lib/arduino..Arduino+send) ⇒ <code>Promise.&lt;(boolean\|string)&gt;</code>
+        * [.sendString(device, str)](#module_lib/arduino..Arduino+sendString) ⇒ <code>Promise.&lt;(boolean\|string)&gt;</code>
+        * [.stateAsync()](#module_lib/arduino..Arduino+stateAsync)
+        * [.state()](#module_lib/arduino..Arduino+state)
+        * [.writeAsync(device, str)](#module_lib/arduino..Arduino+writeAsync) ⇒ <code>Promise</code>
+        * [.end(serial, data)](#module_lib/arduino..Arduino+end) ⇒ <code>any</code>
+        * [.aliasSerial(device, serial)](#module_lib/arduino..Arduino+aliasSerial)
+        * [.connect(device, serial, confirm)](#module_lib/arduino..Arduino+connect) ⇒ <code>Promise.&lt;string&gt;</code>
+        * [.confirmEnd(data)](#module_lib/arduino..Arduino+confirmEnd)
+        * [.verify()](#module_lib/arduino..Arduino+verify) ⇒ <code>Promise.&lt;boolean&gt;</code>
+        * [.distinguish()](#module_lib/arduino..Arduino+distinguish) ⇒ <code>Promise.&lt;string&gt;</code>
+        * [.close()](#module_lib/arduino..Arduino+close) ⇒ <code>Promise.&lt;boolean&gt;</code>
+        * [.fakeConnect(serial)](#module_lib/arduino..Arduino+fakeConnect) ⇒ <code>Promise.&lt;boolean&gt;</code>
+        * [.openArduino(device)](#module_lib/arduino..Arduino+openArduino) ⇒ <code>Promise</code>
+        * [.closeArduino(device)](#module_lib/arduino..Arduino+closeArduino) ⇒ <code>Promise</code>
+
+<a name="module_lib/arduino..Arduino"></a>
+
+### lib/arduino~Arduino
+Class representing the arduino communication features.
+
+**Kind**: inner class of [<code>lib/arduino</code>](#module_lib/arduino)  
+
+* [~Arduino](#module_lib/arduino..Arduino)
+    * [.enumerate()](#module_lib/arduino..Arduino+enumerate) ⇒ <code>Promise</code>
+    * [.sendAsync(device, cmd)](#module_lib/arduino..Arduino+sendAsync) ⇒ <code>Promise</code>
+    * [.send(device, cmd)](#module_lib/arduino..Arduino+send) ⇒ <code>Promise.&lt;(boolean\|string)&gt;</code>
+    * [.sendString(device, str)](#module_lib/arduino..Arduino+sendString) ⇒ <code>Promise.&lt;(boolean\|string)&gt;</code>
+    * [.stateAsync()](#module_lib/arduino..Arduino+stateAsync)
+    * [.state()](#module_lib/arduino..Arduino+state)
+    * [.writeAsync(device, str)](#module_lib/arduino..Arduino+writeAsync) ⇒ <code>Promise</code>
+    * [.end(serial, data)](#module_lib/arduino..Arduino+end) ⇒ <code>any</code>
+    * [.aliasSerial(device, serial)](#module_lib/arduino..Arduino+aliasSerial)
+    * [.connect(device, serial, confirm)](#module_lib/arduino..Arduino+connect) ⇒ <code>Promise.&lt;string&gt;</code>
+    * [.confirmEnd(data)](#module_lib/arduino..Arduino+confirmEnd)
+    * [.verify()](#module_lib/arduino..Arduino+verify) ⇒ <code>Promise.&lt;boolean&gt;</code>
+    * [.distinguish()](#module_lib/arduino..Arduino+distinguish) ⇒ <code>Promise.&lt;string&gt;</code>
+    * [.close()](#module_lib/arduino..Arduino+close) ⇒ <code>Promise.&lt;boolean&gt;</code>
+    * [.fakeConnect(serial)](#module_lib/arduino..Arduino+fakeConnect) ⇒ <code>Promise.&lt;boolean&gt;</code>
+    * [.openArduino(device)](#module_lib/arduino..Arduino+openArduino) ⇒ <code>Promise</code>
+    * [.closeArduino(device)](#module_lib/arduino..Arduino+closeArduino) ⇒ <code>Promise</code>
+
+<a name="module_lib/arduino..Arduino+enumerate"></a>
+
+#### arduino.enumerate() ⇒ <code>Promise</code>
 Enumerate all connected devices that might be Arduinos
 
-**Kind**: instance method of [<code>Arduino</code>](#Arduino)  
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
 **Returns**: <code>Promise</code> - Resolves after enumerating  
-<a name="Arduino+sendAsync"></a>
+<a name="module_lib/arduino..Arduino+sendAsync"></a>
 
-### arduino.sendAsync(device, cmd) ⇒ <code>Promise</code>
+#### arduino.sendAsync(device, cmd) ⇒ <code>Promise</code>
 Send a command to an Arduino using async/await
 
-**Kind**: instance method of [<code>Arduino</code>](#Arduino)  
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
 **Returns**: <code>Promise</code> - Resolves after sending  
 
 | Param | Type | Description |
 | --- | --- | --- |
-| device | <code>string</code> | Arduino identifier |
+| device | <code>string</code> | The Arduino device identifier |
 | cmd | <code>string</code> | Single character command to send |
 
-<a name="Arduino+writeAsync"></a>
+<a name="module_lib/arduino..Arduino+send"></a>
 
-### arduino.writeAsync(device, str) ⇒ <code>Promise</code>
+#### arduino.send(device, cmd) ⇒ <code>Promise.&lt;(boolean\|string)&gt;</code>
+Sends a command to the specified Arduino and waits for a response.
+Handles the communication lock to prevent sending multiple commands simultaneously.
+Emits an 'arduino_send' event after successfully sending the command.
+
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
+**Returns**: <code>Promise.&lt;(boolean\|string)&gt;</code> - Returns 'false' if the communication is locked, otherwise returns the response from the device.  
+**Throws**:
+
+- <code>Error</code> Throws an error if the sendAsync method encounters an error.
+
+
+| Param | Type | Description |
+| --- | --- | --- |
+| device | <code>string</code> | The Arduino device identifier. |
+| cmd | <code>string</code> | The command to be sent to the Arduino. |
+
+<a name="module_lib/arduino..Arduino+sendString"></a>
+
+#### arduino.sendString(device, str) ⇒ <code>Promise.&lt;(boolean\|string)&gt;</code>
+Sends a string to the specified Arduino.
+Handles different types of devices, including fake devices for testing purposes.
+Waits for a specified delay before sending the string.
+
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
+**Returns**: <code>Promise.&lt;(boolean\|string)&gt;</code> - Returns 'true' if the string is sent successfully, otherwise returns an error message.  
+**Throws**:
+
+- <code>Error</code> Throws an error if the writeAsync method encounters an error.
+
+
+| Param | Type | Description |
+| --- | --- | --- |
+| device | <code>string</code> | The Arduino device identifier. |
+| str | <code>string</code> | The string to be sent to the Arduino. |
+
+<a name="module_lib/arduino..Arduino+stateAsync"></a>
+
+#### arduino.stateAsync()
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
+<a name="module_lib/arduino..Arduino+state"></a>
+
+#### arduino.state()
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
+<a name="module_lib/arduino..Arduino+writeAsync"></a>
+
+#### arduino.writeAsync(device, str) ⇒ <code>Promise</code>
 Send a string to an Arduino using async/await
 
-**Kind**: instance method of [<code>Arduino</code>](#Arduino)  
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
 **Returns**: <code>Promise</code> - Resolves after sending  
 
 | Param | Type | Description |
@@ -45,27 +148,149 @@ Send a string to an Arduino using async/await
 | device | <code>string</code> | Arduino identifier |
 | str | <code>string</code> | String to send |
 
-<a name="Arduino+openArduino"></a>
+<a name="module_lib/arduino..Arduino+end"></a>
 
-### arduino.openArduino(device) ⇒ <code>Promise</code>
+#### arduino.end(serial, data) ⇒ <code>any</code>
+Handles the end of communication with the Arduino.
+Calculates the time taken for the communication, executes the callback,
+and emits an 'arduino_end' event. Handles errors and stray data received.
+
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
+**Returns**: <code>any</code> - The time taken for the communication in milliseconds.  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| serial | <code>string</code> | The serial address of the Arduino device. |
+| data | <code>string</code> | The data received from the Arduino. |
+
+<a name="module_lib/arduino..Arduino+aliasSerial"></a>
+
+#### arduino.aliasSerial(device, serial)
+Associates an alias with an Arduinos serial address.
+Used to map multi-purpose devices onto the same serial connection.
+
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| device | <code>string</code> | The serial number of the target Arduino. |
+| serial | <code>string</code> | The alias to be associated with the target device. |
+
+<a name="module_lib/arduino..Arduino+connect"></a>
+
+#### arduino.connect(device, serial, confirm) ⇒ <code>Promise.&lt;string&gt;</code>
+Connects to an Arduino using its serial number.
+Sets up the SerialPort instance and path for the device, and handles data communication.
+Handles opening the connection and emitting 'arduino_end' or 'confirmEnd' events upon receiving data.
+
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
+**Returns**: <code>Promise.&lt;string&gt;</code> - Resolves with the device path if the connection is successful.  
+**Throws**:
+
+- <code>Error</code> Rejects with an error message if the connection fails.
+
+
+| Param | Type | Description |
+| --- | --- | --- |
+| device | <code>string</code> | The device identifier (common name). |
+| serial | <code>string</code> | The serial address of the target Arduino (e.g., COM port on Windows). |
+| confirm | <code>function</code> | A callback function to be executed upon receiving confirmation data. |
+
+<a name="module_lib/arduino..Arduino+confirmEnd"></a>
+
+#### arduino.confirmEnd(data)
+Handles the confirmation data received from an Arduino.
+Executes the confirmation callback function if the received data is present in the list of expected values.
+
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| data | <code>string</code> | The data received from the Arduino. |
+
+<a name="module_lib/arduino..Arduino+verify"></a>
+
+#### arduino.verify() ⇒ <code>Promise.&lt;boolean&gt;</code>
+Verifies the connection to an Arduino by sending a connect command.
+The confirmation callback checks if the received data matches the expected connect command.
+
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
+**Returns**: <code>Promise.&lt;boolean&gt;</code> - Resolves with 'true' if the connection is verified successfully.  
+**Throws**:
+
+- <code>Error</code> Rejects with an error message if the connection verification fails.
+
+<a name="module_lib/arduino..Arduino+distinguish"></a>
+
+#### arduino.distinguish() ⇒ <code>Promise.&lt;string&gt;</code>
+Distinguishes the type of Arduino connected.
+Sends a command to the device to identify its type and resolves the promise with the received type.
+
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
+**Returns**: <code>Promise.&lt;string&gt;</code> - Resolves with the type of the connected Arduino-based device.  
+**Throws**:
+
+- <code>Error</code> Rejects with an error message if the distinguish operation fails.
+
+<a name="module_lib/arduino..Arduino+close"></a>
+
+#### arduino.close() ⇒ <code>Promise.&lt;boolean&gt;</code>
+Closes the connection to an Arduino.
+
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
+**Returns**: <code>Promise.&lt;boolean&gt;</code> - Resolves with 'true' if the connection is closed successfully.  
+**Throws**:
+
+- <code>Error</code> Throws an error if the closeArduino method encounters an error.
+
+<a name="module_lib/arduino..Arduino+fakeConnect"></a>
+
+#### arduino.fakeConnect(serial) ⇒ <code>Promise.&lt;boolean&gt;</code>
+Establishes a fake connection to an Arduino for testing purposes.
+Creates a fake SerialPort instance with custom write and string methods.
+
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
+**Returns**: <code>Promise.&lt;boolean&gt;</code> - Resolves with 'true' if the fake connection is established successfully.  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| serial | <code>string</code> | The device identifier of the fake Arduino. |
+
+<a name="module_lib/arduino..Arduino+openArduino"></a>
+
+#### arduino.openArduino(device) ⇒ <code>Promise</code>
 Connect to an Arduino using async/await
 
-**Kind**: instance method of [<code>Arduino</code>](#Arduino)  
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
 **Returns**: <code>Promise</code> - Resolves after opening  
 
 | Param | Type | Description |
 | --- | --- | --- |
 | device | <code>string</code> | Arduino identifier |
 
-<a name="Arduino+closeArduino"></a>
+<a name="module_lib/arduino..Arduino+closeArduino"></a>
 
-### arduino.closeArduino(device) ⇒ <code>Promise</code>
+#### arduino.closeArduino(device) ⇒ <code>Promise</code>
 Close a connection to an Arduino using async/await
 
-**Kind**: instance method of [<code>Arduino</code>](#Arduino)  
+**Kind**: instance method of [<code>Arduino</code>](#module_lib/arduino..Arduino)  
 **Returns**: <code>Promise</code> - Resolves after closing  
 
 | Param | Type | Description |
 | --- | --- | --- |
 | device | <code>string</code> | Arduino identifier |
 
+<a name="delay_1"></a>
+
+## delay\_1
+2023-07-16 Clarification
+
+Previous versions of this script intermingled and even
+swapped the usage of the terms 'serial' and 'device'.
+From here on out, the terms will be used as such:
+
+serial - a hardware address of a serial port
+device - common name of a type of mcopy device (eg. camera,
+projector, light) that is aliased to a serial port
+
+**Kind**: global constant  

app/lib/arduino/index.d.ts

@@ -0,0 +1,179 @@
+/// <reference types="node" />
+import type { EventEmitter } from 'events';
+import type { Config } from 'cfg';
+/** @module lib/arduino */
+/**
+ * Class representing the arduino communication features.
+ */
+export declare class Arduino {
+    private log;
+    private eventEmitter;
+    private cfg;
+    private path;
+    private known;
+    private serial;
+    private baud;
+    private queue;
+    private timer;
+    private locks;
+    private confirmExec;
+    private errorState;
+    private keys;
+    private values;
+    alias: any;
+    stateStr: any;
+    hasState: any;
+    constructor(cfg: Config, ee: EventEmitter, errorState: Function);
+    init(): Promise<void>;
+    /**
+     * Enumerate all connected devices that might be Arduinos
+     *
+     * @async
+     * @returns {Promise} Resolves after enumerating
+     **/
+    enumerate(): Promise<string[]>;
+    /**
+     * Send a command to an Arduino using async/await
+     *
+     * @param  {string}  device 	The Arduino device identifier
+     * @param  {string}  cmd 		Single character command to send
+     *
+     * @async
+     * @returns {Promise} Resolves after sending
+     **/
+    private sendAsync;
+    /**
+     * Sends a command to the specified Arduino and waits for a response.
+     * Handles the communication lock to prevent sending multiple commands simultaneously.
+     * Emits an 'arduino_send' event after successfully sending the command.
+     *
+     * @async
+     * @param {string} device - The Arduino device identifier.
+     * @param {string} cmd - The command to be sent to the Arduino.
+     * @returns {Promise<boolean|string>} Returns 'false' if the communication is locked, otherwise returns the response from the device.
+     * @throws {Error} Throws an error if the sendAsync method encounters an error.
+     **/
+    send(device: string, cmd: string): Promise<number>;
+    /**
+     * Sends a string to the specified Arduino.
+     * Handles different types of devices, including fake devices for testing purposes.
+     * Waits for a specified delay before sending the string.
+     *
+     * @async
+     * @param {string} device - The Arduino device identifier.
+     * @param {string} str - The string to be sent to the Arduino.
+     * @returns {Promise<boolean|string>} Returns 'true' if the string is sent successfully, otherwise returns an error message.
+     * @throws {Error} Throws an error if the writeAsync method encounters an error.
+     **/
+    sendString(device: string, str: string): Promise<number>;
+    /**
+     *
+     **/
+    private stateAsync;
+    /**
+     *
+     **/
+    state(device: string, confirm?: boolean): Promise<string>;
+    /**
+     * Send a string to an Arduino using async/await
+     *
+     * @param  {string}  device 	Arduino identifier
+     * @param  {string}  str		String to send
+     *
+     * @returns {Promise} Resolves after sending
+     **/
+    private writeAsync;
+    /**
+     * Handles the end of communication with the Arduino.
+     * Calculates the time taken for the communication, executes the callback,
+     * and emits an 'arduino_end' event. Handles errors and stray data received.
+     *
+     * @param {string} serial - The serial address of the Arduino device.
+     * @param {string} data - The data received from the Arduino.
+     * @returns {any} The time taken for the communication in milliseconds.
+     **/
+    private end;
+    private error;
+    /**
+     * Associates an alias with an Arduinos serial address.
+     * Used to map multi-purpose devices onto the same serial connection.
+     *
+     * @param {string} device - The serial number of the target Arduino.
+     * @param {string} serial - The alias to be associated with the target device.
+     **/
+    aliasSerial(device: string, serial: string): void;
+    /**
+     * Connects to an Arduino using its serial number.
+     * Sets up the SerialPort instance and path for the device, and handles data communication.
+     * Handles opening the connection and emitting 'arduino_end' or 'confirmEnd' events upon receiving data.
+     *
+     * @async
+     * @param {string} device - The device identifier (common name).
+     * @param {string} serial - The serial address of the target Arduino (e.g., COM port on Windows).
+     * @param {function} confirm - A callback function to be executed upon receiving confirmation data.
+     * @returns {Promise<string>} Resolves with the device path if the connection is successful.
+     * @throws {Error} Rejects with an error message if the connection fails.
+     **/
+    connect(device: string, serial: string, confirm: any): Promise<any>;
+    /**
+     * Handles the confirmation data received from an Arduino.
+     * Executes the confirmation callback function if the received data is present in the list of expected values.
+     *
+     * @param {string} data - The data received from the Arduino.
+     **/
+    private confirmEnd;
+    /**
+     * Verifies the connection to an Arduino by sending a connect command.
+     * The confirmation callback checks if the received data matches the expected connect command.
+     *
+     * @async
+     * @returns {Promise<boolean>} Resolves with 'true' if the connection is verified successfully.
+     * @throws {Error} Rejects with an error message if the connection verification fails.
+     **/
+    verify(): Promise<unknown>;
+    /**
+     * Distinguishes the type of Arduino connected.
+     * Sends a command to the device to identify its type and resolves the promise with the received type.
+     *
+     * @async
+     * @returns {Promise<string>} Resolves with the type of the connected Arduino-based device.
+     * @throws {Error} Rejects with an error message if the distinguish operation fails.
+     **/
+    distinguish(): Promise<string>;
+    /**
+     * Closes the connection to an Arduino.
+     *
+     * @async
+     * @returns {Promise<boolean>} Resolves with 'true' if the connection is closed successfully.
+     * @throws {Error} Throws an error if the closeArduino method encounters an error.
+     **/
+    close(): Promise<boolean>;
+    /**
+     * Establishes a fake connection to an Arduino for testing purposes.
+     * Creates a fake SerialPort instance with custom write and string methods.
+     *
+     * @async
+     * @param {string} serial - The device identifier of the fake Arduino.
+     * @returns {Promise<boolean>} Resolves with 'true' if the fake connection is established successfully.
+     **/
+    fakeConnect(device: string): Promise<boolean>;
+    /**
+     * Connect to an Arduino using async/await
+     *
+     * @param  {string}  device 	Arduino identifier
+     *
+     * @returns {Promise} Resolves after opening
+     **/
+    private openArduino;
+    /**
+     * Close a connection to an Arduino using async/await
+     *
+     * @param  {string}  device 	Arduino identifier
+     *
+     * @returns {Promise} Resolves after closing
+     **/
+    private closeArduino;
+    private lock;
+    private unlock;
+    private isLocked;
+}

app/lib/arduino/index.js

@@ -1,16 +1,25 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-//import Log = require('log');
+exports.Arduino = void 0;
+/**
+ * 2023-07-16 Clarification
+ *
+ * Previous versions of this script intermingled and even
+ * swapped the usage of the terms 'serial' and 'device'.
+ * From here on out, the terms will be used as such:
+ *
+ * serial - a hardware address of a serial port
+ * device - common name of a type of mcopy device (eg. camera,
+ * projector, light) that is aliased to a serial port
+ *
+ **/
 const delay_1 = require("delay");
-const SerialPort = require('serialport');
-const Readline = SerialPort.parsers.Readline;
-const exec = require('child_process').exec;
-const parser = new Readline('');
+const log_1 = require("log");
+const { SerialPort } = require('serialport');
+const { ReadlineParser } = require('@serialport/parser-readline');
+const parser = new ReadlineParser({ delimiter: '\r\n' });
 const newlineRe = new RegExp('\n', 'g');
 const returnRe = new RegExp('\r', 'g');
-let eventEmitter;
-let cfg;
-let arduino;
 const KNOWN = [
     '/dev/tty.usbmodem1a161',
     '/dev/tty.usbserial-A800f8dk',
@@ -21,30 +30,36 @@ const KNOWN = [
     '/dev/ttyACM0',
     'COM3'
 ];
+/** @module lib/arduino */
 /**
- * Class representing the arduino communication features
- **/
+ * Class representing the arduino communication features.
+ */
 class Arduino {
-    constructor(errorState) {
+    constructor(cfg, ee, errorState) {
         this.path = {};
         this.known = KNOWN;
-        this.alias = {};
-        this.serial = { connect: {}, projector: {}, camera: {}, light: {} };
+        this.serial = {};
         this.baud = 57600;
         this.queue = {};
         this.timer = 0;
-        this.lock = false;
         this.locks = {};
+        this.alias = {};
+        this.stateStr = {};
+        this.hasState = {};
+        this.cfg = cfg;
+        this.eventEmitter = ee;
         this.errorState = errorState;
         this.init();
     }
     async init() {
-        const Log = require('log');
-        this.log = await Log({ label: 'arduino' });
+        this.log = await (0, log_1.Log)({ label: 'arduino' });
+        this.keys = Object.keys(this.cfg.arduino.cmd);
+        this.values = this.keys.map((key) => this.cfg.arduino.cmd[key]);
     }
     /**
      * Enumerate all connected devices that might be Arduinos
      *
+     * @async
      * @returns {Promise} Resolves after enumerating
      **/
     async enumerate() {
@@ -85,63 +100,149 @@ class Arduino {
     /**
      * Send a command to an Arduino using async/await
      *
-     * @param  {string}  device 	Arduino identifier
+     * @param  {string}  device 	The Arduino device identifier
      * @param  {string}  cmd 		Single character command to send
      *
+     * @async
      * @returns {Promise} Resolves after sending
      **/
     async sendAsync(device, cmd) {
         return new Promise((resolve, reject) => {
+            //this.log.info(`sendAsync ${cmd} -> ${device}`)
             this.queue[cmd] = (ms) => {
                 return resolve(ms);
             };
-            return this.serial[device].write(cmd, (err, results) => {
+            //this.log.info(`Device: ${device}`)
+            return this.serial[this.alias[device]].write(cmd, (err, results) => {
                 if (err) {
-                    //console.error(err)
+                    //this.log.error(err)
                     return reject(err);
                 }
-                //
             });
         });
     }
-    async send(serial, cmd) {
-        const device = this.alias[serial];
-        let results;
-        console.log(`${cmd} -> ${serial}`);
-        if (this.locks[serial]) {
-            return false;
+    /**
+     * Sends a command to the specified Arduino and waits for a response.
+     * Handles the communication lock to prevent sending multiple commands simultaneously.
+     * Emits an 'arduino_send' event after successfully sending the command.
+     *
+     * @async
+     * @param {string} device - The Arduino device identifier.
+     * @param {string} cmd - The command to be sent to the Arduino.
+     * @returns {Promise<boolean|string>} Returns 'false' if the communication is locked, otherwise returns the response from the device.
+     * @throws {Error} Throws an error if the sendAsync method encounters an error.
+     **/
+    async send(device, cmd) {
+        const serial = this.alias[device];
+        let ms;
+        this.log.info(`send ${cmd} -> ${device}`);
+        if (this.isLocked(serial)) {
+            this.log.error(`send Serial ${serial} is locked`);
+            return 0;
         }
         this.timer = new Date().getTime();
-        this.locks[serial] = true;
-        await delay_1.delay(cfg.arduino.serialDelay);
+        this.lock(serial);
+        await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
         try {
-            results = await this.sendAsync(device, cmd);
+            ms = await this.sendAsync(device, cmd);
         }
         catch (e) {
-            return console.error(e);
+            this.log.error(`Failed to send to ${device} @ ${serial}`, e);
+            return 0;
         }
-        this.locks[serial] = false;
-        await eventEmitter.emit('arduino_send', cmd);
-        return results;
+        this.unlock(serial);
+        await this.eventEmitter.emit('arduino_send', cmd);
+        return ms;
     }
-    async string(serial, str) {
-        const device = this.alias[serial];
-        let writeSuccess;
-        await delay_1.delay(cfg.arduino.serialDelay);
-        if (typeof this.serial[device].fake !== 'undefined'
-            && this.serial[device].fake) {
-            return this.serial[device].string(str);
+    /**
+     * Sends a string to the specified Arduino.
+     * Handles different types of devices, including fake devices for testing purposes.
+     * Waits for a specified delay before sending the string.
+     *
+     * @async
+     * @param {string} device - The Arduino device identifier.
+     * @param {string} str - The string to be sent to the Arduino.
+     * @returns {Promise<boolean|string>} Returns 'true' if the string is sent successfully, otherwise returns an error message.
+     * @throws {Error} Throws an error if the writeAsync method encounters an error.
+     **/
+    async sendString(device, str) {
+        let ms;
+        await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+        if (typeof this.serial[this.alias[device]].fake !== 'undefined'
+            && this.serial[this.alias[device]].fake) {
+            return this.serial[this.alias[device]].string(str);
         }
         else {
+            this.log.info(`sendString ${str} -> ${device}`);
             try {
-                writeSuccess = await this.writeAsync(device, str);
+                ms = await this.writeAsync(device, str);
             }
             catch (e) {
-                return console.error(e);
+                this.log.error(`Error sending string to ${device}`, e);
+                return 0;
             }
-            return writeSuccess;
+            this.unlock(this.alias[device]);
+            return ms;
         }
     }
+    /**
+     *
+     **/
+    async stateAsync(device, confirm = false) {
+        const cmd = this.cfg.arduino.cmd.state;
+        const serial = confirm ? this.alias['connect'] : this.alias[device];
+        return new Promise((resolve, reject) => {
+            this.queue[cmd] = (state) => {
+                this.stateStr[device] = state;
+                if (confirm) {
+                    this.hasState[device] = true;
+                    this.log.info(`Device ${device} supports state [${state}]`);
+                }
+                return resolve(state);
+            };
+            if (confirm) {
+                setTimeout(function () {
+                    if (typeof this.queue[cmd] !== 'undefined') {
+                        delete this.queue[cmd];
+                        this.hasState[device] = false;
+                        this.log.info(`Device ${device} does not support state`);
+                        return resolve(null);
+                    }
+                }.bind(this), 1000);
+            }
+            this.log.info(`stateAsync ${cmd} -> ${device}`);
+            return this.serial[serial].write(cmd, (err, results) => {
+                if (err) {
+                    //this.log.error(err)
+                    return reject(err);
+                }
+            });
+        });
+    }
+    /**
+     *
+     **/
+    async state(device, confirm = false) {
+        const serial = confirm ? this.alias['connect'] : this.alias[device];
+        let results;
+        if (this.isLocked(serial)) {
+            this.log.warn(`state Serial ${serial} is locked`);
+            return null;
+        }
+        this.timer = new Date().getTime();
+        this.lock(serial);
+        await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+        try {
+            results = await this.stateAsync(device, confirm);
+        }
+        catch (e) {
+            this.log.error(`Error getting state from ${device}`, e);
+            return null;
+        }
+        this.unlock(serial);
+        await this.eventEmitter.emit('arduino_state', this.cfg.arduino.cmd.state);
+        return results;
+    }
     /**
      * Send a string to an Arduino using async/await
      *
@@ -152,7 +253,7 @@ class Arduino {
      **/
     async writeAsync(device, str) {
         return new Promise((resolve, reject) => {
-            this.serial[device].write(str, function (err, results) {
+            this.serial[this.alias[device]].write(str, function (err, results) {
                 if (err) {
                     return reject(err);
                 }
@@ -160,59 +261,104 @@ class Arduino {
             });
         });
     }
+    /**
+     * Handles the end of communication with the Arduino.
+     * Calculates the time taken for the communication, executes the callback,
+     * and emits an 'arduino_end' event. Handles errors and stray data received.
+     *
+     * @param {string} serial - The serial address of the Arduino device.
+     * @param {string} data - The data received from the Arduino.
+     * @returns {any} The time taken for the communication in milliseconds.
+     **/
     end(serial, data) {
         const end = new Date().getTime();
         const ms = end - this.timer;
         let complete;
-        console.log(`${serial} -> ${data}`);
+        //this.log.info(`end ${serial} -> ${data}`)
         if (this.queue[data] !== undefined) {
-            this.locks[serial] = false;
+            this.unlock(serial);
             complete = this.queue[data](ms); //execute callback
-            eventEmitter.emit('arduino_end', data);
+            this.eventEmitter.emit('arduino_end', data);
             delete this.queue[data];
         }
-        else if (data === 'E') {
+        else if (data[0] === this.cfg.arduino.cmd.state) {
+            //this.log.info(`end serial -> ${serial}`)
+            this.unlock(serial);
+            complete = this.queue[this.cfg.arduino.cmd.state](data);
+            this.eventEmitter.emit('arduino_end', data);
+            delete this.queue[this.cfg.arduino.cmd.state];
+            return data;
+        }
+        else if (data[0] === this.cfg.arduino.cmd.error) {
+            this.log.error(`Received error from device ${serial}`);
+            this.unlock(serial);
+            this.error(serial, data);
             //error state
             //stop sequence
             //throw error in ui
         }
         else {
-            //console.log('Received stray "' + data + '"'); //silent to user
+            this.log.info('Received stray "' + data + '"'); //silent to user
         }
         return ms;
     }
-    aliasSerial(serial, device) {
-        //this.log.info(`Making "${serial}" an alias of ${device}`);
-        this.alias[serial] = device;
+    error(serial, data) {
+        this.log.error("ERROR", data);
     }
-    async connect(serial, device, confirm) {
+    /**
+     * Associates an alias with an Arduinos serial address.
+     * Used to map multi-purpose devices onto the same serial connection.
+     *
+     * @param {string} device - The serial number of the target Arduino.
+     * @param {string} serial - The alias to be associated with the target device.
+     **/
+    aliasSerial(device, serial) {
+        //this.log.info(`Making "${serial}" an alias of ${device}`)
+        this.alias[device] = serial;
+    }
+    /**
+     * Connects to an Arduino using its serial number.
+     * Sets up the SerialPort instance and path for the device, and handles data communication.
+     * Handles opening the connection and emitting 'arduino_end' or 'confirmEnd' events upon receiving data.
+     *
+     * @async
+     * @param {string} device - The device identifier (common name).
+     * @param {string} serial - The serial address of the target Arduino (e.g., COM port on Windows).
+     * @param {function} confirm - A callback function to be executed upon receiving confirmation data.
+     * @returns {Promise<string>} Resolves with the device path if the connection is successful.
+     * @throws {Error} Rejects with an error message if the connection fails.
+     **/
+    async connect(device, serial, confirm) {
+        //this.log.info(`connect device ${device}`)
+        //this.log.info(`connect serial ${serial}`)
         return new Promise(async (resolve, reject) => {
             let connectSuccess;
-            this.path[serial] = device;
-            this.alias[serial] = device;
-            this.serial[device] = new SerialPort(this.path[serial], {
+            this.path[device] = serial;
+            this.aliasSerial(device, serial);
+            this.serial[serial] = new SerialPort({
+                path: serial,
                 autoOpen: false,
-                baudRate: cfg.arduino.baud,
-                parser: parser
+                baudRate: this.cfg.arduino.baud,
+                parser
             });
-            this.locks[device] = false;
+            this.unlock(serial);
             try {
                 connectSuccess = await this.openArduino(device);
             }
             catch (e) {
-                console.error('failed to open: ' + e);
+                this.log.error(`Failed to open ${device} @ ${serial}: ` + e);
                 return reject(e);
             }
-            //console.log(`Opened connection with ${this.path[serial]} as ${serial}`);
+            this.log.info(`Opened connection with ${this.path[device]} as ${device}`);
             if (!confirm) {
-                this.serial[device].on('data', async (data) => {
+                this.serial[this.alias[device]].on('data', async (data) => {
                     let d = data.toString('utf8');
                     d = d.replace(newlineRe, '').replace(returnRe, '');
                     return this.end(serial, d);
                 });
             }
             else {
-                this.serial[device].on('data', async (data) => {
+                this.serial[this.alias[device]].on('data', async (data) => {
                     let d = data.toString('utf8');
                     d = d.replace(newlineRe, '').replace(returnRe, '');
                     return await this.confirmEnd(d);
@@ -221,46 +367,47 @@ class Arduino {
             return resolve(this.path[serial]);
         });
     }
+    /**
+     * Handles the confirmation data received from an Arduino.
+     * Executes the confirmation callback function if the received data is present in the list of expected values.
+     *
+     * @param {string} data - The data received from the Arduino.
+     **/
     confirmEnd(data) {
-        //console.dir(data)
-        if (data === cfg.arduino.cmd.connect
-            || data === cfg.arduino.cmd.projector_identifier
-            || data === cfg.arduino.cmd.camera_identifier
-            || data === cfg.arduino.cmd.light_identifier
-            || data === cfg.arduino.cmd.projector_light_identifier
-            || data === cfg.arduino.cmd.projector_camera_light_identifier
-            || data === cfg.arduino.cmd.projector_camera_identifier
-            || data === cfg.arduino.cmd.projector_second_identifier
-            || data === cfg.arduino.cmd.projectors_identifier
-            || data === cfg.arduino.cmd.projector_second_forward
-            || data === cfg.arduino.cmd.projector_second_backward
-            || data === cfg.arduino.cmd.projector_second
-            || data === cfg.arduino.cmd.projectors
-            || data === cfg.arduino.cmd.camera_second_identifier
-            || data === cfg.arduino.cmd.cameras_identifier
-            || data === cfg.arduino.cmd.camera_second_forward
-            || data === cfg.arduino.cmd.camera_second_backward
-            || data === cfg.arduino.cmd.camera_second
-            || data === cfg.arduino.cmd.cameras) {
+        if (this.values.indexOf(data) !== -1 && typeof this.confirmExec === 'function') {
             this.confirmExec(null, data);
-            this.confirmExec = {};
+            this.confirmExec = null;
+            this.unlock(this.alias['connect']);
+        }
+        else if (data[0] === this.cfg.arduino.cmd.state) {
+            this.queue[this.cfg.arduino.cmd.state](data);
+            delete this.queue[this.cfg.arduino.cmd.state];
+            this.unlock(this.alias['connect']);
         }
     }
+    /**
+     * Verifies the connection to an Arduino by sending a connect command.
+     * The confirmation callback checks if the received data matches the expected connect command.
+     *
+     * @async
+     * @returns {Promise<boolean>} Resolves with 'true' if the connection is verified successfully.
+     * @throws {Error} Rejects with an error message if the connection verification fails.
+     **/
     async verify() {
         return new Promise(async (resolve, reject) => {
-            const device = this.alias['connect'];
+            const device = 'connect';
             let writeSuccess;
             this.confirmExec = function (err, data) {
-                if (data === cfg.arduino.cmd.connect) {
+                if (data === this.cfg.arduino.cmd.connect) {
                     return resolve(true);
                 }
                 else {
                     return reject('Wrong data returned');
                 }
             };
-            await delay_1.delay(cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             try {
-                writeSuccess = await this.sendAsync(device, cfg.arduino.cmd.connect);
+                writeSuccess = await this.sendAsync(device, this.cfg.arduino.cmd.connect);
             }
             catch (e) {
                 return reject(e);
@@ -268,64 +415,92 @@ class Arduino {
             return resolve(writeSuccess);
         });
     }
+    /**
+     * Distinguishes the type of Arduino connected.
+     * Sends a command to the device to identify its type and resolves the promise with the received type.
+     *
+     * @async
+     * @returns {Promise<string>} Resolves with the type of the connected Arduino-based device.
+     * @throws {Error} Rejects with an error message if the distinguish operation fails.
+     **/
     async distinguish() {
         return new Promise(async (resolve, reject) => {
-            const device = this.alias['connect'];
+            const device = 'connect';
             let writeSuccess;
             let type;
             this.confirmExec = function (err, data) {
-                if (data === cfg.arduino.cmd.projector_identifier) {
+                if (data === this.cfg.arduino.cmd.projector_identifier) {
                     type = 'projector';
                 }
-                else if (data === cfg.arduino.cmd.camera_identifier) {
+                else if (data === this.cfg.arduino.cmd.camera_identifier) {
                     type = 'camera';
                 }
-                else if (data === cfg.arduino.cmd.light_identifier) {
+                else if (data === this.cfg.arduino.cmd.light_identifier) {
                     type = 'light';
                 }
-                else if (data === cfg.arduino.cmd.projector_light_identifier) {
+                else if (data === this.cfg.arduino.cmd.projector_light_identifier) {
                     type = 'projector,light';
                 }
-                else if (data === cfg.arduino.cmd.projector_camera_light_identifier) {
+                else if (data === this.cfg.arduino.cmd.projector_camera_light_identifier) {
                     type = 'projector,camera,light';
                 }
-                else if (data === cfg.arduino.cmd.projector_camera_identifier) {
+                else if (data === this.cfg.arduino.cmd.projector_camera_identifier) {
                     type = 'projector,camera';
                 }
-                else if (data === cfg.arduino.cmd.projector_second_identifier) {
+                else if (data === this.cfg.arduino.cmd.projector_second_identifier) {
                     type = 'projector_second';
                 }
-                else if (data === cfg.arduino.cmd.projectors_identifier) {
+                else if (data === this.cfg.arduino.cmd.projectors_identifier) {
                     type = 'projector,projector_second';
                 }
-                else if (data === cfg.arduino.cmd.camera_second_identifier) {
+                else if (data === this.cfg.arduino.cmd.camera_second_identifier) {
                     type = 'camera_second';
                 }
-                else if (data === cfg.arduino.cmd.cameras_identifier) {
+                else if (data === this.cfg.arduino.cmd.cameras_identifier) {
                     type = 'camera,camera_second';
                 }
-                else if (data === cfg.arduino.cmd.camera_projectors_identifier) {
+                else if (data === this.cfg.arduino.cmd.camera_projectors_identifier) {
                     type = 'camera,projector,projector_second';
                 }
-                else if (data === cfg.arduino.cmd.cameras_projector_identifier) {
+                else if (data === this.cfg.arduino.cmd.cameras_projector_identifier) {
                     type = 'camera,camera_second,projector';
                 }
-                else if (data === cfg.arduino.cmd.cameras_projectors_identifier) {
+                else if (data === this.cfg.arduino.cmd.cameras_projectors_identifier) {
                     type = 'camera,camera_second,projector,projector_second';
                 }
+                else if (data === this.cfg.arduino.cmd.capper_identifier) {
+                    type = 'capper';
+                }
+                else if (data === this.cfg.arduino.cmd.camera_capper_identifier) {
+                    type = 'camera,capper';
+                }
+                else if (data === this.cfg.arduino.cmd.camera_capper_projector_identifier) {
+                    type = 'camera,capper,projector';
+                }
+                else if (data === this.cfg.arduino.cmd.camera_capper_projectors_identifier) {
+                    type = 'camera,capper,projector,projector_second';
+                }
                 return resolve(type);
             };
-            await delay_1.delay(cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             try {
-                writeSuccess = await this.sendAsync(device, cfg.arduino.cmd.mcopy_identifier);
+                writeSuccess = await this.sendAsync(device, this.cfg.arduino.cmd.mcopy_identifier);
+                this.log.info(writeSuccess);
             }
             catch (e) {
                 return reject(e);
             }
         });
     }
+    /**
+     * Closes the connection to an Arduino.
+     *
+     * @async
+     * @returns {Promise<boolean>} Resolves with 'true' if the connection is closed successfully.
+     * @throws {Error} Throws an error if the closeArduino method encounters an error.
+     **/
     async close() {
-        const device = this.alias['connect'];
+        const device = 'connect';
         let closeSuccess;
         try {
             closeSuccess = await this.closeArduino(device);
@@ -335,31 +510,40 @@ class Arduino {
         }
         return closeSuccess;
     }
-    ;
-    async fakeConnect(serial) {
-        const device = '/dev/fake';
-        this.alias[serial] = device;
-        this.serial[device] = {
+    /**
+     * Establishes a fake connection to an Arduino for testing purposes.
+     * Creates a fake SerialPort instance with custom write and string methods.
+     *
+     * @async
+     * @param {string} serial - The device identifier of the fake Arduino.
+     * @returns {Promise<boolean>} Resolves with 'true' if the fake connection is established successfully.
+     **/
+    async fakeConnect(device) {
+        const serial = '/dev/fake';
+        this.aliasSerial(device, serial);
+        this.serial[serial] = {
             write: async function (cmd, cb) {
                 const t = {
-                    c: cfg.arduino.cam.time + cfg.arduino.cam.delay,
-                    p: cfg.arduino.proj.time + cfg.arduino.proj.delay
+                    c: this.cfg.arduino.cam.time + this.cfg.arduino.cam.delay,
+                    p: this.cfg.arduino.proj.time + this.cfg.arduino.proj.delay,
+                    A: 180,
+                    B: 180
                 };
                 let timeout = t[cmd];
                 if (typeof timeout === 'undefined')
                     timeout = 10;
-                arduino.timer = +new Date();
-                await delay_1.delay(timeout);
-                arduino.end(serial, cmd);
+                this.timer = +new Date();
+                await (0, delay_1.delay)(timeout);
+                this.end(serial, cmd);
                 return cb();
-            },
+            }.bind(this),
             string: async function (str) {
                 //do nothing
                 return true;
             },
             fake: true
         };
-        //console.log('Connected to fake arduino! Not real! Does not exist!');
+        //this.log.info('Connected to fake arduino! Not real! Does not exist!')
         return true;
     }
     /**
@@ -371,7 +555,7 @@ class Arduino {
      **/
     async openArduino(device) {
         return new Promise((resolve, reject) => {
-            return this.serial[device].open((err) => {
+            return this.serial[this.alias[device]].open((err) => {
                 if (err) {
                     return reject(err);
                 }
@@ -388,7 +572,7 @@ class Arduino {
      **/
     async closeArduino(device) {
         return new Promise((resolve, reject) => {
-            return this.serial[device].close((err) => {
+            return this.serial[this.alias[device]].close((err) => {
                 if (err) {
                     return reject(err);
                 }
@@ -396,13 +580,18 @@ class Arduino {
             });
         });
     }
+    lock(serial) {
+        //this.log.info(`Locked serial ${serial}`)
+        this.locks[serial] = true;
+    }
+    unlock(serial) {
+        //this.log.info(`Unlocked serial ${serial}`)
+        this.locks[serial] = false;
+    }
+    isLocked(serial) {
+        return typeof this.locks[serial] !== 'undefined' && this.locks[serial] === true;
+    }
 }
-if (typeof module !== 'undefined' && module.parent) {
-    module.exports = function (c, ee, errorState) {
-        eventEmitter = ee;
-        cfg = c;
-        arduino = new Arduino(errorState);
-        return arduino;
-    };
-}
+exports.Arduino = Arduino;
+module.exports = { Arduino };
 //# sourceMappingURL=index.js.map

app/lib/cam/Readme.md

@@ -1,49 +1,76 @@
-<a name="Camera"></a>
+<a name="module_lib/cam"></a>
 
-## Camera
-class representing camera functions
+## lib/cam
 
-**Kind**: global class  
+* [lib/cam](#module_lib/cam)
+    * [~Camera](#module_lib/cam..Camera)
+        * [.init()](#module_lib/cam..Camera+init)
+        * [.listen()](#module_lib/cam..Camera+listen)
+        * [.set()](#module_lib/cam..Camera+set)
+        * [.cap()](#module_lib/cam..Camera+cap)
+        * [.move()](#module_lib/cam..Camera+move)
+        * [.exposure()](#module_lib/cam..Camera+exposure)
+        * [.connectIntval()](#module_lib/cam..Camera+connectIntval)
+        * [.connectProcessing()](#module_lib/cam..Camera+connectProcessing)
+        * [.listener()](#module_lib/cam..Camera+listener)
+        * [.end()](#module_lib/cam..Camera+end)
 
-* [Camera](#Camera)
-    * [.init()](#Camera+init)
-    * [.listen()](#Camera+listen)
-    * [.set()](#Camera+set)
-    * [.move()](#Camera+move)
-    * [.exposure()](#Camera+exposure)
-    * [.connectIntval()](#Camera+connectIntval)
-    * [.listener()](#Camera+listener)
-    * [.end()](#Camera+end)
+<a name="module_lib/cam..Camera"></a>
 
-<a name="Camera+init"></a>
+### lib/cam~Camera
+Class representing camera functions.
 
-### camera.init()
-**Kind**: instance method of [<code>Camera</code>](#Camera)  
-<a name="Camera+listen"></a>
+**Kind**: inner class of [<code>lib/cam</code>](#module_lib/cam)  
 
-### camera.listen()
-**Kind**: instance method of [<code>Camera</code>](#Camera)  
-<a name="Camera+set"></a>
+* [~Camera](#module_lib/cam..Camera)
+    * [.init()](#module_lib/cam..Camera+init)
+    * [.listen()](#module_lib/cam..Camera+listen)
+    * [.set()](#module_lib/cam..Camera+set)
+    * [.cap()](#module_lib/cam..Camera+cap)
+    * [.move()](#module_lib/cam..Camera+move)
+    * [.exposure()](#module_lib/cam..Camera+exposure)
+    * [.connectIntval()](#module_lib/cam..Camera+connectIntval)
+    * [.connectProcessing()](#module_lib/cam..Camera+connectProcessing)
+    * [.listener()](#module_lib/cam..Camera+listener)
+    * [.end()](#module_lib/cam..Camera+end)
 
-### camera.set()
-**Kind**: instance method of [<code>Camera</code>](#Camera)  
-<a name="Camera+move"></a>
+<a name="module_lib/cam..Camera+init"></a>
 
-### camera.move()
-**Kind**: instance method of [<code>Camera</code>](#Camera)  
-<a name="Camera+exposure"></a>
+#### camera.init()
+**Kind**: instance method of [<code>Camera</code>](#module_lib/cam..Camera)  
+<a name="module_lib/cam..Camera+listen"></a>
 
-### camera.exposure()
-**Kind**: instance method of [<code>Camera</code>](#Camera)  
-<a name="Camera+connectIntval"></a>
+#### camera.listen()
+**Kind**: instance method of [<code>Camera</code>](#module_lib/cam..Camera)  
+<a name="module_lib/cam..Camera+set"></a>
 
-### camera.connectIntval()
-**Kind**: instance method of [<code>Camera</code>](#Camera)  
-<a name="Camera+listener"></a>
+#### camera.set()
+**Kind**: instance method of [<code>Camera</code>](#module_lib/cam..Camera)  
+<a name="module_lib/cam..Camera+cap"></a>
 
-### camera.listener()
-**Kind**: instance method of [<code>Camera</code>](#Camera)  
-<a name="Camera+end"></a>
+#### camera.cap()
+**Kind**: instance method of [<code>Camera</code>](#module_lib/cam..Camera)  
+<a name="module_lib/cam..Camera+move"></a>
 
-### camera.end()
-**Kind**: instance method of [<code>Camera</code>](#Camera)  
+#### camera.move()
+**Kind**: instance method of [<code>Camera</code>](#module_lib/cam..Camera)  
+<a name="module_lib/cam..Camera+exposure"></a>
+
+#### camera.exposure()
+**Kind**: instance method of [<code>Camera</code>](#module_lib/cam..Camera)  
+<a name="module_lib/cam..Camera+connectIntval"></a>
+
+#### camera.connectIntval()
+**Kind**: instance method of [<code>Camera</code>](#module_lib/cam..Camera)  
+<a name="module_lib/cam..Camera+connectProcessing"></a>
+
+#### camera.connectProcessing()
+**Kind**: instance method of [<code>Camera</code>](#module_lib/cam..Camera)  
+<a name="module_lib/cam..Camera+listener"></a>
+
+#### camera.listener()
+**Kind**: instance method of [<code>Camera</code>](#module_lib/cam..Camera)  
+<a name="module_lib/cam..Camera+end"></a>
+
+#### camera.end()
+**Kind**: instance method of [<code>Camera</code>](#module_lib/cam..Camera)  

app/lib/cam/index.d.ts

@@ -0,0 +1,71 @@
+import type { Arduino } from 'arduino';
+import type { FilmOut } from 'filmout';
+import type { Config } from 'cfg';
+import type { WebContents } from 'electron';
+interface CameraState {
+    pos: number;
+    dir: boolean;
+    capper: boolean;
+}
+/** @module lib/cam */
+/**
+ * Class representing camera functions.
+ */
+export declare class Camera {
+    state: CameraState;
+    arduino: Arduino;
+    private intval;
+    private processing;
+    private log;
+    private cfg;
+    private filmout;
+    private ui;
+    private ipc;
+    private id;
+    /**
+     *
+     **/
+    constructor(arduino: Arduino, cfg: Config, ui: WebContents, filmout: FilmOut, second?: boolean);
+    /**
+     *
+     **/
+    private init;
+    /**
+     *
+     **/
+    private listen;
+    /**
+     *
+     **/
+    set(dir: boolean, id: string): Promise<number>;
+    /**
+     *
+     **/
+    cap(state: boolean, id: string): Promise<number>;
+    /**
+     *
+     **/
+    move(id: string): Promise<number>;
+    both(id: string): Promise<number>;
+    /**
+     *
+     **/
+    exposure(exposure: number, id: string): Promise<number>;
+    /**
+     *
+     **/
+    private connectIntval;
+    /**
+     *
+     **/
+    private connectProcessing;
+    /**
+     *
+     **/
+    private listener;
+    /**
+     *
+     **/
+    private end;
+}
+export {};

app/lib/cam/index.js

@@ -1,7 +1,15 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Camera = void 0;
+const electron_1 = require("electron");
 const intval_1 = require("intval");
-/** class representing camera functions **/
+const processing_1 = require("processing");
+const delay_1 = require("delay");
+const log_1 = require("log");
+/** @module lib/cam */
+/**
+ * Class representing camera functions.
+ */
 class Camera {
     /**
      *
@@ -9,10 +17,13 @@ class Camera {
     constructor(arduino, cfg, ui, filmout, second = false) {
         this.state = {
             pos: 0,
-            dir: true
+            dir: true,
+            capper: false
         };
         this.arduino = null;
         this.intval = null;
+        this.processing = null;
+        this.ipc = electron_1.ipcMain;
         this.id = 'camera';
         this.arduino = arduino;
         this.cfg = cfg;
@@ -26,9 +37,7 @@ class Camera {
      *
      **/
     async init() {
-        const Log = require('log');
-        this.log = await Log({ label: this.id });
-        this.ipc = require('electron').ipcMain;
+        this.log = await (0, log_1.Log)({ label: this.id });
         this.listen();
     }
     /**
@@ -37,6 +46,7 @@ class Camera {
     listen() {
         this.ipc.on(this.id, this.listener.bind(this));
         this.ipc.on('intval', this.connectIntval.bind(this));
+        this.ipc.on('processing', this.connectProcessing.bind(this));
     }
     /**
      *
@@ -51,7 +61,15 @@ class Camera {
             cmd = this.cfg.arduino.cmd[`${this.id}_backward`];
         }
         this.state.dir = dir;
-        if (this.intval) {
+        if (this.processing) {
+            try {
+                ms = await this.processing.setDir(dir);
+            }
+            catch (err) {
+                this.log.error(err);
+            }
+        }
+        else if (this.intval) {
             try {
                 ms = await this.intval.setDir(dir);
             }
@@ -72,18 +90,47 @@ class Camera {
     /**
      *
      **/
-    async move(frame, id) {
+    async cap(state, id) {
+        let cmd;
+        let ms;
+        if (state) {
+            cmd = this.cfg.arduino.cmd[`${this.id}_forward`];
+        }
+        else {
+            cmd = this.cfg.arduino.cmd[`${this.id}_backward`];
+        }
+        this.state.capper = state;
+        try {
+            ms = await this.arduino.send(this.id, cmd);
+        }
+        catch (err) {
+            this.log.error(err);
+        }
+        return await this.end(cmd, id, ms);
+    }
+    /**
+     *
+     **/
+    async move(id) {
         const cmd = this.cfg.arduino.cmd[this.id];
         let ms;
         if (this.filmout.state.enabled) {
             await this.filmout.start();
         }
-        if (this.intval) {
+        if (this.processing) {
+            try {
+                ms = await this.processing.move();
+            }
+            catch (err) {
+                this.log.error(err);
+            }
+        }
+        else if (this.intval) {
             try {
                 ms = await this.intval.move();
             }
             catch (err) {
-                this.log.error(err);
+                this.log.error(`Error moving intval ${this.id}: ${id}`, err);
             }
         }
         else {
@@ -101,14 +148,14 @@ class Camera {
         //this.log.info('Camera move time', { ms });
         return this.end(cmd, id, ms);
     }
-    async both(frame, id) {
+    async both(id) {
         const cmd = this.cfg.arduino.cmd[id];
         let ms;
         try {
             ms = await this.arduino.send(this.id, cmd);
         }
         catch (err) {
-            this.log.error(`Error moving ${this.id}`, err);
+            this.log.error(`Error moving both ${this.id}: ${id}`, err);
         }
         //this.log.info('Cameras move time', { ms });
         return await this.end(cmd, id, ms);
@@ -116,11 +163,55 @@ class Camera {
     /**
      *
      **/
-    exposure(exposure, id) {
-        let cmd = 'E';
-        this.intval.setExposure(this.id, exposure, (ms) => {
-            this.end(cmd, id, ms);
-        });
+    async exposure(exposure, id) {
+        const cmd = this.cfg.arduino.cmd.camera_exposure;
+        const str = `${exposure}`;
+        const started = +new Date();
+        let ms;
+        let confirmState;
+        let parts;
+        let confirmExposure;
+        if (this.intval) {
+            return this.intval.setExposure(exposure, (ms) => {
+                this.ui.send('timing', { c: 'c', ms: exposure });
+                return this.end(cmd, id, ms);
+            });
+        }
+        else if (this.arduino.hasState[this.id]) {
+            try {
+                ms = this.arduino.send(this.id, cmd);
+            }
+            catch (err) {
+                this.log.error('Error sending camera exposure command', err);
+            }
+            await (0, delay_1.delay)(1);
+            try {
+                ms = await this.arduino.sendString(this.id, str);
+            }
+            catch (err) {
+                this.log.error('Error sending camera exposure string', err);
+            }
+            await ms;
+            await (0, delay_1.delay)(1);
+            try {
+                confirmState = await this.arduino.state(this.id, false);
+            }
+            catch (err) {
+                this.log.error(`Error confirming set state`, err);
+            }
+            parts = this.arduino.stateStr[this.id].split('G');
+            if (parts.length > 1) {
+                parts = parts[1].split('H');
+                confirmExposure = parseInt(parts[0]);
+                if (!isNaN(confirmExposure)) {
+                    this.log.info(`Exposure successfully set to ${confirmExposure}ms`);
+                    this.ui.send('timing', { c: 'c', ms: exposure });
+                }
+            }
+            ms = (+new Date()) - started;
+            return await this.end(cmd, id, ms);
+        }
+        return 0;
     }
     /**
      *
@@ -129,6 +220,7 @@ class Camera {
         return new Promise((resolve, reject) => {
             if (arg.connect) {
                 this.intval = new intval_1.Intval(arg.url);
+                this.processing = null;
                 this.intval.connect((err, ms, state) => {
                     if (err) {
                         this.ui.send('intval', { connected: false });
@@ -148,6 +240,17 @@ class Camera {
             }
         });
     }
+    /**
+     *
+     **/
+    async connectProcessing(event, arg) {
+        return new Promise((resolve, reject) => {
+            this.processing = new processing_1.Processing(arg.url);
+            this.intval = null;
+            this.ui.send('processing', { connected: true, url: arg.url });
+            return resolve(true);
+        });
+    }
     /**
      *
      **/
@@ -160,9 +263,9 @@ class Camera {
                 this.log.error(err);
             }
         }
-        else if (typeof arg.frame !== 'undefined') {
+        else if (typeof arg.move !== 'undefined') {
             try {
-                await this.move(arg.frame, arg.id);
+                await this.move(arg.id);
             }
             catch (err) {
                 this.log.error(err);
@@ -171,6 +274,22 @@ class Camera {
         else if (typeof arg.val !== 'undefined') {
             this.state.pos = arg.val;
         }
+        else if (typeof arg.capper !== 'undefined') {
+            try {
+                await this.cap(arg.capper, arg.id);
+            }
+            catch (err) {
+                this.log.error(err);
+            }
+        }
+        else if (typeof arg.exposure !== 'undefined') {
+            try {
+                await this.exposure(arg.exposure, arg.id);
+            }
+            catch (err) {
+                this.log.error(err);
+            }
+        }
         event.returnValue = true;
     }
     /**
@@ -213,12 +332,15 @@ class Camera {
         else if (cmd === this.cfg.arduino.cmd.camerass) {
             message += 'Cameras both MOVED 1 frame each';
         }
+        else if (cmd === this.cfg.arduino.camera_exposure) {
+            message += 'Camera set exposure';
+        }
         message += ` ${ms}ms`;
         this.log.info(message);
-        this.ui.send(this.id, { cmd: cmd, id: id, ms: ms });
+        await this.ui.send(this.id, { cmd: cmd, id: id, ms: ms });
+        return ms;
     }
 }
-module.exports = function (arduino, cfg, ui, filmout, second) {
-    return new Camera(arduino, cfg, ui, filmout, second);
-};
+exports.Camera = Camera;
+module.exports = { Camera };
 //# sourceMappingURL=index.js.map

app/lib/capper/Readme.md

@@ -0,0 +1,46 @@
+<a name="module_lib/capper"></a>
+
+## lib/capper
+
+* [lib/capper](#module_lib/capper)
+    * [~Capper](#module_lib/capper..Capper)
+        * [.init()](#module_lib/capper..Capper+init)
+        * [.listen()](#module_lib/capper..Capper+listen)
+        * [.capper()](#module_lib/capper..Capper+capper)
+        * [.listener()](#module_lib/capper..Capper+listener)
+        * [.end()](#module_lib/capper..Capper+end)
+
+<a name="module_lib/capper..Capper"></a>
+
+### lib/capper~Capper
+Class representing capper functions.
+
+**Kind**: inner class of [<code>lib/capper</code>](#module_lib/capper)  
+
+* [~Capper](#module_lib/capper..Capper)
+    * [.init()](#module_lib/capper..Capper+init)
+    * [.listen()](#module_lib/capper..Capper+listen)
+    * [.capper()](#module_lib/capper..Capper+capper)
+    * [.listener()](#module_lib/capper..Capper+listener)
+    * [.end()](#module_lib/capper..Capper+end)
+
+<a name="module_lib/capper..Capper+init"></a>
+
+#### capper.init()
+**Kind**: instance method of [<code>Capper</code>](#module_lib/capper..Capper)  
+<a name="module_lib/capper..Capper+listen"></a>
+
+#### capper.listen()
+**Kind**: instance method of [<code>Capper</code>](#module_lib/capper..Capper)  
+<a name="module_lib/capper..Capper+capper"></a>
+
+#### capper.capper()
+**Kind**: instance method of [<code>Capper</code>](#module_lib/capper..Capper)  
+<a name="module_lib/capper..Capper+listener"></a>
+
+#### capper.listener()
+**Kind**: instance method of [<code>Capper</code>](#module_lib/capper..Capper)  
+<a name="module_lib/capper..Capper+end"></a>
+
+#### capper.end()
+**Kind**: instance method of [<code>Capper</code>](#module_lib/capper..Capper)  

app/lib/capper/index.d.ts

@@ -0,0 +1,45 @@
+import type { FilmOut } from 'filmout';
+import type { Arduino } from 'arduino';
+import type { WebContents } from 'electron';
+interface CapperState {
+    capper: boolean;
+}
+/** @module lib/capper */
+/**
+ * Class representing capper functions.
+ */
+export declare class Capper {
+    private state;
+    private arduino;
+    private log;
+    private cfg;
+    private filmout;
+    private ui;
+    private ipc;
+    private id;
+    /**
+     *
+     **/
+    constructor(arduino: Arduino, cfg: any, ui: WebContents, filmout: FilmOut);
+    /**
+     *
+     **/
+    private init;
+    /**
+     *
+     **/
+    private listen;
+    /**
+     *
+     **/
+    capper(state: boolean, id: string): Promise<number>;
+    /**
+     *
+     **/
+    private listener;
+    /**
+     *
+     **/
+    private end;
+}
+export type { CapperState };

app/lib/capper/index.js

@@ -0,0 +1,94 @@
+'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Capper = void 0;
+const electron_1 = require("electron");
+const log_1 = require("log");
+/** @module lib/capper */
+/**
+ * Class representing capper functions.
+ */
+class Capper {
+    /**
+     *
+     **/
+    constructor(arduino, cfg, ui, filmout) {
+        this.state = {
+            capper: false
+        };
+        this.arduino = null;
+        this.ipc = electron_1.ipcMain;
+        this.id = 'capper';
+        this.arduino = arduino;
+        this.cfg = cfg;
+        this.ui = ui;
+        this.filmout = filmout;
+        this.init();
+    }
+    /**
+     *
+     **/
+    async init() {
+        this.log = await (0, log_1.Log)({ label: this.id });
+        this.listen();
+    }
+    /**
+     *
+     **/
+    listen() {
+        this.ipc.on(this.id, this.listener.bind(this));
+    }
+    /**
+     *
+     **/
+    async capper(state, id) {
+        let cmd;
+        let ms;
+        if (state) {
+            cmd = this.cfg.arduino.cmd[`${this.id}_on`];
+        }
+        else {
+            cmd = this.cfg.arduino.cmd[`${this.id}_off`];
+        }
+        this.state.capper = state;
+        try {
+            ms = await this.arduino.send(this.id, cmd);
+        }
+        catch (err) {
+            this.log.error(err);
+        }
+        return await this.end(cmd, id, ms);
+    }
+    /**
+     *
+     **/
+    async listener(event, arg) {
+        if (typeof arg.state !== 'undefined') {
+            try {
+                await this.capper(arg.state, arg.id);
+            }
+            catch (err) {
+                this.log.error(err);
+            }
+        }
+        event.returnValue = true;
+    }
+    /**
+     *
+     **/
+    async end(cmd, id, ms) {
+        let message = '';
+        if (cmd === this.cfg.arduino.cmd.capper_on) {
+            message = 'Capper set to ON';
+        }
+        else if (cmd === this.cfg.arduino.cmd.capper_off) {
+            message = 'Capper set to OFF';
+        }
+        message += ` ${ms}ms`;
+        this.log.info(message);
+        await this.ui.send(this.id, { cmd: cmd, id: id, ms: ms });
+        return ms;
+    }
+}
+exports.Capper = Capper;
+module.exports = { Capper };
+//# sourceMappingURL=index.js.map

app/lib/capper/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/capper/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;AAEb,uCAAmC;AAInC,6BAA0B;AAW1B,yBAAyB;AAEzB;;GAEG;AAEH,MAAa,MAAM;IAWlB;;QAEI;IACJ,YAAa,OAAiB,EAAE,GAAS,EAAE,EAAgB,EAAE,OAAiB;QAbtE,UAAK,GAAiB;YAC7B,MAAM,EAAG,KAAK;SACd,CAAC;QACM,YAAO,GAAa,IAAI,CAAC;QAKzB,QAAG,GAAoB,kBAAO,CAAC;QAC/B,OAAE,GAAY,QAAQ,CAAC;QAK9B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,EAAE,CAAC;IACb,CAAC;IAED;;QAEI;IACI,KAAK,CAAC,IAAI;QACjB,IAAI,CAAC,GAAG,GAAG,MAAM,IAAA,SAAG,EAAC,EAAE,KAAK,EAAG,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,MAAM,EAAE,CAAC;IACf,CAAC;IAED;;QAEI;IACI,MAAM;QACb,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAChD,CAAC;IAED;;QAEI;IACI,KAAK,CAAC,MAAM,CAAE,KAAe,EAAE,EAAW;QACjD,IAAI,GAAY,CAAC;QACjB,IAAI,EAAW,CAAC;QAEhB,IAAI,KAAK,EAAE;YACV,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,KAAK,CAAC,CAAC;SAC5C;aAAM;YACN,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;SAC7C;QAED,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC;QAE1B,IAAI;YACH,EAAE,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;SAC3C;QAAC,OAAO,GAAG,EAAE;YACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACpB;QAED,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACpC,CAAC;IAED;;QAEI;IACI,KAAK,CAAC,QAAQ,CAAE,KAAoB,EAAE,GAAS;QACtD,IAAI,OAAO,GAAG,CAAC,KAAK,KAAK,WAAW,EAAE;YACrC,IAAI;gBACH,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;aACrC;YAAC,OAAO,GAAG,EAAE;gBACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACpB;SACD;QACD,KAAK,CAAC,WAAW,GAAG,IAAI,CAAA;IACzB,CAAC;IAED;;QAEI;IACI,KAAK,CAAC,GAAG,CAAE,GAAY,EAAE,EAAW,EAAE,EAAW;QACxD,IAAI,OAAO,GAAY,EAAE,CAAC;QAE1B,IAAI,GAAG,KAAK,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE;YAC3C,OAAO,GAAG,kBAAkB,CAAC;SAC7B;aAAM,IAAI,GAAG,KAAK,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE;YACnD,OAAO,GAAG,mBAAmB,CAAC;SAC9B;QAED,OAAO,IAAI,IAAI,EAAE,IAAI,CAAC;QAEtB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACvB,MAAM,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAC,GAAG,EAAE,GAAG,EAAE,EAAE,EAAG,EAAE,EAAE,EAAE,EAAE,EAAE,EAAC,CAAC,CAAC;QACzD,OAAO,EAAE,CAAC;IACX,CAAC;CACD;AA7FD,wBA6FC;AAED,MAAM,CAAC,OAAO,GAAG,EAAE,MAAM,EAAE,CAAA"}

app/lib/capper/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "capper",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}

app/lib/cfg/index.d.ts

@@ -0,0 +1,30 @@
+interface ConfigCommands {
+    [key: string]: string;
+}
+interface ConfigDeviceProfile {
+    time: number;
+    delay: number;
+    momentary: number;
+}
+interface ConfigBlackProfile {
+    before: number;
+    after: number;
+}
+interface ConfigProfile {
+    label: string;
+    cam: ConfigDeviceProfile;
+    proj?: ConfigDeviceProfile;
+    black?: ConfigBlackProfile;
+    light: boolean;
+}
+interface ConfigProfiles {
+    [key: string]: ConfigProfile;
+}
+interface Config {
+    version: string;
+    ext_port: number;
+    profiles: ConfigProfiles;
+    cmd: ConfigCommands;
+    arduino: any;
+}
+export type { Config };

app/lib/cfg/index.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=index.js.map

app/lib/cfg/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cfg/index.ts"],"names":[],"mappings":""}

app/lib/cmd/Readme.md

@@ -0,0 +1,267 @@
+<a name="module_lib/cmd"></a>
+
+## lib/cmd
+
+* [lib/cmd](#module_lib/cmd)
+    * [~Assign all connected devices and mock devices as private classes.](#module_lib/cmd..Assign all connected devices and mock devices as private classes.)
+        * [new Assign all connected devices and mock devices as private classes.(cfg, proj, cam, light, alert, cam2, proj2, capper)](#new_module_lib/cmd..Assign all connected devices and mock devices as private classes._new)
+    * [~Commands](#module_lib/cmd..Commands)
+        * [.projector_forward()](#module_lib/cmd..Commands+projector_forward) ⇒ <code>integer</code>
+        * [.projector_backward()](#module_lib/cmd..Commands+projector_backward) ⇒ <code>integer</code>
+        * [.camera_forward(cmd)](#module_lib/cmd..Commands+camera_forward) ⇒ <code>integer</code>
+        * [.black_forward()](#module_lib/cmd..Commands+black_forward) ⇒ <code>integer</code>
+        * [.camera_backward(cmd)](#module_lib/cmd..Commands+camera_backward) ⇒ <code>integer</code>
+        * [.black_backward()](#module_lib/cmd..Commands+black_backward) ⇒ <code>integer</code>
+        * [.camera_second_forward(cmd)](#module_lib/cmd..Commands+camera_second_forward) ⇒ <code>integer</code>
+        * [.camera_second_backward(cmd)](#module_lib/cmd..Commands+camera_second_backward) ⇒ <code>integer</code>
+        * [.cameras_forward(cmd)](#module_lib/cmd..Commands+cameras_forward) ⇒ <code>integer</code>
+        * [.cameras_backward(cmd)](#module_lib/cmd..Commands+cameras_backward) ⇒ <code>integer</code>
+        * [.camera_forward_camera_second_backward(cmd)](#module_lib/cmd..Commands+camera_forward_camera_second_backward) ⇒ <code>integer</code>
+        * [.camera_backward_camera_second_forward(cmd)](#module_lib/cmd..Commands+camera_backward_camera_second_forward) ⇒ <code>integer</code>
+        * [.projector_second_forward()](#module_lib/cmd..Commands+projector_second_forward) ⇒ <code>integer</code>
+        * [.projector_second_backward()](#module_lib/cmd..Commands+projector_second_backward) ⇒ <code>integer</code>
+        * [.projectors_forward()](#module_lib/cmd..Commands+projectors_forward) ⇒ <code>integer</code>
+        * [.projectors_backward()](#module_lib/cmd..Commands+projectors_backward) ⇒ <code>integer</code>
+        * [.projector_forward_projector_second_backward()](#module_lib/cmd..Commands+projector_forward_projector_second_backward) ⇒ <code>integer</code>
+        * [.projector_backward_projector_second_forward()](#module_lib/cmd..Commands+projector_backward_projector_second_forward) ⇒ <code>integer</code>
+        * [.alert()](#module_lib/cmd..Commands+alert) ⇒ <code>integer</code>
+        * [.pause()](#module_lib/cmd..Commands+pause) ⇒ <code>integer</code>
+        * [.camera_exposure()](#module_lib/cmd..Commands+camera_exposure)
+
+<a name="module_lib/cmd..Assign all connected devices and mock devices as private classes."></a>
+
+### lib/cmd~Assign all connected devices and mock devices as private classes.
+**Kind**: inner class of [<code>lib/cmd</code>](#module_lib/cmd)  
+<a name="new_module_lib/cmd..Assign all connected devices and mock devices as private classes._new"></a>
+
+#### new Assign all connected devices and mock devices as private classes.(cfg, proj, cam, light, alert, cam2, proj2, capper)
+
+| Param | Type | Description |
+| --- | --- | --- |
+| cfg | <code>object</code> | Configuration object |
+| proj | <code>object</code> | Projector 1 |
+| cam | <code>object</code> | Camera 1 |
+| light | <code>object</code> | Light source |
+| alert | <code>object</code> | Alert object |
+| cam2 | <code>object</code> | (optional) Camera 2 |
+| proj2 | <code>object</code> | (optional) Projector 2 |
+| capper | <code>object</code> | Capper object |
+
+<a name="module_lib/cmd..Commands"></a>
+
+### lib/cmd~Commands
+Class representing all commands bundled into methods.
+
+**Kind**: inner class of [<code>lib/cmd</code>](#module_lib/cmd)  
+
+* [~Commands](#module_lib/cmd..Commands)
+    * [.projector_forward()](#module_lib/cmd..Commands+projector_forward) ⇒ <code>integer</code>
+    * [.projector_backward()](#module_lib/cmd..Commands+projector_backward) ⇒ <code>integer</code>
+    * [.camera_forward(cmd)](#module_lib/cmd..Commands+camera_forward) ⇒ <code>integer</code>
+    * [.black_forward()](#module_lib/cmd..Commands+black_forward) ⇒ <code>integer</code>
+    * [.camera_backward(cmd)](#module_lib/cmd..Commands+camera_backward) ⇒ <code>integer</code>
+    * [.black_backward()](#module_lib/cmd..Commands+black_backward) ⇒ <code>integer</code>
+    * [.camera_second_forward(cmd)](#module_lib/cmd..Commands+camera_second_forward) ⇒ <code>integer</code>
+    * [.camera_second_backward(cmd)](#module_lib/cmd..Commands+camera_second_backward) ⇒ <code>integer</code>
+    * [.cameras_forward(cmd)](#module_lib/cmd..Commands+cameras_forward) ⇒ <code>integer</code>
+    * [.cameras_backward(cmd)](#module_lib/cmd..Commands+cameras_backward) ⇒ <code>integer</code>
+    * [.camera_forward_camera_second_backward(cmd)](#module_lib/cmd..Commands+camera_forward_camera_second_backward) ⇒ <code>integer</code>
+    * [.camera_backward_camera_second_forward(cmd)](#module_lib/cmd..Commands+camera_backward_camera_second_forward) ⇒ <code>integer</code>
+    * [.projector_second_forward()](#module_lib/cmd..Commands+projector_second_forward) ⇒ <code>integer</code>
+    * [.projector_second_backward()](#module_lib/cmd..Commands+projector_second_backward) ⇒ <code>integer</code>
+    * [.projectors_forward()](#module_lib/cmd..Commands+projectors_forward) ⇒ <code>integer</code>
+    * [.projectors_backward()](#module_lib/cmd..Commands+projectors_backward) ⇒ <code>integer</code>
+    * [.projector_forward_projector_second_backward()](#module_lib/cmd..Commands+projector_forward_projector_second_backward) ⇒ <code>integer</code>
+    * [.projector_backward_projector_second_forward()](#module_lib/cmd..Commands+projector_backward_projector_second_forward) ⇒ <code>integer</code>
+    * [.alert()](#module_lib/cmd..Commands+alert) ⇒ <code>integer</code>
+    * [.pause()](#module_lib/cmd..Commands+pause) ⇒ <code>integer</code>
+    * [.camera_exposure()](#module_lib/cmd..Commands+camera_exposure)
+
+<a name="module_lib/cmd..Commands+projector_forward"></a>
+
+#### commands.projector\_forward() ⇒ <code>integer</code>
+Move the projector one frame forward
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+<a name="module_lib/cmd..Commands+projector_backward"></a>
+
+#### commands.projector\_backward() ⇒ <code>integer</code>
+Move the projector one frame backward
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+<a name="module_lib/cmd..Commands+camera_forward"></a>
+
+#### commands.camera\_forward(cmd) ⇒ <code>integer</code>
+Move the camera one frame forward
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| cmd | <code>object</code> | Full cmd object |
+
+<a name="module_lib/cmd..Commands+black_forward"></a>
+
+#### commands.black\_forward() ⇒ <code>integer</code>
+Move the camera one frame forward with light off
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+<a name="module_lib/cmd..Commands+camera_backward"></a>
+
+#### commands.camera\_backward(cmd) ⇒ <code>integer</code>
+Move the camera one frame backward
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| cmd | <code>object</code> | Full cmd object |
+
+<a name="module_lib/cmd..Commands+black_backward"></a>
+
+#### commands.black\_backward() ⇒ <code>integer</code>
+Move the camera one frame forward, light set to black or off
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+<a name="module_lib/cmd..Commands+camera_second_forward"></a>
+
+#### commands.camera\_second\_forward(cmd) ⇒ <code>integer</code>
+Move the second camera one frame forward
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| cmd | <code>object</code> | Full cmd object |
+
+<a name="module_lib/cmd..Commands+camera_second_backward"></a>
+
+#### commands.camera\_second\_backward(cmd) ⇒ <code>integer</code>
+Move the second camera one frame backward
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| cmd | <code>object</code> | Full cmd object |
+
+<a name="module_lib/cmd..Commands+cameras_forward"></a>
+
+#### commands.cameras\_forward(cmd) ⇒ <code>integer</code>
+Move the both cameras one frame forward
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| cmd | <code>object</code> | Full cmd object |
+
+<a name="module_lib/cmd..Commands+cameras_backward"></a>
+
+#### commands.cameras\_backward(cmd) ⇒ <code>integer</code>
+Move the both cameras one frame backward
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| cmd | <code>object</code> | Full cmd object |
+
+<a name="module_lib/cmd..Commands+camera_forward_camera_second_backward"></a>
+
+#### commands.camera\_forward\_camera\_second\_backward(cmd) ⇒ <code>integer</code>
+Move first camera one frame forward and rewind secondary camera one frame backward
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| cmd | <code>object</code> | Full cmd object |
+
+<a name="module_lib/cmd..Commands+camera_backward_camera_second_forward"></a>
+
+#### commands.camera\_backward\_camera\_second\_forward(cmd) ⇒ <code>integer</code>
+Rewind first camera one frame backward and move secondary camera one frame forward
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| cmd | <code>object</code> | Full cmd object |
+
+<a name="module_lib/cmd..Commands+projector_second_forward"></a>
+
+#### commands.projector\_second\_forward() ⇒ <code>integer</code>
+Move the secondary projector forward one frame
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+<a name="module_lib/cmd..Commands+projector_second_backward"></a>
+
+#### commands.projector\_second\_backward() ⇒ <code>integer</code>
+Rewind the secondary projector backward one frame
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+<a name="module_lib/cmd..Commands+projectors_forward"></a>
+
+#### commands.projectors\_forward() ⇒ <code>integer</code>
+Move the both projectors forward one frame
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+<a name="module_lib/cmd..Commands+projectors_backward"></a>
+
+#### commands.projectors\_backward() ⇒ <code>integer</code>
+Rewind both projectors backwards one frame
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+<a name="module_lib/cmd..Commands+projector_forward_projector_second_backward"></a>
+
+#### commands.projector\_forward\_projector\_second\_backward() ⇒ <code>integer</code>
+Move the primary projector forward one frame and rewind the secondary projector
+one frame backwards.
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+<a name="module_lib/cmd..Commands+projector_backward_projector_second_forward"></a>
+
+#### commands.projector\_backward\_projector\_second\_forward() ⇒ <code>integer</code>
+Rewind the primary projector backwards one frame and move the secondary
+projector forward one frame.
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+<a name="module_lib/cmd..Commands+alert"></a>
+
+#### commands.alert() ⇒ <code>integer</code>
+Throws an alert to pause a sequence
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+<a name="module_lib/cmd..Commands+pause"></a>
+
+#### commands.pause() ⇒ <code>integer</code>
+Pauses a sequence for a length of time
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  
+**Returns**: <code>integer</code> - Length of action in ms  
+<a name="module_lib/cmd..Commands+camera_exposure"></a>
+
+#### commands.camera\_exposure()
+Sets the camera exposure (if supported).
+
+**Kind**: instance method of [<code>Commands</code>](#module_lib/cmd..Commands)  

app/lib/cmd/index.d.ts

@@ -0,0 +1,179 @@
+import type { Projector } from 'proj';
+import type { Camera } from 'cam';
+import type { Light } from 'light';
+import type { Capper } from 'capper';
+import type { Alert } from 'alert';
+import type { Config } from 'cfg';
+/** @module lib/cmd */
+/**
+ * Class representing all commands bundled into methods.
+ */
+export declare class Commands {
+    proj: Projector;
+    cam: Camera;
+    light: Light;
+    cam2: Camera;
+    proj2: Projector;
+    capper: Capper;
+    alertObj: Alert;
+    private cfg;
+    private ipc;
+    /**
+     * @constructor
+     * Assign all connected devices and mock devices as private classes.
+     *
+     * @param {object} cfg Configuration object
+     * @param {object} proj Projector 1
+     * @param {object} cam  Camera 1
+     * @param {object} light Light source
+     * @param {object} alert Alert object
+     * @param {object} cam2 (optional) Camera 2
+     * @param {object} proj2 (optional) Projector 2
+     * @param {object} capper Capper object
+     *
+     **/
+    constructor(cfg: Config, proj: Projector, cam: Camera, light: Light, alert: Alert, cam2?: Camera, proj2?: Projector, capper?: Capper);
+    /**
+     * Move the projector one frame forward
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    projector_forward(): Promise<number>;
+    /**
+     * Move the projector one frame backward
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    projector_backward(): Promise<number>;
+    /**
+     * Move the camera one frame forward
+     *
+     * @param {object} 	 cmd 	   Full cmd object
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    camera_forward(): Promise<number>;
+    /**
+     * Move the camera one frame forward with light off
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    black_forward(): Promise<number>;
+    /**
+     * Move the camera one frame backward
+     *
+     * @param {object} 	 cmd 	   Full cmd object
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    camera_backward(): Promise<number>;
+    /**
+     * Move the camera one frame forward, light set to black or off
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    black_backward(): Promise<number>;
+    /**
+     * Move the second camera one frame forward
+     *
+     * @param {object} 	 cmd 	   Full cmd object
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    camera_second_forward(): Promise<number>;
+    /**
+     * Move the second camera one frame backward
+     *
+     * @param {object} 	 cmd 	   Full cmd object
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    camera_second_backward(): Promise<number>;
+    /**
+     * Move the both cameras one frame forward
+     *
+     * @param {object} 	 cmd 	   Full cmd object
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    cameras_forward(): Promise<number>;
+    /**
+     * Move the both cameras one frame backward
+     *
+     * @param {object} 	 cmd 	   Full cmd object
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    cameras_backward(): Promise<number>;
+    /**
+     * Move first camera one frame forward and rewind secondary camera one frame backward
+     *
+     * @param {object} 	 cmd 	   Full cmd object
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    camera_forward_camera_second_backward(): Promise<number>;
+    /**
+     * Rewind first camera one frame backward and move secondary camera one frame forward
+     *
+     * @param {object} 	 cmd 	   Full cmd object
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    camera_backward_camera_second_forward(): Promise<number>;
+    /**
+     * Move the secondary projector forward one frame
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    projector_second_forward(): Promise<number>;
+    /**
+     * Rewind the secondary projector backward one frame
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    projector_second_backward(): Promise<number>;
+    /**
+     * Move the both projectors forward one frame
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    projectors_forward(): Promise<number>;
+    /**
+     * Rewind both projectors backwards one frame
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    projectors_backward(): Promise<number>;
+    /**
+     * Move the primary projector forward one frame and rewind the secondary projector
+     * one frame backwards.
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    projector_forward_projector_second_backward(): Promise<number>;
+    /**
+     * Rewind the primary projector backwards one frame and move the secondary
+     * projector forward one frame.
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    projector_backward_projector_second_forward(): Promise<number>;
+    /**
+     * Throws an alert to pause a sequence
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    alert(cmd: any): Promise<number>;
+    /**
+     * Pauses a sequence for a length of time
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    pause(cmd: any): Promise<number>;
+    /**
+     * Sets the camera exposure (if supported).
+     *
+     **/
+    camera_exposure(cmd: any): Promise<number>;
+}

app/lib/cmd/index.js

@@ -1,7 +1,13 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Commands = void 0;
+const electron_1 = require("electron");
 const uuid_1 = require("uuid");
 const delay_1 = require("delay");
+/** @module lib/cmd */
+/**
+ * Class representing all commands bundled into methods.
+ */
 class Commands {
     /**
      * @constructor
@@ -11,19 +17,25 @@ class Commands {
      * @param {object} proj Projector 1
      * @param {object} cam  Camera 1
      * @param {object} light Light source
+     * @param {object} alert Alert object
      * @param {object} cam2 (optional) Camera 2
-     * @param {object} proj2 {optional} Projector 2
+     * @param {object} proj2 (optional) Projector 2
+     * @param {object} capper Capper object
+     *
      **/
-    constructor(cfg, proj, cam, light, cam2 = null, proj2 = null) {
+    constructor(cfg, proj, cam, light, alert, cam2 = null, proj2 = null, capper = null) {
+        this.ipc = electron_1.ipcMain;
         this.cfg = cfg;
         this.proj = proj;
         this.cam = cam;
         this.light = light;
-        if (cam2)
+        this.alertObj = alert;
+        if (cam2 !== null)
             this.cam2 = cam2;
-        if (proj2)
+        if (proj2 !== null)
             this.proj2 = proj2;
-        this.ipc = require('electron').ipcMain;
+        if (capper !== null)
+            this.capper = capper;
     }
     /**
      * Move the projector one frame forward
@@ -31,14 +43,15 @@ class Commands {
      * @returns {integer} Length of action in ms
      **/
     async projector_forward() {
+        const id = (0, uuid_1.v4)();
         let ms;
         try {
             if (!this.proj.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.proj.set(true);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.proj.set(true, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
-            ms = await this.proj.move();
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+            ms = await this.proj.move(id);
         }
         catch (err) {
             throw err;
@@ -51,14 +64,15 @@ class Commands {
      * @returns {integer} Length of action in ms
      **/
     async projector_backward() {
+        const id = (0, uuid_1.v4)();
         let ms;
         try {
             if (this.proj.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.proj.set(false);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.proj.set(false, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
-            ms = await this.proj.move();
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+            ms = await this.proj.move(id);
         }
         catch (err) {
             throw err;
@@ -68,24 +82,25 @@ class Commands {
     /**
      * Move the camera one frame forward
      *
-     * @param {array} 	 rgb 	   Color to set light for frame
+     * @param {object} 	 cmd 	   Full cmd object
      *
      * @returns {integer} Length of action in ms
      **/
-    async camera_forward(rgb = [255, 255, 255]) {
-        const id = uuid_1.v4();
+    async camera_forward() {
+        const id = (0, uuid_1.v4)();
         const off = [0, 0, 0];
+        let rgb = [255, 255, 255];
         let ms;
         try {
             if (!this.cam.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.cam.set(true);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.cam.set(true, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(rgb, id);
-            await delay_1.delay(this.cfg.arduino.serialDelay);
-            ms = await this.cam.move();
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+            ms = await this.cam.move(id);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(off, id);
         }
         catch (err) {
@@ -99,20 +114,27 @@ class Commands {
      * @returns {integer} Length of action in ms
      **/
     async black_forward() {
-        const id = uuid_1.v4();
+        const id = (0, uuid_1.v4)();
         const off = [0, 0, 0];
-        let ms;
+        let ms = 0;
         try {
             if (!this.cam.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.cam.set(true);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.cam.set(true, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+            if (this.capper) {
+                ms += await this.capper.capper(true, id);
+            }
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(off, id); //make sure set to off
-            await delay_1.delay(this.cfg.arduino.serialDelay);
-            ms = await this.cam.move();
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+            ms += await this.cam.move(id);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(off, id);
+            if (this.capper) {
+                ms += await this.capper.capper(false, id);
+            }
         }
         catch (err) {
             throw err;
@@ -122,24 +144,25 @@ class Commands {
     /**
      * Move the camera one frame backward
      *
-     * @param {array} 	 rgb 	   Color to set light for frame
+     * @param {object} 	 cmd 	   Full cmd object
      *
      * @returns {integer} Length of action in ms
      **/
-    async camera_backward(rgb = [255, 255, 255]) {
-        const id = uuid_1.v4();
+    async camera_backward() {
+        const id = (0, uuid_1.v4)();
         const off = [0, 0, 0];
+        let rgb = [255, 255, 255];
         let ms;
         try {
             if (this.cam.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.cam.set(false);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.cam.set(false, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(rgb, id);
-            await delay_1.delay(this.cfg.arduino.serialDelay);
-            ms = await this.cam.move();
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+            ms = await this.cam.move(id);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(off, id);
         }
         catch (err) {
@@ -153,20 +176,26 @@ class Commands {
      * @returns {integer} Length of action in ms
      **/
     async black_backward() {
-        const id = uuid_1.v4();
+        const id = (0, uuid_1.v4)();
         const off = [0, 0, 0];
-        let ms;
+        let ms = 0;
         try {
             if (this.cam.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.cam.set(false);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.cam.set(false, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            if (this.capper) {
+                ms += await this.capper.capper(true, id);
+            }
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(off, id); //make sure set to off
-            await delay_1.delay(this.cfg.arduino.serialDelay);
-            ms = await this.cam.move();
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+            ms += await this.cam.move(id);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(off, id);
+            if (this.capper) {
+                ms += await this.capper.capper(false, id);
+            }
         }
         catch (err) {
             throw err;
@@ -176,24 +205,25 @@ class Commands {
     /**
      * Move the second camera one frame forward
      *
-     * @param {array} 	 rgb 	   Color to set light for frame
+     * @param {object} 	 cmd 	   Full cmd object
      *
      * @returns {integer} Length of action in ms
      **/
-    async camera_second_forward(rgb = [255, 255, 255]) {
-        const id = uuid_1.v4();
+    async camera_second_forward() {
+        const id = (0, uuid_1.v4)();
         const off = [0, 0, 0];
+        let rgb = [255, 255, 255];
         let ms;
         try {
             if (!this.cam2.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.cam2.set(true);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.cam2.set(true, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(rgb, id);
-            await delay_1.delay(this.cfg.arduino.serialDelay);
-            ms = await this.cam2.move();
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+            ms = await this.cam2.move(id);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(off, id);
         }
         catch (err) {
@@ -204,24 +234,25 @@ class Commands {
     /**
      * Move the second camera one frame backward
      *
-     * @param {array} 	 rgb 	   Color to set light for frame
+     * @param {object} 	 cmd 	   Full cmd object
      *
      * @returns {integer} Length of action in ms
      **/
-    async camera_second_backward(rgb = [255, 255, 255]) {
-        const id = uuid_1.v4();
+    async camera_second_backward() {
+        const id = (0, uuid_1.v4)();
         const off = [0, 0, 0];
+        let rgb = [255, 255, 255];
         let ms;
         try {
             if (this.cam2.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.cam2.set(false);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.cam2.set(false, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(rgb, id);
-            await delay_1.delay(this.cfg.arduino.serialDelay);
-            ms = await this.cam2.move();
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+            ms = await this.cam2.move(id);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(off, id);
         }
         catch (err) {
@@ -232,37 +263,36 @@ class Commands {
     /**
      * Move the both cameras one frame forward
      *
-     * @param {array} 	 rgb 	   Color to set light for frame
+     * @param {object} 	 cmd 	   Full cmd object
      *
      * @returns {integer} Length of action in ms
      **/
-    async cameras_forward(rgb = [255, 255, 255]) {
-        const id = uuid_1.v4();
+    async cameras_forward() {
+        const id = (0, uuid_1.v4)();
         const off = [0, 0, 0];
+        let rgb = [255, 255, 255];
         let both;
         let ms;
         try {
             if (!this.cam.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.cam.set(true);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.cam.set(true, id);
             }
             if (!this.cam2.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.cam2.set(true);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.cam2.set(true, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(rgb, id);
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             if (this.cam && this.cam2 && this.cam.arduino.alias.camera === this.cam.arduino.alias.camera_second) {
-                ms = await this.cam.both();
+                ms = await this.cam.both(id);
             }
             else {
-                this.cam.move();
-                this.cam2.move();
-                both = [await this.cam.move, await this.cam2.move];
+                both = await Promise.all([this.cam.move(id), this.cam2.move(id)]);
                 ms = Math.max(...both);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(off, id);
         }
         catch (err) {
@@ -273,37 +303,36 @@ class Commands {
     /**
      * Move the both cameras one frame backward
      *
-     * @param {array} 	 rgb 	   Color to set light for frame
+     * @param {object} 	 cmd 	   Full cmd object
      *
      * @returns {integer} Length of action in ms
      **/
-    async cameras_backward(rgb = [255, 255, 255]) {
-        const id = uuid_1.v4();
+    async cameras_backward() {
+        const id = (0, uuid_1.v4)();
         const off = [0, 0, 0];
+        let rgb = [255, 255, 255];
         let both;
         let ms;
         try {
             if (this.cam.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.cam.set(false);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.cam.set(false, id);
             }
             if (this.cam2.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.cam2.set(false);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.cam2.set(false, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(rgb, id);
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             if (this.cam && this.cam2 && this.cam.arduino.alias.camera === this.cam.arduino.alias.camera_second) {
-                ms = await this.cam.both();
+                ms = await this.cam.both(id);
             }
             else {
-                this.cam.move();
-                this.cam2.move();
-                both = [await this.cam.move, await this.cam2.move];
+                both = await Promise.all([this.cam.move(id), this.cam2.move(id)]);
                 ms = Math.max(...both);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(off, id);
         }
         catch (err) {
@@ -314,37 +343,36 @@ class Commands {
     /**
      * Move first camera one frame forward and rewind secondary camera one frame backward
      *
-     * @param {array} 	 rgb 	   Color to set light for frames
+     * @param {object} 	 cmd 	   Full cmd object
      *
      * @returns {integer} Length of action in ms
      **/
-    async camera_forward_camera_second_backward(rgb = [255, 255, 255]) {
-        const id = uuid_1.v4();
+    async camera_forward_camera_second_backward() {
+        const id = (0, uuid_1.v4)();
         const off = [0, 0, 0];
+        let rgb = [255, 255, 255];
         let both;
         let ms;
         try {
             if (!this.cam.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.cam.set(true);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.cam.set(true, id);
             }
             if (this.cam2.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.cam2.set(false);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.cam2.set(false, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(rgb, id);
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             if (this.cam && this.cam2 && this.cam.arduino.alias.camera === this.cam.arduino.alias.camera_second) {
-                ms = await this.cam.both();
+                ms = await this.cam.both(id);
             }
             else {
-                this.cam.move();
-                this.cam2.move();
-                both = [await this.cam.move, await this.cam2.move];
+                both = await Promise.all([this.cam.move(id), this.cam2.move(id)]);
                 ms = Math.max(...both);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(off, id);
         }
         catch (err) {
@@ -355,37 +383,36 @@ class Commands {
     /**
      * Rewind first camera one frame backward and move secondary camera one frame forward
      *
-     * @param {array} 	 rgb 	   Color to set light for frame
+     * @param {object} 	 cmd 	   Full cmd object
      *
      * @returns {integer} Length of action in ms
      **/
-    async camera_backward_camera_second_forward(rgb = [255, 255, 255]) {
-        const id = uuid_1.v4();
+    async camera_backward_camera_second_forward() {
+        const id = (0, uuid_1.v4)();
         const off = [0, 0, 0];
+        let rgb = [255, 255, 255];
         let both;
         let ms;
         try {
             if (this.cam.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.cam.set(false);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.cam.set(false, id);
             }
             if (!this.cam2.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.cam2.set(true);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.cam2.set(true, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(rgb, id);
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             if (this.cam && this.cam2 && this.cam.arduino.alias.camera === this.cam.arduino.alias.camera_second) {
-                ms = await this.cam.both();
+                ms = await this.cam.both(id);
             }
             else {
-                this.cam.move();
-                this.cam.move();
-                both = [await this.cam.move, await this.proj2.move];
+                both = await Promise.all([this.cam.move(id), this.cam2.move(id)]);
                 ms = Math.max(...both);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             await this.light.set(off, id);
         }
         catch (err) {
@@ -399,14 +426,15 @@ class Commands {
      * @returns {integer} Length of action in ms
      **/
     async projector_second_forward() {
+        const id = (0, uuid_1.v4)();
         let ms;
         try {
             if (!this.proj2.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.proj2.set(true);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.proj2.set(true, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
-            ms = await this.proj2.move();
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+            ms = await this.proj2.move(id);
         }
         catch (err) {
             throw err;
@@ -419,14 +447,15 @@ class Commands {
      * @returns {integer} Length of action in ms
      **/
     async projector_second_backward() {
+        const id = (0, uuid_1.v4)();
         let ms;
         try {
             if (this.proj2.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.proj2.set(false);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.proj2.set(false, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
-            ms = await this.proj2.move();
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+            ms = await this.proj2.move(id);
         }
         catch (err) {
             throw err;
@@ -439,25 +468,24 @@ class Commands {
      * @returns {integer} Length of action in ms
      **/
     async projectors_forward() {
+        const id = (0, uuid_1.v4)();
         let both;
         let ms;
         try {
             if (!this.proj.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.proj.set(true);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.proj.set(true, id);
             }
             if (!this.proj2.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.proj2.set(true);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.proj2.set(true, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             if (this.proj && this.proj2 && this.proj.arduino.alias.projector === this.proj.arduino.alias.projector_second) {
-                ms = await this.proj.both();
+                ms = await this.proj.both(id);
             }
             else {
-                this.proj.move();
-                this.proj2.move();
-                both = [await this.proj.move, await this.proj2.move];
+                both = await Promise.all([this.proj.move(id), this.proj2.move(id)]);
                 ms = Math.max(...both);
             }
         }
@@ -472,26 +500,24 @@ class Commands {
      * @returns {integer} Length of action in ms
      **/
     async projectors_backward() {
+        const id = (0, uuid_1.v4)();
         let both;
         let ms;
         try {
             if (this.proj.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.proj.set(false);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.proj.set(false, id);
             }
             if (this.proj2.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.proj2.set(false);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.proj2.set(false, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
-            //run one projector without await?
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             if (this.proj && this.proj2 && this.proj.arduino.alias.projector === this.proj.arduino.alias.projector_second) {
-                ms = await this.proj.both();
+                ms = await this.proj.both(id);
             }
             else {
-                this.proj.move();
-                this.proj2.move();
-                both = [await this.proj.move, await this.proj2.move];
+                both = await Promise.all([this.proj.move(id), this.proj2.move(id)]);
                 ms = Math.max(...both);
             }
         }
@@ -507,26 +533,24 @@ class Commands {
      * @returns {integer} Length of action in ms
      **/
     async projector_forward_projector_second_backward() {
+        const id = (0, uuid_1.v4)();
         let both;
         let ms;
         try {
             if (!this.proj.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.proj.set(true);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.proj.set(true, id);
             }
             if (this.proj2.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.proj2.set(false);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.proj2.set(false, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
-            //run one projector without await?
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             if (this.proj && this.proj2 && this.proj.arduino.alias.projector === this.proj.arduino.alias.projector_second) {
-                ms = await this.proj.both();
+                ms = await this.proj.both(id);
             }
             else {
-                this.proj.move();
-                this.proj2.move();
-                both = [await this.proj.move, await this.proj2.move];
+                both = await Promise.all([this.proj.move(id), this.proj2.move(id)]);
                 ms = Math.max(...both);
             }
         }
@@ -542,26 +566,24 @@ class Commands {
      * @returns {integer} Length of action in ms
      **/
     async projector_backward_projector_second_forward() {
+        const id = (0, uuid_1.v4)();
         let both;
         let ms;
         try {
             if (this.proj.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.proj.set(false);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.proj.set(false, id);
             }
             if (!this.proj2.state.dir) {
-                await delay_1.delay(this.cfg.arduino.serialDelay);
-                await this.proj2.set(true);
+                await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
+                await this.proj2.set(true, id);
             }
-            await delay_1.delay(this.cfg.arduino.serialDelay);
-            //run one projector without await?
+            await (0, delay_1.delay)(this.cfg.arduino.serialDelay);
             if (this.proj && this.proj2 && this.proj.arduino.alias.projector === this.proj.arduino.alias.projector_second) {
-                ms = await this.proj.both();
+                ms = await this.proj.both(id);
             }
             else {
-                this.proj.move();
-                this.proj2.move();
-                both = [await this.proj.move, await this.proj2.move];
+                both = await Promise.all([this.proj.move(id), this.proj2.move(id)]);
                 ms = Math.max(...both);
             }
         }
@@ -570,8 +592,54 @@ class Commands {
         }
         return ms;
     }
+    /**
+     * Throws an alert to pause a sequence
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    async alert(cmd) {
+        const id = (0, uuid_1.v4)();
+        let ms;
+        try {
+            ms = await this.alertObj.start(cmd.light); //change this meta
+        }
+        catch (err) {
+            throw err;
+        }
+        return ms;
+    }
+    /**
+     * Pauses a sequence for a length of time
+     *
+     * @returns {integer} Length of action in ms
+     **/
+    async pause(cmd) {
+        const id = (0, uuid_1.v4)();
+        let ms;
+        try {
+            ms = await (0, delay_1.delay)(cmd.light * 1000); //delay is in seconds
+        }
+        catch (err) {
+            throw err;
+        }
+        return ms;
+    }
+    /**
+     * Sets the camera exposure (if supported).
+     *
+     **/
+    async camera_exposure(cmd) {
+        const id = (0, uuid_1.v4)();
+        let ms;
+        try {
+            ms = await this.cam.exposure(cmd.light, id);
+        }
+        catch (err) {
+            throw err;
+        }
+        return ms;
+    }
 }
-module.exports = function (cfg, proj, cam, light, cam2, proj2) {
-    return new Commands(cfg, proj, cam, light, cam2, proj2);
-};
+exports.Commands = Commands;
+module.exports = { Commands };
 //# sourceMappingURL=index.js.map

app/lib/delay/index.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Delay in an async/await function
+ *
+ * @param {integer}  ms 	Milliseconds to delay for
+ *
+ * @returns {Promise} Promise to resolve after timeout
+ **/
+export declare function delay(ms: number): Promise<number>;

app/lib/delay/index.js

@@ -1,4 +1,6 @@
 'use strict';
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.delay = void 0;
 /**
  * Delay in an async/await function
  *
@@ -8,8 +10,9 @@
  **/
 function delay(ms) {
     return new Promise((resolve) => {
-        return setTimeout(resolve, ms);
+        return setTimeout(() => { resolve(ms); }, ms);
     });
 }
-module.exports.delay = delay;
+exports.delay = delay;
+module.exports = { delay };
 //# sourceMappingURL=index.js.map

app/lib/delay/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/delay/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb;;;;;;IAMI;AAEJ,SAAS,KAAK,CAAE,EAAW;IAC1B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAa,EAAE,EAAE;QACpC,OAAO,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/delay/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;AAEb;;;;;;IAMI;AAEJ,SAAgB,KAAK,CAAE,EAAW;IACjC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAa,EAAE,EAAE;QACpC,OAAO,UAAU,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAAA,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;AACJ,CAAC;AAJD,sBAIC;AAED,MAAM,CAAC,OAAO,GAAG,EAAE,KAAK,EAAE,CAAC"}

app/lib/devices/Readme.md

@@ -1,74 +1,116 @@
-<a name="Devices"></a>
+<a name="module_lib/devices"></a>
 
-## Devices
-class representing the device discovery features
+## lib/devices
 
-**Kind**: global class  
+* [lib/devices](#module_lib/devices)
+    * [~Devices](#module_lib/devices..Devices)
+        * [new Devices()](#new_module_lib/devices..Devices_new)
+        * [.init()](#module_lib/devices..Devices+init)
+        * [.listen()](#module_lib/devices..Devices+listen)
+        * [.listener()](#module_lib/devices..Devices+listener)
+        * [.enumerate()](#module_lib/devices..Devices+enumerate)
+        * [.favor()](#module_lib/devices..Devices+favor)
+        * [.distinguish()](#module_lib/devices..Devices+distinguish)
+        * [.fakeProjector()](#module_lib/devices..Devices+fakeProjector)
+        * [.fakeCamera()](#module_lib/devices..Devices+fakeCamera)
+        * [.fakeLight()](#module_lib/devices..Devices+fakeLight)
+        * [.fakeCapper()](#module_lib/devices..Devices+fakeCapper)
+        * [.connectDevice()](#module_lib/devices..Devices+connectDevice)
+        * [.all()](#module_lib/devices..Devices+all)
+        * [.remember()](#module_lib/devices..Devices+remember)
+        * [.ready()](#module_lib/devices..Devices+ready)
 
-* [Devices](#Devices)
-    * [.init()](#Devices+init)
-    * [.listen()](#Devices+listen)
-    * [.listener()](#Devices+listener)
-    * [.enumerate()](#Devices+enumerate)
-    * [.favor()](#Devices+favor)
-    * [.distinguish()](#Devices+distinguish)
-    * [.fakeProjector()](#Devices+fakeProjector)
-    * [.fakeCamera()](#Devices+fakeCamera)
-    * [.fakeLight()](#Devices+fakeLight)
-    * [.connectDevice()](#Devices+connectDevice)
-    * [.all()](#Devices+all)
-    * [.remember()](#Devices+remember)
-    * [.ready()](#Devices+ready)
+<a name="module_lib/devices..Devices"></a>
 
-<a name="Devices+init"></a>
+### lib/devices~Devices
+Class representing the device discovery features.
 
-### devices.init()
-**Kind**: instance method of [<code>Devices</code>](#Devices)  
-<a name="Devices+listen"></a>
+**Kind**: inner class of [<code>lib/devices</code>](#module_lib/devices)  
 
-### devices.listen()
-**Kind**: instance method of [<code>Devices</code>](#Devices)  
-<a name="Devices+listener"></a>
+* [~Devices](#module_lib/devices..Devices)
+    * [new Devices()](#new_module_lib/devices..Devices_new)
+    * [.init()](#module_lib/devices..Devices+init)
+    * [.listen()](#module_lib/devices..Devices+listen)
+    * [.listener()](#module_lib/devices..Devices+listener)
+    * [.enumerate()](#module_lib/devices..Devices+enumerate)
+    * [.favor()](#module_lib/devices..Devices+favor)
+    * [.distinguish()](#module_lib/devices..Devices+distinguish)
+    * [.fakeProjector()](#module_lib/devices..Devices+fakeProjector)
+    * [.fakeCamera()](#module_lib/devices..Devices+fakeCamera)
+    * [.fakeLight()](#module_lib/devices..Devices+fakeLight)
+    * [.fakeCapper()](#module_lib/devices..Devices+fakeCapper)
+    * [.connectDevice()](#module_lib/devices..Devices+connectDevice)
+    * [.all()](#module_lib/devices..Devices+all)
+    * [.remember()](#module_lib/devices..Devices+remember)
+    * [.ready()](#module_lib/devices..Devices+ready)
 
-### devices.listener()
-**Kind**: instance method of [<code>Devices</code>](#Devices)  
-<a name="Devices+enumerate"></a>
+<a name="new_module_lib/devices..Devices_new"></a>
 
-### devices.enumerate()
-**Kind**: instance method of [<code>Devices</code>](#Devices)  
-<a name="Devices+favor"></a>
+#### new Devices()
+Constructor assigns arduino, settings, UI browser window and cam objects
+locally to this class for reference.
 
-### devices.favor()
-**Kind**: instance method of [<code>Devices</code>](#Devices)  
-<a name="Devices+distinguish"></a>
+<a name="module_lib/devices..Devices+init"></a>
 
-### devices.distinguish()
-**Kind**: instance method of [<code>Devices</code>](#Devices)  
-<a name="Devices+fakeProjector"></a>
+#### devices.init()
+Initialize the log for "devices". Establish an ipc connection to the UI.
+Start listening on that ipc connection.
 
-### devices.fakeProjector()
-**Kind**: instance method of [<code>Devices</code>](#Devices)  
-<a name="Devices+fakeCamera"></a>
+**Kind**: instance method of [<code>Devices</code>](#module_lib/devices..Devices)  
+<a name="module_lib/devices..Devices+listen"></a>
 
-### devices.fakeCamera()
-**Kind**: instance method of [<code>Devices</code>](#Devices)  
-<a name="Devices+fakeLight"></a>
+#### devices.listen()
+Listen to the "profile" channel for messages from the UI.
 
-### devices.fakeLight()
-**Kind**: instance method of [<code>Devices</code>](#Devices)  
-<a name="Devices+connectDevice"></a>
+**Kind**: instance method of [<code>Devices</code>](#module_lib/devices..Devices)  
+<a name="module_lib/devices..Devices+listener"></a>
 
-### devices.connectDevice()
-**Kind**: instance method of [<code>Devices</code>](#Devices)  
-<a name="Devices+all"></a>
+#### devices.listener()
+The "profile" channel callback. If a profile is changed, set it in the
+local settings object.
 
-### devices.all()
-**Kind**: instance method of [<code>Devices</code>](#Devices)  
-<a name="Devices+remember"></a>
+**Kind**: instance method of [<code>Devices</code>](#module_lib/devices..Devices)  
+<a name="module_lib/devices..Devices+enumerate"></a>
 
-### devices.remember()
-**Kind**: instance method of [<code>Devices</code>](#Devices)  
-<a name="Devices+ready"></a>
+#### devices.enumerate()
+**Kind**: instance method of [<code>Devices</code>](#module_lib/devices..Devices)  
+<a name="module_lib/devices..Devices+favor"></a>
 
-### devices.ready()
-**Kind**: instance method of [<code>Devices</code>](#Devices)  
+#### devices.favor()
+**Kind**: instance method of [<code>Devices</code>](#module_lib/devices..Devices)  
+<a name="module_lib/devices..Devices+distinguish"></a>
+
+#### devices.distinguish()
+**Kind**: instance method of [<code>Devices</code>](#module_lib/devices..Devices)  
+<a name="module_lib/devices..Devices+fakeProjector"></a>
+
+#### devices.fakeProjector()
+**Kind**: instance method of [<code>Devices</code>](#module_lib/devices..Devices)  
+<a name="module_lib/devices..Devices+fakeCamera"></a>
+
+#### devices.fakeCamera()
+**Kind**: instance method of [<code>Devices</code>](#module_lib/devices..Devices)  
+<a name="module_lib/devices..Devices+fakeLight"></a>
+
+#### devices.fakeLight()
+**Kind**: instance method of [<code>Devices</code>](#module_lib/devices..Devices)  
+<a name="module_lib/devices..Devices+fakeCapper"></a>
+
+#### devices.fakeCapper()
+**Kind**: instance method of [<code>Devices</code>](#module_lib/devices..Devices)  
+<a name="module_lib/devices..Devices+connectDevice"></a>
+
+#### devices.connectDevice()
+**Kind**: instance method of [<code>Devices</code>](#module_lib/devices..Devices)  
+<a name="module_lib/devices..Devices+all"></a>
+
+#### devices.all()
+**Kind**: instance method of [<code>Devices</code>](#module_lib/devices..Devices)  
+<a name="module_lib/devices..Devices+remember"></a>
+
+#### devices.remember()
+**Kind**: instance method of [<code>Devices</code>](#module_lib/devices..Devices)  
+<a name="module_lib/devices..Devices+ready"></a>
+
+#### devices.ready()
+**Kind**: instance method of [<code>Devices</code>](#module_lib/devices..Devices)  

app/lib/devices/index.d.ts

@@ -0,0 +1,84 @@
+import type { Settings } from 'settings';
+import type { Arduino } from 'arduino';
+import type { BrowserWindow } from 'electron';
+interface Device {
+    serial: string;
+    device: string;
+}
+/** @module lib/devices */
+/**
+ * Class representing the device discovery features.
+ */
+export declare class Devices {
+    settings: Settings;
+    connected: any;
+    private arduino;
+    private log;
+    private ui;
+    private ipc;
+    private mainWindow;
+    /**
+     * Constructor assigns arduino, settings, UI browser window and cam objects
+     * locally to this class for reference.
+     **/
+    constructor(arduino: Arduino, settings: Settings, mainWindow: BrowserWindow);
+    /**
+     * Initialize the log for "devices". Establish an ipc connection to the UI.
+     * Start listening on that ipc connection.
+     **/
+    private init;
+    /**
+     * Listen to the "profile" channel for messages from the UI.
+     **/
+    private listen;
+    /**
+     * The "profile" channel callback. If a profile is changed, set it in the
+     * local settings object.
+     **/
+    private listener;
+    /**
+     *
+     **/
+    enumerate(): Promise<boolean>;
+    /**
+     *
+     **/
+    private favor;
+    /**
+     *
+     **/
+    private distinguish;
+    /**
+     *
+     **/
+    private fakeProjector;
+    /**
+     *
+     **/
+    private fakeCamera;
+    /**
+     *
+     **/
+    private fakeLight;
+    /**
+     *
+     **/
+    private fakeCapper;
+    /**
+     *
+     **/
+    private connectDevice;
+    /**
+     *
+     **/
+    private all;
+    /**
+     *
+     **/
+    private remember;
+    /**
+     *
+     **/
+    private ready;
+}
+export type { Device };

app/lib/devices/index.js

@@ -1,24 +1,25 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Devices = void 0;
+const electron_1 = require("electron");
 const delay_1 = require("delay");
-const Log = require("log");
+const log_1 = require("log");
+/** @module lib/devices */
 /**
- * class representing the device discovery features
- *
- *
- **/
+ * Class representing the device discovery features.
+ */
 class Devices {
     /**
      * Constructor assigns arduino, settings, UI browser window and cam objects
      * locally to this class for reference.
      **/
-    constructor(arduino, settings, mainWindow, cam) {
+    constructor(arduino, settings, mainWindow) {
         this.connected = {};
+        this.ipc = electron_1.ipcMain;
         this.arduino = arduino;
         this.settings = settings;
         this.mainWindow = mainWindow;
         this.ui = this.mainWindow.webContents;
-        this.cam = cam;
         this.init();
     }
     /**
@@ -26,57 +27,64 @@ class Devices {
      * Start listening on that ipc connection.
      **/
     async init() {
-        this.log = await Log({ label: 'devices' });
-        this.ipc = require('electron').ipcMain;
+        this.log = await (0, log_1.Log)({ label: 'devices' });
         this.listen();
     }
     /**
      * Listen to the "profile" channel for messages from the UI.
      **/
     listen() {
-        this.ipc.on('profile', this.listener.bind(this));
+        this.ipc.handle('profile', this.listener.bind(this));
     }
     /**
      * The "profile" channel callback. If a profile is changed, set it in the
      * local settings object.
      **/
-    listener(event, arg) {
-        this.log.info(`Saving profile ${arg.profile}`, 'SETTINGS', false, false);
-        this.settings.update('profile', arg.profile);
-        this.settings.save();
+    async listener(event, arg) {
+        if (typeof arg.profile !== 'undefined') {
+            this.log.info(`Saving profile ${arg.profile}`, 'SETTINGS', false, false);
+            this.settings.update('profile', arg.profile);
+            await this.settings.save();
+        }
+        if (typeof arg.timing !== 'undefined') {
+            this.log.info(`Saving timing info`, 'SETTINGS', false, false);
+            this.settings.update('timing', arg.timing);
+            await this.settings.save();
+        }
+        return true;
     }
     /**
      *
      **/
     async enumerate() {
-        let devices;
+        let serials;
         try {
-            devices = await this.arduino.enumerate();
+            serials = await this.arduino.enumerate();
         }
         catch (err) {
             this.log.warn(err, 'SERIAL', false, true);
-            await delay_1.delay(1000);
+            await (0, delay_1.delay)(1000);
             return this.all([]);
         }
-        this.log.info(`Found ${devices.length} USB devices`, 'SERIAL', true, true);
-        devices = this.favor(devices);
-        return await this.all(devices);
+        this.log.info(`Found ${serials.length} USB devices`, 'SERIAL', true, true);
+        serials = this.favor(serials);
+        return await this.all(serials);
     }
     /**
      *
      **/
-    favor(devices) {
+    favor(serials) {
         const past = this.settings.state.devices.filter((device) => {
-            if (device.arduino) {
+            if (device.serial) {
                 return device;
             }
         }).map((device) => {
-            return device.arduino;
+            return device.serial;
         });
         if (past.length === 0) {
-            return devices;
+            return serials;
         }
-        devices.sort((a, b) => {
+        serials.sort((a, b) => {
             if (past.indexOf(a) !== -1 && past.indexOf(b) === -1) {
                 return 1;
             }
@@ -85,23 +93,24 @@ class Devices {
             }
             return 0;
         });
-        return devices;
+        return serials;
     }
     /**
      *
      **/
-    async distinguish(device) {
+    async distinguish(serial) {
         let connectSuccess;
         let verifySuccess;
-        let type;
+        let device;
+        //this.log.info(`distinguish() ${serial}`)
         try {
-            connectSuccess = await this.arduino.connect('connect', device, true);
+            connectSuccess = await this.arduino.connect('connect', serial, true);
         }
         catch (err) {
             this.log.error('Error connecting', err);
             return null;
         }
-        await delay_1.delay(2000);
+        await (0, delay_1.delay)(2000);
         try {
             verifySuccess = await this.arduino.verify();
         }
@@ -109,18 +118,25 @@ class Devices {
             this.log.error('Error verifying device', err);
             return null;
         }
-        this.log.info(`Verified ${device} as mcopy device`, 'SERIAL', true, true);
-        await delay_1.delay(1000);
+        this.log.info(`Verified ${serial} as mcopy device`, 'SERIAL', true, true);
+        await (0, delay_1.delay)(1000);
         try {
-            type = await this.arduino.distinguish();
+            device = await this.arduino.distinguish();
         }
         catch (err) {
             this.log.error('Error distinguishing device', err);
             return null;
         }
-        this.remember('arduino', device, type);
-        this.log.info(`Determined ${device} to be ${type}`, 'SERIAL', true, true);
-        return type;
+        this.remember(device, serial, 'arduino');
+        this.log.info(`Determined ${device} to be ${device}`, 'SERIAL', true, true);
+        await (0, delay_1.delay)(100);
+        try {
+            await this.arduino.state(device, true);
+        }
+        catch (err) {
+            this.log.error('Error checking state capability', err);
+        }
+        return device;
     }
     /**
      *
@@ -131,24 +147,24 @@ class Devices {
             await this.arduino.fakeConnect('projector');
         }
         catch (err) {
-            console.error(err);
-            this.log.error(`Error connecting to fake PRONECTOR device`, 'SERIAL', true, true);
+            this.log.error(`Error connecting to fake PROjECTOR device`, 'SERIAL', true, true);
+            this.log.error(err);
             return false;
         }
         this.log.info('Connected to fake PROJECTOR device', 'SERIAL', true, true);
         return true;
     }
     /**
- *
- **/
+     *
+     **/
     async fakeCamera() {
         this.connected.camera = '/dev/fake';
         try {
             await this.arduino.fakeConnect('camera');
         }
         catch (err) {
-            console.error(err);
             this.log.error(`Error connecting to fake CAMERA device`, 'SERIAL', true, true);
+            this.log.error(err);
             return false;
         }
         this.log.info('Connected to fake CAMERA device', 'SERIAL', true, true);
@@ -163,17 +179,33 @@ class Devices {
             await this.arduino.fakeConnect('light');
         }
         catch (err) {
-            console.error(err);
             this.log.error(`Error connecting to fake LIGHT device`, 'SERIAL', true, true);
+            this.log.error(err);
             return false;
         }
         this.log.info('Connected to fake LIGHT device', 'SERIAL', true, true);
         return true;
     }
     /**
-    *
-    **/
-    async connectDevice(device, type) {
+     *
+     **/
+    async fakeCapper() {
+        this.connected.capper = '/dev/fake';
+        try {
+            await this.arduino.fakeConnect('capper');
+        }
+        catch (err) {
+            this.log.error(`Error connecting to fake CAPPER device`, 'SERIAL', true, true);
+            this.log.error(err);
+            return false;
+        }
+        this.log.info('Connected to fake CAPPER device', 'SERIAL', true, true);
+        return true;
+    }
+    /**
+     *
+     **/
+    async connectDevice(device, serial) {
         let closeSuccess;
         let connectSuccess;
         try {
@@ -183,10 +215,10 @@ class Devices {
             this.log.error('Error closing arduino connection', err);
             return false;
         }
-        if (type === 'projector') {
-            this.connected.projector = device;
+        if (device === 'projector') {
+            this.connected.projector = serial;
             try {
-                connectSuccess = await this.arduino.connect('projector', device, false);
+                connectSuccess = await this.arduino.connect('projector', serial, false);
             }
             catch (err) {
                 this.log.error('Error connecting to projector', err);
@@ -194,10 +226,10 @@ class Devices {
             }
             this.log.info(`Connected to ${device} as PROJECTOR`, 'SERIAL', true, true);
         }
-        else if (type === 'camera') {
-            this.connected.camera = device;
+        else if (device === 'camera') {
+            this.connected.camera = serial;
             try {
-                connectSuccess = await this.arduino.connect('camera', device, false);
+                connectSuccess = await this.arduino.connect('camera', serial, false);
             }
             catch (err) {
                 this.log.error('Error connecting to camera', err);
@@ -205,10 +237,10 @@ class Devices {
             }
             this.log.info(`Connected to ${device} as CAMERA`, 'SERIAL', true, true);
         }
-        else if (type === 'light') {
-            this.connected.light = device;
+        else if (device === 'light') {
+            this.connected.light = serial;
             try {
-                connectSuccess = await this.arduino.connect('light', device, false);
+                connectSuccess = await this.arduino.connect('light', serial, false);
             }
             catch (err) {
                 this.log.error('Error connecting to light', err);
@@ -216,12 +248,12 @@ class Devices {
             }
             this.log.info(`Connected to ${device} as LIGHT`, 'SERIAL', true, true);
         }
-        else if (type === 'projector,light') {
-            this.connected.projector = device;
-            this.connected.light = device;
-            this.arduino.aliasSerial('light', device);
+        else if (device === 'projector,light') {
+            this.connected.projector = serial;
+            this.connected.light = serial;
+            this.arduino.aliasSerial('light', serial);
             try {
-                connectSuccess = await this.arduino.connect('projector', device, false);
+                connectSuccess = await this.arduino.connect('projector', serial, false);
             }
             catch (err) {
                 this.log.error('Error connecting to projector and light', err);
@@ -229,14 +261,14 @@ class Devices {
             }
             this.log.info(`Connected to ${device} as PROJECTOR + LIGHT`, 'SERIAL', true, true);
         }
-        else if (type === 'projector,camera,light') {
-            this.connected.projector = device;
-            this.connected.camera = device;
-            this.connected.light = device;
-            this.arduino.aliasSerial('camera', device);
-            this.arduino.aliasSerial('light', device);
+        else if (device === 'projector,camera,light') {
+            this.connected.projector = serial;
+            this.connected.camera = serial;
+            this.connected.light = serial;
+            this.arduino.aliasSerial('camera', serial);
+            this.arduino.aliasSerial('light', serial);
             try {
-                connectSuccess = await this.arduino.connect('projector', device, false);
+                connectSuccess = await this.arduino.connect('projector', serial, false);
             }
             catch (err) {
                 this.log.error('Error connecting to projector, camera and light', err);
@@ -244,12 +276,12 @@ class Devices {
             }
             this.log.info(`Connected to ${device} as PROJECTOR + CAMERA + LIGHT`, 'SERIAL', true, true);
         }
-        else if (type === 'projector,camera') {
-            this.connected.projector = device;
-            this.connected.camera = device;
-            this.arduino.aliasSerial('camera', device);
+        else if (device === 'projector,camera') {
+            this.connected.projector = serial;
+            this.connected.camera = serial;
+            this.arduino.aliasSerial('camera', serial);
             try {
-                connectSuccess = await this.arduino.connect('projector', device, false);
+                connectSuccess = await this.arduino.connect('projector', serial, false);
             }
             catch (err) {
                 this.log.error('Error connecting to projector and camera', err);
@@ -257,10 +289,10 @@ class Devices {
             }
             this.log.info(`Connected to ${device} as PROJECTOR + CAMERA`, 'SERIAL', true, true);
         }
-        else if (type === 'projector_second') {
-            this.connected.projector_second = device;
+        else if (device === 'projector_second') {
+            this.connected.projector_second = serial;
             try {
-                connectSuccess = await this.arduino.connect('projector_second', device, false);
+                connectSuccess = await this.arduino.connect('projector_second', serial, false);
             }
             catch (err) {
                 this.log.error('Error connecting to secondary projector', err);
@@ -268,115 +300,171 @@ class Devices {
             }
             this.log.info(`Connected to ${device} as PROJECTOR_SECOND`, 'SERIAL', true, true);
         }
-        else if (type === 'projector,projector_second') {
-            this.connected.projector = device;
-            this.connected.projector_second = device;
-            this.arduino.aliasSerial('projector_second', device);
+        else if (device === 'projector,projector_second') {
+            this.connected.projector = serial;
+            this.connected.projector_second = serial;
+            this.arduino.aliasSerial('projector_second', serial);
             try {
-                connectSuccess = await this.arduino.connect('projector', device, false);
+                connectSuccess = await this.arduino.connect('projector', serial, false);
             }
             catch (err) {
                 this.log.error('Error connecting to projector and secondary projector', err);
                 return false;
             }
         }
-        else if (type === 'camera_second') {
-            this.connected.camera_second = device;
+        else if (device === 'camera_second') {
+            this.connected.camera_second = serial;
             try {
-                connectSuccess = await this.arduino.connect('camera_second', device, false);
+                connectSuccess = await this.arduino.connect('camera_second', serial, false);
             }
             catch (err) {
-                console.error(err);
+                this.log.error(err);
                 return false;
             }
         }
-        else if (type === 'camera,camera_second') {
-            this.connected.camera = device;
-            this.connected.camera_second = device;
-            this.arduino.aliasSerial('camera_second', device);
+        else if (device === 'camera,camera_second') {
+            this.connected.camera = serial;
+            this.connected.camera_second = serial;
+            this.arduino.aliasSerial('camera_second', serial);
             try {
-                connectSuccess = await this.arduino.connect('camera', device, false);
+                connectSuccess = await this.arduino.connect('camera', serial, false);
             }
             catch (err) {
                 this.log.error('Error connecting to camera, camera_secondary and projector', err);
                 return false;
             }
         }
-        else if ('camera,projector,projector_second') {
-            this.connected.camera = device;
-            this.connected.projector = device;
-            this.connected.projector_second = device;
-            this.arduino.aliasSerial('projector', device);
-            this.arduino.aliasSerial('projector_second', device);
+        else if (device === 'camera,projector,projector_second') {
+            this.connected.camera = serial;
+            this.connected.projector = serial;
+            this.connected.projector_second = serial;
+            this.arduino.aliasSerial('projector', serial);
+            this.arduino.aliasSerial('projector_second', serial);
             try {
-                connectSuccess = await this.arduino.connect('camera', device, false);
+                connectSuccess = await this.arduino.connect('camera', serial, false);
             }
             catch (err) {
                 this.log.error('Error connecting to camera, projector and projector_second', err);
                 return false;
             }
         }
-        else if ('camera,camera_second,projector') {
-            this.connected.camera = device;
-            this.connected.camera_second = device;
-            this.connected.projector = device;
-            this.arduino.aliasSerial('camera_second', device);
-            this.arduino.aliasSerial('projector', device);
+        else if (device === 'camera,camera_second,projector') {
+            this.connected.camera = serial;
+            this.connected.camera_second = serial;
+            this.connected.projector = serial;
+            this.arduino.aliasSerial('camera_second', serial);
+            this.arduino.aliasSerial('projector', serial);
             try {
-                connectSuccess = await this.arduino.connect('camera', device, false);
+                connectSuccess = await this.arduino.connect('camera', serial, false);
             }
             catch (err) {
                 this.log.error('Error connecting to camera, camera_second and projector', err);
                 return false;
             }
         }
-        else if ('camera,camera_second,projector,projector_second') {
-            this.connected.camera = device;
-            this.connected.camera_second = device;
-            this.connected.projector = device;
-            this.connected.projector_second = device;
-            this.arduino.aliasSerial('camera_second', device);
-            this.arduino.aliasSerial('projector', device);
-            this.arduino.aliasSerial('projector_second', device);
+        else if (device === 'camera,camera_second,projector,projector_second') {
+            this.connected.camera = serial;
+            this.connected.camera_second = serial;
+            this.connected.projector = serial;
+            this.connected.projector_second = serial;
+            this.arduino.aliasSerial('camera_second', serial);
+            this.arduino.aliasSerial('projector', serial);
+            this.arduino.aliasSerial('projector_second', serial);
             try {
-                connectSuccess = await this.arduino.connect('camera', device, false);
+                connectSuccess = await this.arduino.connect('camera', serial, false);
             }
             catch (err) {
                 this.log.error('Error connecting to camera, camera_second, projector and projector_second', err);
                 return false;
             }
         }
+        else if (device === 'capper') {
+            this.connected.capper = serial;
+            try {
+                connectSuccess = await this.arduino.connect('capper', serial, false);
+            }
+            catch (err) {
+                this.log.error('Error connecting capper', err);
+                return false;
+            }
+        }
+        else if (device === 'camera,capper') {
+            this.connected.camera = serial;
+            this.connected.capper = serial;
+            this.arduino.aliasSerial('capper', serial);
+            try {
+                connectSuccess = await this.arduino.connect('camera', serial, false);
+            }
+            catch (err) {
+                this.log.error('Error connecting to camera and capper', err);
+                return false;
+            }
+        }
+        else if (device === 'camera,capper,projector') {
+            this.connected.camera = serial;
+            this.connected.capper = serial;
+            this.connected.projector = serial;
+            this.arduino.aliasSerial('capper', serial);
+            this.arduino.aliasSerial('projector', serial);
+            try {
+                connectSuccess = await this.arduino.connect('camera', serial, false);
+            }
+            catch (err) {
+                this.log.error('Error connecting to camera, capper and projector', err);
+                return false;
+            }
+        }
+        else if (device === 'camera,capper,projector,projector_second') {
+            this.connected.camera = serial;
+            this.connected.capper = serial;
+            this.connected.projector = serial;
+            this.connected.projector_second = serial;
+            this.arduino.aliasSerial('capper', serial);
+            this.arduino.aliasSerial('projector', serial);
+            this.arduino.aliasSerial('projector_second', serial);
+            try {
+                connectSuccess = await this.arduino.connect('camera', serial, false);
+            }
+            catch (err) {
+                this.log.error('Error connecting to camera, capper, projector and projector_second', err);
+                return false;
+            }
+        }
         return connectSuccess;
     }
     /**
-    *
-    **/
+     *
+     **/
     //Cases for 1 or 2 arduinos connected
-    async all(devices) {
+    async all(serials) {
         let c = {};
         let p = {};
         let l = {};
-        let type;
+        let device;
         let d;
         let cs = {};
         let ps = {};
+        let capper = {};
         let checklist = [];
+        let exposure;
+        let parts;
         this.connected = {
             projector: false,
             camera: false,
             light: false,
-            projector_second: false
+            projector_second: false,
+            capper: false
         };
-        for (let device of devices) {
+        for (let serial of serials) {
             try {
-                type = await this.distinguish(device);
+                device = await this.distinguish(serial);
             }
             catch (err) {
                 this.log.error('Error distinguishing device', err);
                 throw err;
             }
             try {
-                await this.connectDevice(device, type);
+                await this.connectDevice(device, serial);
             }
             catch (err) {
                 this.log.error('Error connecting to device', err);
@@ -387,56 +475,82 @@ class Devices {
         if (!this.connected.projector) {
             await this.fakeProjector();
         }
+        else if (this.arduino.hasState['projector']) {
+            p.state = true;
+        }
         p.arduino = this.connected.projector;
         if (!this.connected.camera) {
             await this.fakeCamera();
         }
+        else if (this.arduino.hasState['camera']) {
+            if (device.indexOf('camera') !== -1) {
+                parts = this.arduino.stateStr[device].split('G');
+                if (parts.length > 1) {
+                    parts = parts[1].split('H');
+                    exposure = parseInt(parts[0]);
+                    if (!isNaN(exposure)) {
+                        this.log.info(`Timing for [${device}] = ${exposure}`);
+                        this.ui.send('timing', { c: 'c', ms: exposure });
+                    }
+                }
+            }
+            c.state = true;
+            c.exposure = true;
+        }
         c.arduino = this.connected.camera;
         if (!this.connected.light) {
             await this.fakeLight();
         }
         l.arduino = this.connected.light;
         if (this.connected.camera_second) {
-            cs = { arduino: this.connected.camera_second };
+            cs.arduino = this.connected.camera_second;
         }
         if (this.connected.projector_second) {
-            ps = { arduino: this.connected.projector_second };
+            ps.arduino = this.connected.projector_second;
+        }
+        if (this.connected.capper) {
+            capper.arduino = this.connected.capper;
         }
         if (this.settings.state.camera && this.settings.state.camera.intval) {
             c.intval = this.settings.state.camera.intval;
         }
-        return this.ready(p, c, l, cs, ps);
+        return this.ready(p, c, l, cs, ps, capper);
     }
     /**
-    *
-    **/
-    remember(which, device, type) {
+     *
+     **/
+    remember(device, serial, type) {
         let deviceEntry;
         const match = this.settings.state.devices.filter((dev) => {
-            if (dev[which] && dev[which] === device) {
+            if (typeof dev.device !== 'undefined' && dev.device === device &&
+                typeof dev.serial !== 'undefined' && dev.serial === serial) {
                 return dev;
             }
         });
         if (match.length === 0) {
             deviceEntry = {
-                type: type
+                device,
+                type,
+                serial
             };
-            deviceEntry[which] = device;
             this.settings.state.devices.push(deviceEntry);
             this.settings.update('devices', this.settings.state.devices);
             this.settings.save();
         }
     }
     /**
-    *
-    **/
-    ready(projector, camera, light, camera_second, projector_second) {
+     *
+     **/
+    ready(projector, camera, light, camera_second, projector_second, capper) {
         let args = {
             camera,
             projector,
             light,
             profile: this.settings.state.profile
         };
+        if (this.settings.state.timing) {
+            args.timing = this.settings.state.timing;
+        }
         if (projector_second && projector_second.arduino) {
             args.projector_second = projector_second;
             this.settings.update('projector_second', projector_second);
@@ -452,6 +566,11 @@ class Devices {
                 this.mainWindow.setSize(800, 800);
             }
         }
+        if (capper && capper.arduino) {
+            args.capper = capper;
+            this.mainWindow.setSize(800, 800);
+            this.settings.update('capper', capper);
+        }
         this.settings.update('camera', camera);
         this.settings.update('projector', projector);
         this.settings.update('light', light);
@@ -460,7 +579,6 @@ class Devices {
         return true;
     }
 }
-module.exports = function (arduino, settings, mainWindow, cam) {
-    return new Devices(arduino, settings, mainWindow, cam);
-};
+exports.Devices = Devices;
+module.exports = { Devices };
 //# sourceMappingURL=index.js.map

app/lib/display/Readme.md

@@ -0,0 +1,9 @@
+<a name="module_lib/display"></a>
+
+## lib/display
+<a name="module_lib/display..electron_1"></a>
+
+### lib/display~electron\_1
+Provides features for displaying a full screen display of images for the digital module.
+
+**Kind**: inner constant of [<code>lib/display</code>](#module_lib/display)  

app/lib/display/index.d.ts

@@ -0,0 +1,18 @@
+import type { System } from 'system';
+export declare class Display {
+    private platform;
+    private displays;
+    private display;
+    private tmpdir;
+    private wv;
+    constructor(sys: System);
+    open(): Promise<void>;
+    show(src: string): Promise<void>;
+    showPath(pathStr: string): Promise<unknown>;
+    hide(): void;
+    close(): Promise<boolean>;
+    focus(): Promise<boolean>;
+    field(ratio: number): Promise<boolean>;
+    meter(): Promise<boolean>;
+    change(id: string): void;
+}

app/lib/display/index.js

@@ -1,22 +1,28 @@
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Display = void 0;
+/**
+ * @module lib/display */
 /**
- * @module display
  * Provides features for displaying a full screen display of images for the digital module.
  **/
+const electron_1 = require("electron");
 const path_1 = require("path");
 const url_1 = require("url");
 const delay_1 = require("delay");
-const { BrowserWindow } = require('electron');
+const log_1 = require("log");
 class WebView {
     constructor(platform, display) {
         this.opened = false;
         this.showing = false;
         this.loadWait = {};
+        this.ipc = electron_1.ipcMain;
         const prefs = {
             webPreferences: {
                 nodeIntegration: true,
-                allowRunningInsecureContent: false
+                allowRunningInsecureContent: false,
+                //enableRemoteModule: true,
+                contextIsolation: false
             },
             width: 800,
             height: 600,
@@ -24,16 +30,18 @@ class WebView {
             minHeight: 600 //,
             //icon: path.join(__dirname, '../../assets/icons/icon.png')
         };
-        const pagePath = path_1.normalize(path_1.join(__dirname, '../../display.html'));
-        const pageUrl = url_1.format({
+        const pagePath = (0, path_1.normalize)((0, path_1.join)(__dirname, '../../display.html'));
+        const pageUrl = (0, url_1.format)({
             pathname: pagePath,
             protocol: 'file:'
         });
+        this.init();
         if (!display.primary) {
             prefs.x = display.x + 50;
             prefs.y = display.y + 50;
         }
-        this.digitalWindow = new BrowserWindow(prefs);
+        this.digitalWindow = new electron_1.BrowserWindow(prefs);
+        require('@electron/remote/main').enable(this.digitalWindow.webContents);
         this.digitalWindow.loadURL(pageUrl);
         if (process.argv.indexOf('-d') !== -1 || process.argv.indexOf('--dev') !== -1) {
             this.digitalWindow.webContents.openDevTools();
@@ -45,30 +53,32 @@ class WebView {
         //this.digitalWindow.hide();
         this.platform = platform;
         this.display = display;
-        this.ipc = require('electron').ipcMain;
         this.ipc.on('display_load', this.onLoad.bind(this));
     }
+    async init() {
+        this.log = await (0, log_1.Log)({ label: 'devices' });
+    }
     async open() {
         this.digitalWindow.show();
         this.showing = true;
         this.opened = true;
         await this.digitalWindow.setFullScreen(true);
-        await delay_1.delay(300);
+        await (0, delay_1.delay)(300);
         if (this.platform === 'osx') {
-            await delay_1.delay(300); //give macs an extra 300ms to open fullscreen
+            await (0, delay_1.delay)(300); //give macs an extra 300ms to open fullscreen
         }
     }
     async show(src) {
-        const normalSrc = path_1.normalize(path_1.join(src));
+        const normalSrc = (0, path_1.normalize)((0, path_1.join)(src));
         if (!this.digitalWindow) {
-            console.warn(`Cannot show "${src}" because window does not exist`);
+            this.log.warn(`Cannot show "${src}" because window does not exist`);
             return false;
         }
         try {
             this.digitalWindow.webContents.send('display', { src: normalSrc });
         }
         catch (err) {
-            console.error(err);
+            this.log.error('Error displaying ${normalSrc}', err);
         }
         this.showing = true;
         return new Promise(function (resolve) {
@@ -83,41 +93,41 @@ class WebView {
     }
     async focus() {
         if (!this.digitalWindow) {
-            console.warn(`Cannot show focus screen because window does not exist`);
+            this.log.warn(`Cannot show focus screen because window does not exist`);
             return false;
         }
-        await delay_1.delay(500);
+        await (0, delay_1.delay)(500);
         try {
             this.digitalWindow.webContents.send('focus', { focus: true });
         }
         catch (err) {
-            console.error(err);
+            this.log.error(err);
         }
     }
     async field(ratio) {
         if (!this.digitalWindow) {
-            console.warn(`Cannot show field guide because window does not exist`);
+            this.log.warn(`Cannot show field guide because window does not exist`);
             return false;
         }
-        await delay_1.delay(500);
+        await (0, delay_1.delay)(500);
         try {
             this.digitalWindow.webContents.send('field', { field: true, ratio });
         }
         catch (err) {
-            console.error(err);
+            this.log.error(err);
         }
     }
     async meter() {
         if (!this.digitalWindow) {
-            console.warn(`Cannot show meter screen because window does not exist`);
+            this.log.warn(`Cannot show meter screen because window does not exist`);
             return false;
         }
-        await delay_1.delay(500);
+        await (0, delay_1.delay)(500);
         try {
             this.digitalWindow.webContents.send('meter', { meter: true });
         }
         catch (err) {
-            console.error(err);
+            this.log.error(err);
         }
     }
     hide() {
@@ -142,7 +152,7 @@ class Display {
     constructor(sys) {
         this.platform = sys.platform;
         this.displays = sys.displays;
-        this.tmpdir = path_1.join(sys.tmp, 'mcopy_digital');
+        this.tmpdir = (0, path_1.join)(sys.tmp, 'mcopy_digital');
         this.display = this.displays.find((display) => {
             if (display.primary)
                 return true;
@@ -184,7 +194,6 @@ class Display {
         });
     }
 }
-module.exports = function (sys) {
-    return new Display(sys);
-};
+exports.Display = Display;
+module.exports = { Display };
 //# sourceMappingURL=index.js.map

app/lib/exec/index.d.ts

@@ -0,0 +1,17 @@
+interface ExecOutput {
+    stdout: string;
+    stderr: string;
+}
+/**
+ * Promisified child_process.exec
+ *
+ * @param cmd
+ * @param arg
+ * @param opts See child_process.exec node docs
+ * @param {stream.Writable} opts.stdout If defined, child process stdout will be piped to it.
+ * @param {stream.Writable} opts.stderr If defined, child process stderr will be piped to it.
+ *
+ * @returns {Promise<{ stdout: string, stderr: stderr }>}
+ */
+export declare function exec(...args: string[]): Promise<ExecOutput>;
+export type { ExecOutput };

app/lib/exec/index.js

@@ -1,5 +1,7 @@
 'use strict';
-const execRaw = require('child_process').exec;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.exec = void 0;
+const child_process_1 = require("child_process");
 /**
  * Promisified child_process.exec
  *
@@ -28,7 +30,7 @@ async function exec(...args) {
         opts = { maxBuffer: 1024 * 1024 };
     }
     return new Promise((resolve, reject) => {
-        const child = execRaw(cmd, opts, (err, stdout, stderr) => err ? reject(err) : resolve({
+        const child = (0, child_process_1.exec)(cmd, opts, (err, stdout, stderr) => err ? reject(err) : resolve({
             stdout,
             stderr
         }));
@@ -40,5 +42,6 @@ async function exec(...args) {
         }
     });
 }
-module.exports.exec = exec;
+exports.exec = exec;
+module.exports = { exec };
 //# sourceMappingURL=index.js.map

app/lib/exec/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/exec/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;AAEZ,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,IAAI,CAAA;AAE7C;;;;;;;;;;GAUG;AACH,KAAK,UAAU,IAAI,CAAC,GAAG,IAAe;IACrC,IAAI,GAAG,GAAY,IAAI,CAAC,CAAC,CAAC,CAAA;IAC1B,IAAI,IAAI,GAAY,IAAI,CAAA;IACxB,IAAI,IAAI,GAAS,IAAI,CAAA;IAErB,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;QAC1D,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;KACd;IACD,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;QACjD,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;KACd;SAAM,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;QACvC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;KACd;IACD,IAAI,IAAI,KAAK,IAAI,EAAE;QAClB,IAAI,GAAG,EAAE,SAAS,EAAG,IAAI,GAAG,IAAI,EAAE,CAAA;KAClC;IACE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACtC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE,IAAI,EACjC,CAAC,GAAW,EAAE,MAAe,EAAE,MAAc,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC7E,MAAM;YACN,MAAM;SACN,CAAC,CAAC,CAAC;QACC,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAClC;QACD,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAClC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/exec/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAA;;;AAEZ,iDAA+C;AAO/C;;;;;;;;;;GAUG;AACI,KAAK,UAAU,IAAI,CAAC,GAAG,IAAe;IAC5C,IAAI,GAAG,GAAY,IAAI,CAAC,CAAC,CAAC,CAAA;IAC1B,IAAI,IAAI,GAAY,IAAI,CAAA;IACxB,IAAI,IAAI,GAAS,IAAI,CAAA;IAErB,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE;QAC1D,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;KACd;IACD,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;QACjD,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;KACd;SAAM,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE;QACvC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;KACd;IACD,IAAI,IAAI,KAAK,IAAI,EAAE;QAClB,IAAI,GAAG,EAAE,SAAS,EAAG,IAAI,GAAG,IAAI,EAAE,CAAA;KAClC;IACE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAkB,EAAE,MAAiB,EAAE,EAAE;QAC5D,MAAM,KAAK,GAAG,IAAA,oBAAO,EAAC,GAAG,EAAE,IAAI,EACjC,CAAC,GAAW,EAAE,MAAe,EAAE,MAAc,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAC7E,MAAM;YACN,MAAM;SACN,CAAC,CAAC,CAAC;QACC,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAClC;QACD,IAAI,IAAI,CAAC,MAAM,EAAE;YACb,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SAClC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AA7BD,oBA6BC;AAED,MAAM,CAAC,OAAO,GAAG,EAAE,IAAI,EAAE,CAAA"}

app/lib/exit/index.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Exit process with either a 0 code or other
+ * specified failure code. Print message to console first.
+ *
+ * @param {string}  msg 	Reason for exit
+ * @param {integer} code 	process exit code, default 0
+ **/
+declare function exit(msg: string, code?: number): void;

app/lib/exit/index.js

@@ -16,5 +16,5 @@ function exit(msg, code = 0) {
         process.exit(code);
     }
 }
-module.exports.exit = exit;
+module.exports = { exit };
 //# sourceMappingURL=index.js.map

app/lib/exit/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/exit/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb;;;;;;IAMI;AAEJ,SAAS,IAAI,CAAE,GAAY,EAAE,OAAgB,CAAC;IAC7C,IAAI,IAAI,KAAK,CAAC,EAAE;QACf,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,EAAE,CAAC;KACf;SAAM;QACN,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACnB;AACF,CAAC;AAED,MAAM,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/exit/index.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb;;;;;;IAMI;AAEJ,SAAS,IAAI,CAAE,GAAY,EAAE,OAAgB,CAAC;IAC7C,IAAI,IAAI,KAAK,CAAC,EAAE;QACf,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,EAAE,CAAC;KACf;SAAM;QACN,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACnB;AACF,CAAC;AAED,MAAM,CAAC,OAAO,GAAG,EAAE,IAAI,EAAE,CAAC"}