add kfactor gcode subsitution

This commit is contained in:
Stewart Allen 2018-02-21 15:46:01 -05:00
commit a221f8b8ae
3 changed files with 9 additions and 2 deletions

View file

@ -406,7 +406,8 @@ var gs_kiri_fdm = exports;
left: offset ? 0 : -device.bedWidth/2, left: offset ? 0 : -device.bedWidth/2,
right: offset ? device.bedWidth : device.bedWidth/2, right: offset ? device.bedWidth : device.bedWidth/2,
bottom: offset ? 0 : -device.bedDepth/2, bottom: offset ? 0 : -device.bedDepth/2,
z_max: device.maxHeight z_max: device.maxHeight,
kfactor: process.gcodeKFactor || 0
}, },
seekMMM = process.outputSeekrate * 60, seekMMM = process.outputSeekrate * 60,
retDist = process.outputRetractDist, retDist = process.outputRetractDist,

View file

@ -101,6 +101,7 @@ self.kiri.license = exports.LICENSE;
outputCooling: 1, outputCooling: 1,
// detectThinWalls: 1, // detectThinWalls: 1,
antiBacklash: 1, antiBacklash: 1,
gcodeKFactor: 1,
outputClockwise: 1, outputClockwise: 1,
outputOriginCenter: 1, outputOriginCenter: 1,
outputInvertX: 1, outputInvertX: 1,
@ -309,6 +310,7 @@ self.kiri.license = exports.LICENSE;
outputFinishFactor: 0, outputFinishFactor: 0,
detectThinWalls: false, detectThinWalls: false,
antiBacklash: 2, antiBacklash: 2,
gcodeKFactor: 0,
outputCooling: true, outputCooling: true,
// --- LASER --- // --- LASER ---
@ -2505,6 +2507,10 @@ self.kiri.license = exports.LICENSE;
outputFinishFactor: UC.newInput("finish factor", {title:"% of nozzle diameter to\nshorten finish path by\nvalues of 0-1", bound:UC.bound(0.0,1), convert:UC.toFloat, modes:FDM}), outputFinishFactor: UC.newInput("finish factor", {title:"% of nozzle diameter to\nshorten finish path by\nvalues of 0-1", bound:UC.bound(0.0,1), convert:UC.toFloat, modes:FDM}),
antiBacklash: UC.newInput("anti-backlash", {title: "use micro-movements to cancel\nbacklash during fills\nin millimeters", bound:UC.bound(0,3), convert:UC.toInt, modes:FDM}), antiBacklash: UC.newInput("anti-backlash", {title: "use micro-movements to cancel\nbacklash during fills\nin millimeters", bound:UC.bound(0,3), convert:UC.toInt, modes:FDM}),
//detectThinWalls: UC.newBoolean("thin wall fill", onBooleanClick, {title: "detect and fill thin openings\nbetween shells walls", modes:FDM}) //detectThinWalls: UC.newBoolean("thin wall fill", onBooleanClick, {title: "detect and fill thin openings\nbetween shells walls", modes:FDM})
gcodeVars: UC.newGroup("gcode", null, {modes:FDM}),
gcodeKFactor: UC.newInput("k-factor", {title: "aka linear advance\nuse {kfactor} in gcode", convert:UC.toInt, modes:FDM}),
}); });
function toolUpdate(a,b,c) { function toolUpdate(a,b,c) {

View file

@ -1,7 +1,7 @@
var exports = { var exports = {
COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen <stewart@neuron.com> - All Rights Reserved", COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen <stewart@neuron.com> - All Rights Reserved",
LICENSE:"Unauthorized copying, modification and re-distribution are strictly prohibited without prior written consent.", LICENSE:"Unauthorized copying, modification and re-distribution are strictly prohibited without prior written consent.",
VERSION:"1.1.01" VERSION:"1.1.2"
}; };
if (!module) var module = {}; if (!module) var module = {};
module.exports = exports; module.exports = exports;