fix FT5 profile. add Z as substitution in gcode
This commit is contained in:
parent
73d300fa74
commit
5dad93e8df
3 changed files with 8 additions and 4 deletions
|
|
@ -543,6 +543,8 @@ var gs_kiri_fdm = exports;
|
|||
device.filamentSize,
|
||||
path.layer === 0 ? process.firstSliceHeight : path.height);
|
||||
|
||||
consts.z = zpos.toFixed(2);
|
||||
consts.Z = consts.z;
|
||||
consts.layer = layer;
|
||||
consts.height = path.height.toFixed(3);
|
||||
|
||||
|
|
@ -557,7 +559,7 @@ var gs_kiri_fdm = exports;
|
|||
append(constReplace(line, consts));
|
||||
});
|
||||
} else {
|
||||
append("; --- layer " + layer + " (" + consts.height + " @ " + zpos.toFixed(3) + ") ---");
|
||||
append("; --- layer " + layer + " (" + consts.height + " @ " + consts.z + ") ---");
|
||||
}
|
||||
|
||||
// second layer fan on
|
||||
|
|
|
|||
|
|
@ -1301,6 +1301,7 @@ self.kiri.license = exports.LICENSE;
|
|||
forWidgets(function(widget) {
|
||||
var segtimes = {},
|
||||
segNumber = 0,
|
||||
errored = false,
|
||||
startTime,
|
||||
lastMsg;
|
||||
|
||||
|
|
@ -1330,7 +1331,7 @@ self.kiri.license = exports.LICENSE;
|
|||
firstMesh = false;
|
||||
}
|
||||
// on the last exit, update ui and call the callback
|
||||
if (--countdown === 0 || error) {
|
||||
if (--countdown === 0 || error || errored) {
|
||||
setProgress(0);
|
||||
showSlices(preserveLayer);
|
||||
setOpacity(settings.mode === 'CAM' ? sliced_opacity_cam : sliced_opacity);
|
||||
|
|
@ -1339,7 +1340,8 @@ self.kiri.license = exports.LICENSE;
|
|||
// update slider window
|
||||
onControlResize();
|
||||
// handle slicing errors
|
||||
if (error) {
|
||||
if (error && !errored) {
|
||||
errored = true;
|
||||
setViewMode(VIEWS.ARRANGE);
|
||||
setOpacity(model_opacity);
|
||||
widgetDeselect();
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
],
|
||||
"cmd":{
|
||||
"fan_power": "M106 S{fan_speed}",
|
||||
"progress": "{progress}% layer {layer}"
|
||||
"progress": "M117 {progress}% layer {layer}"
|
||||
},
|
||||
"settings":{
|
||||
"origin_center": false,
|
||||
|
|
|
|||
Loading…
Reference in a new issue