From 3cb9990a472164b118642a83c9b6c372b6b615f2 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Tue, 19 Jul 2016 16:14:48 +0200 Subject: [PATCH 1/8] add ; --- example/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/app.js b/example/app.js index c90aeec..4ee2141 100644 --- a/example/app.js +++ b/example/app.js @@ -12,7 +12,7 @@ doodle3DManager.addEventListener('boxappeared', ({ box }) => { box.addEventListener('disconnect', () => { console.log('disonnect to box', box); - }) + }); box.addEventListener('update', ({ state }) => { console.log(state); From 2e3b174d3bdafec467dd1e2914709fe3fa8c2085 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Wed, 20 Jul 2016 10:16:53 +0200 Subject: [PATCH 2/8] clean up code is in single line --- src/api/network.js | 8 ++------ src/api/printer.js | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/api/network.js b/src/api/network.js index 0348bc2..af15500 100644 --- a/src/api/network.js +++ b/src/api/network.js @@ -14,9 +14,7 @@ export default class Network { return rest.get(`${ this.api }network/status`); } assosiate(ssid, phrase, recreate = false) { - const data = { ssid, recreate, phrase }; - - return rest.post(`${ this.api }network/associate`, data); + return rest.post(`${ this.api }network/associate`, { ssid, phrase, recreate }); } disassociate() { //not tested @@ -27,9 +25,7 @@ export default class Network { return rest.post(`${ this.api }network/openap`, {}); } remove(ssid) { - return rest.post(`${ this.api }network/remove`, { - 'ssid': ssid - }); + return rest.post(`${ this.api }network/remove`, { ssid }); } signin() { return rest.get(`${ this.api }network/signin`); diff --git a/src/api/printer.js b/src/api/printer.js index 1d1a53d..a01e4bf 100644 --- a/src/api/printer.js +++ b/src/api/printer.js @@ -20,13 +20,9 @@ export default class Printer { return rest.post(`${ this.api }printer/heatup`, {}); } print(gcode = '', first = false, start = false, last) { - const data = { gcode, first, start, last }; - - return rest.post(`${ this.api }printer/print`, data); + return rest.post(`${ this.api }printer/print`, { gcode, first, start, last }); } stop(gcode = '') { - const data = { gcode }; - - return rest.post(`${ this.api }printer/stop`, data); + return rest.post(`${ this.api }printer/stop`, { gcode }); } } From 0500c37bc7af67b2c6f8f1f0c0129b2e3bd27fcc Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Wed, 20 Jul 2016 10:17:37 +0200 Subject: [PATCH 3/8] pass index argument to sendBatch --- src/doodle3dbox.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/doodle3dbox.js b/src/doodle3dbox.js index dfb7da6..a3b2f47 100644 --- a/src/doodle3dbox.js +++ b/src/doodle3dbox.js @@ -69,7 +69,7 @@ export default class Doodle3DBox extends EventDispatcher { // const progress = await this.printer.progress(); - await this._sendBatch(batch, start); + await this._sendBatch(batch, start, index); start = false; lastIndex = index + 1; //skip next \n @@ -92,7 +92,7 @@ export default class Doodle3DBox extends EventDispatcher { await sleep(this.updateInterval); } } - async _sendBatch(gcode, start) { + async _sendBatch(gcode, start, index) { try { const response = await this.printer.print(gcode, start, start); // maybe do something with failing response From 721c968341da9df93d9a95a8e28f0a2ec4bd8c4a Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Wed, 20 Jul 2016 10:17:47 +0200 Subject: [PATCH 4/8] remove comment --- src/doodle3dbox.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/doodle3dbox.js b/src/doodle3dbox.js index a3b2f47..76117ec 100644 --- a/src/doodle3dbox.js +++ b/src/doodle3dbox.js @@ -95,7 +95,6 @@ export default class Doodle3DBox extends EventDispatcher { async _sendBatch(gcode, start, index) { try { const response = await this.printer.print(gcode, start, start); - // maybe do something with failing response console.log(`batch sent: ${ index }`); } catch(error) { From ce6824ab8b1c40aa86ede97d7d1c68901f11adf1 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Tue, 2 Aug 2016 17:59:39 +0200 Subject: [PATCH 5/8] move send batch to printer api --- src/api/printer.js | 13 +++++++++++++ src/doodle3dbox.js | 15 +-------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/api/printer.js b/src/api/printer.js index a01e4bf..47bf979 100644 --- a/src/api/printer.js +++ b/src/api/printer.js @@ -25,4 +25,17 @@ export default class Printer { stop(gcode = '') { return rest.post(`${ this.api }printer/stop`, { gcode }); } + async _sendBatch(gcode, start, index) { + try { + const response = await this.print(gcode, start, start); + + console.log(`batch sent: ${ index }`); + } catch(error) { + console.log(`failed sending batch: ${ index }`); + + await sleep(1000); + + await this._sendBatch(gcode, index); + } + } } diff --git a/src/doodle3dbox.js b/src/doodle3dbox.js index 76117ec..fb85173 100644 --- a/src/doodle3dbox.js +++ b/src/doodle3dbox.js @@ -69,7 +69,7 @@ export default class Doodle3DBox extends EventDispatcher { // const progress = await this.printer.progress(); - await this._sendBatch(batch, start, index); + await this.printer._sendBatch(batch, start, index); start = false; lastIndex = index + 1; //skip next \n @@ -92,17 +92,4 @@ export default class Doodle3DBox extends EventDispatcher { await sleep(this.updateInterval); } } - async _sendBatch(gcode, start, index) { - try { - const response = await this.printer.print(gcode, start, start); - - console.log(`batch sent: ${ index }`); - } catch(error) { - console.log(`failed sending batch: ${ index }`); - - await sleep(1000); - - await this._sendBatch(gcode, index); - } - } } From 4d77ab2ffe3b0ddeb8b6257f188b7225025f0ad6 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Fri, 19 Aug 2016 15:36:21 +0200 Subject: [PATCH 6/8] add jspm dependency --- .gitignore | 1 + package.json | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 53b0e4b..25dcdde 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ jspm_packages/* example/test.gcode +node_modules/* build.js diff --git a/package.json b/package.json index 51e08e8..40487f4 100644 --- a/package.json +++ b/package.json @@ -50,5 +50,8 @@ } } } + }, + "dependencies": { + "jspm": "^0.17.0-beta.25" } } From f499693465b0900be9ebc4aa550312bb5302cd59 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Fri, 19 Aug 2016 16:02:11 +0200 Subject: [PATCH 7/8] better handling when device is connected to wifi-box acces point --- src/doodle3dmanager.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/doodle3dmanager.js b/src/doodle3dmanager.js index 46d0615..871d7f9 100644 --- a/src/doodle3dmanager.js +++ b/src/doodle3dmanager.js @@ -18,7 +18,7 @@ export default class Doodle3DManager extends EventDispatcher { wifiboxid: 'Node JS Server', localip: '127.0.0.1:3000' }*/]; - this.checkNonServerBoxes = false; + this.checkNonServerBoxes = true; this.autoUpdate = false; } @@ -39,12 +39,11 @@ export default class Doodle3DManager extends EventDispatcher { } } async _checkNew() { - let boxes; + let boxes = []; try { boxes = await rest.get(`${ this.api }list.php`); } catch(error) { console.warn('fail connecting to Doodle3D server'); - return; } if (this.checkNonServerBoxes) boxes = boxes.concat(this.nonServerBoxes); From aadde22a4e887c3990e048d5f27b43f08824157a Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Fri, 19 Aug 2016 16:07:55 +0200 Subject: [PATCH 8/8] setautoupdate always returns true --- src/doodle3dbox.js | 2 +- src/doodle3dmanager.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/doodle3dbox.js b/src/doodle3dbox.js index fb85173..fd3c6fe 100644 --- a/src/doodle3dbox.js +++ b/src/doodle3dbox.js @@ -33,7 +33,7 @@ export default class Doodle3DBox extends EventDispatcher { } setAutoUpdate(autoUpdate = true, updateInterval = 1000) { this.updateInterval = updateInterval; - if (this.autoUpdate === autoUpdate) return; + if (this.autoUpdate === autoUpdate) return this; this.autoUpdate = autoUpdate; if (autoUpdate) this._update(); diff --git a/src/doodle3dmanager.js b/src/doodle3dmanager.js index 871d7f9..3b8ddac 100644 --- a/src/doodle3dmanager.js +++ b/src/doodle3dmanager.js @@ -24,7 +24,7 @@ export default class Doodle3DManager extends EventDispatcher { } setAutoUpdate(autoUpdate = true, updateInterval = 1000) { this.updateInterval = updateInterval; - if (this.autoUpdate === autoUpdate) return; + if (this.autoUpdate === autoUpdate) return this; this.autoUpdate = autoUpdate; if (autoUpdate) this._update();