From d9896c253e4dc15cc544d1bc9d7870593ecdda6f Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Fri, 3 Nov 2017 19:55:18 -0400 Subject: [PATCH] add device locking --- js/kiri.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/js/kiri.js b/js/kiri.js index 0b335710..83de50fc 100644 --- a/js/kiri.js +++ b/js/kiri.js @@ -438,6 +438,7 @@ self.kiri.license = exports.LICENSE; renderMode = 4, viewMode = VIEWS.ARRANGE, layoutOnAdd = true, + deviceLock = false, local = SETUP.local, sliceRemote = !local, printRemote = !local, @@ -2678,7 +2679,9 @@ self.kiri.license = exports.LICENSE; return UI.deviceSelect.options[UI.deviceSelect.selectedIndex].text; } - function selectDevice(devicename) { + function selectDevice(devicename, lock) { + deviceLock = lock; + if (lock) UI.setupDevices.style.display = 'none'; if (inMode('LASER')) return; if (isLocalDevice(devicename)) { setDeviceCode(settings.devices[devicename], devicename); @@ -2998,7 +3001,7 @@ self.kiri.license = exports.LICENSE; } function showDevices() { - if (MODE === MODES.LASER) return; + if (MODE === MODES.LASER || deviceLock) return; setViewMode(VIEWS.ARRANGE); @@ -3260,9 +3263,12 @@ self.kiri.license = exports.LICENSE; console.log({octoprint:OCTOPRINT}); } - // mode passed in on url + // mode passed on url var SETMODE = SETUP.mode ? SETUP.mode[0] : null; + // device name pass on url + var DEVNAME = SETUP.dev ? SETUP.dev[0] : null; + setMode(SETMODE || STARTMODE || settings.mode, SETMODE); setControlsVisible(true); updatePlatformSize(); @@ -3294,7 +3300,7 @@ self.kiri.license = exports.LICENSE; // DOC.addEventListener('visibilitychange', function() { document.title = document.hidden }); // ensure settings has gcode - selectDevice(currentDeviceName()); + selectDevice(DEVNAME || currentDeviceName(), DEVNAME); // ensure field data propagation updateSettings();