AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mark bed type for later import / reconstruction for belted gcode. fix belt orientation

Browse source
This commit is contained in:
Stewart Allen 2020-12-04 22:11:20 -05:00
commit 7128d18e98
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/kiri/stack.js
View file

@ -26,8 +26,9 @@
} }
rotate(set) { rotate(set) {
this.view.rotation.y = -set.angle * (Math.PI/180); this.view.rotation.x = -set.angle * (Math.PI/180);
this.view.position.x = +set.centerz - set.movez; this.view.position.y = -set.centerz + set.movez;
this.view.position.z = -set.movez/2;
} }
destroy() { destroy() {

2
src/kiri/worker.js
View file

@ -76,7 +76,7 @@ KIRI.worker = {
widget.points = null; widget.points = null;
widget.loadVertices(widget.vertices); widget.loadVertices(widget.vertices);
let bbox1 = widget.getBoundingBox(true); let bbox1 = widget.getBoundingBox(true);
widget._rotate(0,rotation,0,true); widget._rotate(rotation,0,0,true);
widget.center(); widget.center();
widget.rotated = true; widget.rotated = true;
let bbox2 = widget.getBoundingBox(true); let bbox2 = widget.getBoundingBox(true);

10
src/mode/fdm/export.js
View file

@ -22,6 +22,7 @@
gcodeLayer = device.gcodeLayer, gcodeLayer = device.gcodeLayer,
gcodeTrack = device.gcodeTrack, gcodeTrack = device.gcodeTrack,
tool = 0, tool = 0,
bedType = device.bedBelt ? "belt" : "fixed",
extruder = extruders[tool], extruder = extruders[tool],
offset_x = extruder.extOffsetX, offset_x = extruder.extOffsetX,
offset_y = extruder.extOffsetY, offset_y = extruder.extOffsetY,
@ -110,6 +111,7 @@
append(`; Generated by Kiri:Moto ${KIRI.version}`); append(`; Generated by Kiri:Moto ${KIRI.version}`);
append(`; ${new Date().toString()}`); append(`; ${new Date().toString()}`);
appendSub("; Bed left:{left} right:{right} top:{top} bottom:{bottom}"); appendSub("; Bed left:{left} right:{right} top:{top} bottom:{bottom}");
append(`; Bed type: ${bedType}`);
append(`; Target: ${settings.filter[settings.mode]}`); append(`; Target: ${settings.filter[settings.mode]}`);
append("; --- process ---"); append("; --- process ---");
for (let pk in process) { for (let pk in process) {
@ -174,25 +176,23 @@
} }
let o = [!rate && !newpos.e ? 'G0' : 'G1']; let o = [!rate && !newpos.e ? 'G0' : 'G1'];
if (typeof newpos.x === 'number') { if (typeof newpos.x === 'number') {
pos.x = newpos.x;//UTIL.round(newpos.x,decimals); pos.x = newpos.x;
o.append(" X").append(pos.x.toFixed(decimals)); o.append(" X").append(pos.x.toFixed(decimals));
} }
if (typeof newpos.y === 'number') { if (typeof newpos.y === 'number') {
pos.y = newpos.y;//UTIL.round(newpos.y,decimals); pos.y = newpos.y;
o.append(" Y").append(pos.y.toFixed(decimals)); o.append(" Y").append(pos.y.toFixed(decimals));
} }
if (typeof newpos.z === 'number') { if (typeof newpos.z === 'number') {
pos.z = newpos.z;//UTIL.round(newpos.z,decimals); pos.z = newpos.z;
o.append(" Z").append(pos.z.toFixed(decimals)); o.append(" Z").append(pos.z.toFixed(decimals));
} }
if (typeof newpos.e === 'number') { if (typeof newpos.e === 'number') {
outputLength += newpos.e; outputLength += newpos.e;
if (extrudeAbs) { if (extrudeAbs) {
// for cumulative (absolute) extruder positions // for cumulative (absolute) extruder positions
// o.append(" E").append(UTIL.round(outputLength, decimals));
o.append(" E").append(outputLength.toFixed(decimals)); o.append(" E").append(outputLength.toFixed(decimals));
} else { } else {
// o.append(" E").append(UTIL.round(newpos.e, decimals));
o.append(" E").append(newpos.e.toFixed(decimals)); o.append(" E").append(newpos.e.toFixed(decimals));
} }
} }