vmario/Doodle3D-Slicer
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Slicer.git synced 2024-07-03 01:21:22 +02:00
Code Issues Projects Releases Wiki Activity

add duration and filament usage

Browse Source
This commit is contained in:
casperlamboo 2017-08-03 00:17:34 +02:00
parent 9363fe58af
commit 4ededa4dfe
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/sliceActions/helpers/GCode.js
View File

@ -17,6 +17,7 @@ export default class {
this._currentValues = {}; this._currentValues = {};
this._nozzlePosition = new THREE.Vector2(0, 0); this._nozzlePosition = new THREE.Vector2(0, 0);
this._extruder = 0.0; this._extruder = 0.0;
this._duration = 0.0;
this._isRetracted = false; this._isRetracted = false;
this._isFanOn = false; this._isFanOn = false;
} }
@ -62,35 +63,37 @@ export default class {
} }
moveTo(x, y, z, { speed }) { moveTo(x, y, z, { speed }) {
speed *= 60; const newNozzlePosition = new THREE.Vector2(x, y);
const lineLength = this._nozzlePosition.distanceTo(newNozzlePosition);
this._duration += lineLength / speed;
this._addGCode({ this._addGCode({
[MOVE]: 0, [MOVE]: 0,
[POSITION_X]: x.toFixed(3), [POSITION_X]: x.toFixed(3),
[POSITION_Y]: y.toFixed(3), [POSITION_Y]: y.toFixed(3),
[POSITION_Z]: z.toFixed(3), [POSITION_Z]: z.toFixed(3),
[SPEED]: speed.toFixed(3) [SPEED]: (speed * 60).toFixed(3)
}); });
this._nozzlePosition.set(x, y); this._nozzlePosition.copy(newNozzlePosition);
return this; return this;
} }
lineTo(x, y, z, { speed, flowRate }) { lineTo(x, y, z, { speed, flowRate }) {
const newNozzlePosition = new THREE.Vector2(x, y); const newNozzlePosition = new THREE.Vector2(x, y);
speed *= 60;
const lineLength = this._nozzlePosition.distanceTo(newNozzlePosition); const lineLength = this._nozzlePosition.distanceTo(newNozzlePosition);
this._extruder += this._nozzleToFilamentRatio * lineLength * flowRate; this._extruder += this._nozzleToFilamentRatio * lineLength * flowRate;
this._duration += lineLength / speed;
this._addGCode({ this._addGCode({
[MOVE]: 1, [MOVE]: 1,
[POSITION_X]: x.toFixed(3), [POSITION_X]: x.toFixed(3),
[POSITION_Y]: y.toFixed(3), [POSITION_Y]: y.toFixed(3),
[POSITION_Z]: z.toFixed(3), [POSITION_Z]: z.toFixed(3),
[SPEED]: speed.toFixed(3), [SPEED]: (speed * 60).toFixed(3),
[EXTRUDER]: this._extruder.toFixed(3) [EXTRUDER]: this._extruder.toFixed(3)
}); });
@ -99,17 +102,17 @@ export default class {
return this; return this;
} }
unRetract({ enabled, speed, minDistance }) { unRetract({ enabled, speed, minDistance, amount }) {
if (this._isRetracted && enabled) { if (this._isRetracted && enabled) {
this._isRetracted = false; this._isRetracted = false;
speed *= 60;
if (this._extruder > minDistance) { if (this._extruder > minDistance) {
this._duration += amount / speed;
this._addGCode({ this._addGCode({
[MOVE]: 0, [MOVE]: 0,
[EXTRUDER]: this._extruder.toFixed(3), [EXTRUDER]: this._extruder.toFixed(3),
[SPEED]: speed.toFixed(3) [SPEED]: (speed * 60).toFixed(3)
}); });
} }
} }
@ -121,13 +124,13 @@ export default class {
if (!this._isRetracted && enabled) { if (!this._isRetracted && enabled) {
this._isRetracted = true; this._isRetracted = true;
speed *= 60;
if (this._extruder > minDistance) { if (this._extruder > minDistance) {
this._duration += amount / speed;
this._addGCode({ this._addGCode({
[MOVE]: 0, [MOVE]: 0,
[EXTRUDER]: (this._extruder - amount).toFixed(3), [EXTRUDER]: (this._extruder - amount).toFixed(3),
[SPEED]: speed.toFixed(3) [SPEED]: (speed * 60).toFixed(3)
}); });
} }
} }
@ -136,6 +139,10 @@ export default class {
} }
getGCode() { getGCode() {
return this._gcode; return {
gcode: this._gcode,
duration: this._duration,
filament: this._extruder
};
} }
} }