From e7ac873f41896be7003bb62a1f0839410c7b5326 Mon Sep 17 00:00:00 2001
From: mmcwilliams <hi@mmcwilliams.com>
Date: Wed, 13 Feb 2019 18:49:59 -0500
Subject: [PATCH] Two birds, one commit. Can even pull out the bad logic of the
 light.state.on value, but that's not hurting anybody.

---
 app/main.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/main.js b/app/main.js
index 9a23659..2ad9df2 100644
--- a/app/main.js
+++ b/app/main.js
@@ -554,11 +554,10 @@ dig.move = async function () {
 	if (dig.state.frame < 1) {
 		dig.state.frame = 1
 	}
+	return (+new Date()) - start
+}
 
-	if (last > 0) {
-		display.end()
-	}
-
+dig.start = async function () {
 	try {
 		await ffmpeg.clearAll()
 	} catch (err) {
@@ -572,10 +571,12 @@ dig.move = async function () {
 	}
 
 	display.start(dig.state.frame)
+	await delay(20)
+}
 
-	await delay(600)
-
-	return (+new Date()) - start
+dig.end = async function () {
+	await delay(20)
+	display.end()
 }
 
 cam.intval = null
@@ -614,11 +615,14 @@ cam.set = async function (dir, id) {
 cam.move = async function (frame, id) {
 	const cmd = mcopy.cfg.arduino.cmd.camera
 	let ms
+	if (proj.digital) {
+		await dig.start()
+	}
 	if (cam.intval) {
 		try {
 			ms = await cam.intval.move()
 		} catch (err) {
-			console.error(err);
+			console.error(err)
 		}
 	} else { 
 		try {
@@ -627,6 +631,9 @@ cam.move = async function (frame, id) {
 			console.error(err)
 		}
 	}
+	if (proj.digital) {
+		await dig.end()
+	}
 	log.info('Camera move time', { ms })
 	return cam.end(cmd, id, ms)
 }