vmario/Doodle3D-Slicer
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Slicer.git synced 2024-12-23 11:33:49 +01:00
Code Issues Projects Releases Wiki Activity

simplified add gcode

Browse Source
This commit is contained in:
casperlamboo 2016-03-29 15:56:32 +02:00 committed by Simon Voordouw
parent 4747d072b9
commit 8fb0c6090a
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/gcode.js
View File

@ -11,33 +11,35 @@ export default class {
this.isFanOn = false; this.isFanOn = false;
this._nozzlePosition = new THREE.Vector2(0, 0); this._nozzlePosition = new THREE.Vector2(0, 0);
} }
_addGCode (command) {
var str = '';
var first = true;
for (var i in command) { _addGCode (command) {
let str = '';
let first = true;
for (const action in command) {
const value = command[action];
const currentValue = this.current[action];
if (first) { if (first) {
str = i + command[i]; str = action + value;
first = false; first = false;
} }
else if (this.current[i] !== command[i]) { else if (currentValue !== value) {
str += ' ' + i + command[i]; str += ` ${action}${value}`;
this.current[i] = command[i]; this.current[action] = value;
} }
} }
this.gcode += str + '\n'; this.gcode += str + '\n';
} }
setSettings (settings) { setSettings (settings) {
this.settings = settings; this.settings = settings;
return this; return this;
} }
turnFanOn (fanSpeed) { turnFanOn (fanSpeed) {
this.isFanOn = true; this.isFanOn = true;
@ -53,7 +55,7 @@ export default class {
return this; return this;
} }
turnFanOff () { turnFanOff () {
this.isFanOn = false; this.isFanOn = false;
@ -63,25 +65,25 @@ export default class {
return this; return this;
} }
moveTo (x, y, layer) { moveTo (x, y, layer) {
var layerHeight = this.settings.config['layerHeight']; var layerHeight = this.settings.config['layerHeight'];
var travelSpeed = this.settings.config['travelSpeed']; var travelSpeed = this.settings.config['travelSpeed'];
var z = (layer + 1) * layerHeight; var z = (layer + 1) * layerHeight;
var speed = travelSpeed * 60; var speed = travelSpeed * 60;
this._addGCode({ this._addGCode({
'G': 0, 'G': 0,
'X': x.toFixed(3), 'Y': y.toFixed(3), 'Z': z.toFixed(3), 'X': x.toFixed(3), 'Y': y.toFixed(3), 'Z': z.toFixed(3),
'F': speed.toFixed(3) 'F': speed.toFixed(3)
}); });
this._nozzlePosition.set(x, y); this._nozzlePosition.set(x, y);
return this; return this;
} }
lineTo (x, y, layer, type) { lineTo (x, y, layer, type) {
var newNozzlePosition = new THREE.Vector2(x, y); var newNozzlePosition = new THREE.Vector2(x, y);
@ -103,8 +105,8 @@ export default class {
this._addGCode({ this._addGCode({
'G': 1, 'G': 1,
'X': x.toFixed(3), 'Y': y.toFixed(3), 'Z': z.toFixed(3), 'X': x.toFixed(3), 'Y': y.toFixed(3), 'Z': z.toFixed(3),
'F': speed.toFixed(3), 'F': speed.toFixed(3),
'E': this.extruder.toFixed(3) 'E': this.extruder.toFixed(3)
}); });
@ -112,7 +114,7 @@ export default class {
return this; return this;
} }
unRetract () { unRetract () {
var retractionEnabled = this.settings.config['retractionEnabled']; var retractionEnabled = this.settings.config['retractionEnabled'];
var retractionMinDistance = this.settings.config['retractionMinDistance']; var retractionMinDistance = this.settings.config['retractionMinDistance'];
@ -125,8 +127,8 @@ export default class {
if (this.extruder > retractionMinDistance) { if (this.extruder > retractionMinDistance) {
this._addGCode({ this._addGCode({
'G': 0, 'G': 0,
'E': this.extruder.toFixed(3), 'E': this.extruder.toFixed(3),
'F': speed.toFixed(3) 'F': speed.toFixed(3)
}); });
} }
@ -134,7 +136,7 @@ export default class {
return this; return this;
} }
retract () { retract () {
var retractionAmount = this.settings.config['retractionAmount']; var retractionAmount = this.settings.config['retractionAmount'];
var retractionEnabled = this.settings.config['retractionEnabled']; var retractionEnabled = this.settings.config['retractionEnabled'];
@ -143,13 +145,13 @@ export default class {
if (!this.isRetracted && retractionEnabled) { if (!this.isRetracted && retractionEnabled) {
this.isRetracted = true; this.isRetracted = true;
var speed = retractionSpeed * 60; var speed = retractionSpeed * 60;
if (this.extruder > retractionMinDistance && retractionEnabled) { if (this.extruder > retractionMinDistance && retractionEnabled) {
this._addGCode({ this._addGCode({
'G': 0, 'G': 0,
'E': (this.extruder - retractionAmount).toFixed(3), 'E': (this.extruder - retractionAmount).toFixed(3),
'F': speed.toFixed(3) 'F': speed.toFixed(3)
}); });
} }
@ -157,7 +159,7 @@ export default class {
return this; return this;
} }
getGCode () { getGCode () {
return this.settings.startCode() + this.gcode + this.settings.endCode(); return this.settings.startCode() + this.gcode + this.settings.endCode();
} }