From a84b1019f10b5c0e138ef67b8a56042837c27687 Mon Sep 17 00:00:00 2001
From: mmcw-dev <hi@mmcwilliams.com>
Date: Thu, 4 Jan 2018 23:52:06 -0500
Subject: [PATCH] When devices are discovered, represent that in the UI.

---
 app/index.html        | 8 ++++----
 app/js/app.js         | 2 +-
 app/lib/devices-ui.js | 9 +++++++--
 app/main.js           | 4 ++--
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/index.html b/app/index.html
index 9ada48c..bdb70fb 100644
--- a/app/index.html
+++ b/app/index.html
@@ -202,21 +202,21 @@
       </div>
       <div id="settings" class="screen">
         <h4>Devices</h4>
-        <select>
+        <select id="devices">
           
         </select>
         <button title="Refresh devices"><i class="fa fa-refresh"></i></button>
         <h4>Projector</h4>
-        <select>
+        <select id="projector_device">
           
         </select>
         <h4>Camera</h4>
-        <select>
+        <select id="camera_device">
           
         </select>
         <input type="text" id="intval" name="intval" placeholder="INTVAL3 URL"/>
         <h4>Light</h4>
-        <select>
+        <select id="light_device">
           
         </select>
       </div>
diff --git a/app/js/app.js b/app/js/app.js
index b3e1292..90eae4c 100644
--- a/app/js/app.js
+++ b/app/js/app.js
@@ -3059,7 +3059,7 @@ var { remote, ipcRenderer } = require('electron'),
 	mscript = require('./lib/mscript.js');
 
 
-mcopy.cfg = JSON.parse(fs.readFileSync('./data/cfg.json'), 'utf8');
+mcopy.cfg = require('./data/cfg.json')
 
 /******
 	State shared by ALL interfaces
diff --git a/app/lib/devices-ui.js b/app/lib/devices-ui.js
index fcf510f..4db67ae 100644
--- a/app/lib/devices-ui.js
+++ b/app/lib/devices-ui.js
@@ -8,9 +8,14 @@ devices.init = function () {
 };
 devices.listen = function () {
 	'use strict';
+	let opt
 	ipcRenderer.on('ready', function (event, arg) {
-		//console.log(arg.camera);
-		//console.log(arg.projector);
+		opt = $('<option>')
+		opt.value = arg.camera
+		opt.text = arg.camera
+		$('#camera_device').empty()
+		$('#camera_device').append(opt)
+		console.dir(arg)
 		devices.ready();
 		return event.returnValue = true;
 	});
diff --git a/app/main.js b/app/main.js
index c04f9da..bd28618 100644
--- a/app/main.js
+++ b/app/main.js
@@ -178,7 +178,7 @@ var distinguishDevices = function (devices) {
 	})
 };
 
-var devicesReady = function (camera, projector, light) {
+var devicesReady = function (projector, camera, light) {
 	mainWindow.webContents.send('ready', {camera: camera, projector: projector, light: light })
 	settings.update('camera', { arduino : camera })
 	settings.update('projector', { arduino : projector })
@@ -414,7 +414,7 @@ var init = function () {
 	settings.restore()
 
 	createWindow()
-	createMenu()
+	//createMenu()
 	log.init()
 	light.init()
 	proj.init()