16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Devices discovery WIP

This commit is contained in:
mmcwilliams 2020-01-05 12:40:38 -05:00
parent 4c8c2b66f3
commit 42621bbf71
7 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/data/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.4.18", "version": "1.4.19",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

10
app/lib/ui/devices.js
View File

@ -20,8 +20,14 @@ class Devices {
let devs = []; let devs = [];
let notify = 'Connected to '; let notify = 'Connected to ';
let p; let p;
gui.spinner(false); try {
gui.overlay(false); gui.spinner(false);
gui.overlay(false);
console.log('got here');
}
catch (err) {
console.error(err);
}
for (let i in arg) { for (let i in arg) {
devs.push(arg[i].arduino); devs.push(arg[i].arduino);
if (arg[i].arduino && arg[i].arduino !== '/dev/fake') { if (arg[i].arduino && arg[i].arduino !== '/dev/fake') {

12
app/package-lock.json generated
View File

@ -157,9 +157,9 @@
} }
}, },
"@types/node": { "@types/node": {
"version": "12.12.18", "version": "12.12.21",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.18.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.21.tgz",
"integrity": "sha512-DBkZuIMFuAfjJHiunyRc+aNvmXYNwV1IPMgGKGlwCp6zh6MKrVtmvjSWK/axWcD25KJffkXgkfvFra8ndenXAw==", "integrity": "sha512-8sRGhbpU+ck1n0PGAUgVrWrWdjSW2aqNeyC15W88GRsMpSwzv6RJGlLhE7s2RhVSOdyDmxbqlWSeThq4/7xqlA==",
"dev": true "dev": true
}, },
"@types/semver": { "@types/semver": {
@ -1791,9 +1791,9 @@
} }
}, },
"electron": { "electron": {
"version": "7.1.5", "version": "7.1.6",
"resolved": "https://registry.npmjs.org/electron/-/electron-7.1.5.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-7.1.6.tgz",
"integrity": "sha512-jagsvNz6Axu2Lsp5PqDgkcR+4BwoPP9YyLgMu9lhpFNRNKpNgfsEqUbtNolkFN/TtmWjxGO+iioWRrGqZHmJ8w==", "integrity": "sha512-0QSxQYYzSrBRbctKgAWS79k/I+vm95I7bz/zTuF0Qv4PvTtQf5hK21q6wtyKVPPJFFXnmSyvfQ2ce6iktfgK8g==",
"dev": true, "dev": true,
"requires": { "requires": {
"@electron/get": "^1.0.1", "@electron/get": "^1.0.1",

2
app/package.json
View File

@ -30,7 +30,7 @@
"devDependencies": { "devDependencies": {
"@types/jquery": "^3.3.31", "@types/jquery": "^3.3.31",
"chai": "^4.2.0", "chai": "^4.2.0",
"electron": "^7.1.5", "electron": "^7.1.6",
"electron-installer-common": "^0.8.0", "electron-installer-common": "^0.8.0",
"electron-installer-dmg": "^3.0.0", "electron-installer-dmg": "^3.0.0",
"electron-packager": "^14.1.1", "electron-packager": "^14.1.1",

10
app/src/lib/ui/devices.ts
View File

@ -40,9 +40,13 @@ class Devices {
let notify : string = 'Connected to '; let notify : string = 'Connected to ';
let p : any; let p : any;
gui.spinner(false); try {
gui.overlay(false); gui.spinner(false);
gui.overlay(false);
console.log('got here');
} catch (err) {
console.error(err);
}
for (let i in arg) { for (let i in arg) {
devs.push(arg[i].arduino); devs.push(arg[i].arduino);
if (arg[i].arduino && arg[i].arduino !== '/dev/fake') { if (arg[i].arduino && arg[i].arduino !== '/dev/fake') {

2
cli/data/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.4.18", "version": "1.4.19",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

2
processing/mcopy/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.4.18", "version": "1.4.19",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {