rename cam variables, fix some gcode gen bugs, a slider bug, flesh out cam outline

This commit is contained in:
Stewart Allen 2020-06-27 23:28:09 -04:00
commit 23e927e0d4
9 changed files with 279 additions and 195 deletions

View file

@ -915,7 +915,7 @@
device = settings.device,
extruders = device.extruders,
process = settings.process,
fan_power = device.gcodeFan,
gcodeFan = device.gcodeFan,
gcodeLayer = device.gcodeLayer,
gcodeTrack = device.gcodeTrack,
tool = 0,
@ -1008,7 +1008,7 @@
arr.forEach(function(line) { appendSub(line) });
}
append(`; Generated by Kiri:Moto ${KIRI.VERSION}`);
append(`; Generated by Kiri:Moto ${KIRI.version}`);
append(`; ${new Date().toString()}`);
appendSub("; Bed left:{left} right:{right} top:{top} bottom:{bottom}");
append(`; Target: ${settings.filter[settings.mode]}`);
@ -1142,8 +1142,8 @@
}
// enable fan at fan layer
if (fan_power && layer === process.outputFanLayer) {
appendSub(fan_power);
if (gcodeFan && layer === process.outputFanLayer) {
appendAllSub(gcodeFan);
}
// second layer transitions
@ -1242,7 +1242,7 @@
// emit tracked progress
if (gcodeTrack && progress != lastProgress) {
appendSub(gcodeTrack);
appendAllSub(gcodeTrack);
lastProgress = progress;
}