From 42621bbf7184f4acf78757bb257638efa961707d Mon Sep 17 00:00:00 2001 From: mmcwilliams Date: Sun, 5 Jan 2020 12:40:38 -0500 Subject: [PATCH] Devices discovery WIP --- app/data/cfg.json | 2 +- app/lib/ui/devices.js | 10 ++++++++-- app/package-lock.json | 12 ++++++------ app/package.json | 2 +- app/src/lib/ui/devices.ts | 10 +++++++--- cli/data/cfg.json | 2 +- processing/mcopy/cfg.json | 2 +- 7 files changed, 25 insertions(+), 15 deletions(-) diff --git a/app/data/cfg.json b/app/data/cfg.json index 8c4c62c..0c876af 100644 --- a/app/data/cfg.json +++ b/app/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.4.18", + "version": "1.4.19", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/app/lib/ui/devices.js b/app/lib/ui/devices.js index 520db94..dad4302 100644 --- a/app/lib/ui/devices.js +++ b/app/lib/ui/devices.js @@ -20,8 +20,14 @@ class Devices { let devs = []; let notify = 'Connected to '; let p; - gui.spinner(false); - gui.overlay(false); + try { + gui.spinner(false); + gui.overlay(false); + console.log('got here'); + } + catch (err) { + console.error(err); + } for (let i in arg) { devs.push(arg[i].arduino); if (arg[i].arduino && arg[i].arduino !== '/dev/fake') { diff --git a/app/package-lock.json b/app/package-lock.json index 6e16335..f1f4958 100644 --- a/app/package-lock.json +++ b/app/package-lock.json @@ -157,9 +157,9 @@ } }, "@types/node": { - "version": "12.12.18", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.18.tgz", - "integrity": "sha512-DBkZuIMFuAfjJHiunyRc+aNvmXYNwV1IPMgGKGlwCp6zh6MKrVtmvjSWK/axWcD25KJffkXgkfvFra8ndenXAw==", + "version": "12.12.21", + "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.21.tgz", + "integrity": "sha512-8sRGhbpU+ck1n0PGAUgVrWrWdjSW2aqNeyC15W88GRsMpSwzv6RJGlLhE7s2RhVSOdyDmxbqlWSeThq4/7xqlA==", "dev": true }, "@types/semver": { @@ -1791,9 +1791,9 @@ } }, "electron": { - "version": "7.1.5", - "resolved": "https://registry.npmjs.org/electron/-/electron-7.1.5.tgz", - "integrity": "sha512-jagsvNz6Axu2Lsp5PqDgkcR+4BwoPP9YyLgMu9lhpFNRNKpNgfsEqUbtNolkFN/TtmWjxGO+iioWRrGqZHmJ8w==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/electron/-/electron-7.1.6.tgz", + "integrity": "sha512-0QSxQYYzSrBRbctKgAWS79k/I+vm95I7bz/zTuF0Qv4PvTtQf5hK21q6wtyKVPPJFFXnmSyvfQ2ce6iktfgK8g==", "dev": true, "requires": { "@electron/get": "^1.0.1", diff --git a/app/package.json b/app/package.json index ef92a6e..9906230 100644 --- a/app/package.json +++ b/app/package.json @@ -30,7 +30,7 @@ "devDependencies": { "@types/jquery": "^3.3.31", "chai": "^4.2.0", - "electron": "^7.1.5", + "electron": "^7.1.6", "electron-installer-common": "^0.8.0", "electron-installer-dmg": "^3.0.0", "electron-packager": "^14.1.1", diff --git a/app/src/lib/ui/devices.ts b/app/src/lib/ui/devices.ts index df8ea93..8cca614 100644 --- a/app/src/lib/ui/devices.ts +++ b/app/src/lib/ui/devices.ts @@ -40,9 +40,13 @@ class Devices { let notify : string = 'Connected to '; let p : any; - gui.spinner(false); - gui.overlay(false); - + try { + gui.spinner(false); + gui.overlay(false); + console.log('got here'); + } catch (err) { + console.error(err); + } for (let i in arg) { devs.push(arg[i].arduino); if (arg[i].arduino && arg[i].arduino !== '/dev/fake') { diff --git a/cli/data/cfg.json b/cli/data/cfg.json index 8c4c62c..0c876af 100644 --- a/cli/data/cfg.json +++ b/cli/data/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.4.18", + "version": "1.4.19", "ext_port": 1111, "profiles": { "mcopy": { diff --git a/processing/mcopy/cfg.json b/processing/mcopy/cfg.json index 8c4c62c..0c876af 100644 --- a/processing/mcopy/cfg.json +++ b/processing/mcopy/cfg.json @@ -1,5 +1,5 @@ { - "version": "1.4.18", + "version": "1.4.19", "ext_port": 1111, "profiles": { "mcopy": {