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

add proper gcode on/off macros for each cutting tool

Browse source
This commit is contained in:
Stewart Allen 2024-06-13 23:42:28 -04:00
commit 87b251bedc
4 changed files with 26 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/kiri-mode/laser/driver.js
View file

@ -558,8 +558,8 @@ function exportGCode(settings, data) {
let proc = settings.process; let proc = settings.process;
let space = dev.gcodeSpace ? ' ' : ''; let space = dev.gcodeSpace ? ' ' : '';
let power = 255; let power = 255;
let laser_on = dev.gcodeLaserOn || []; let cut_on = dev.gcodeLaserOn || dev.gcodeWaterOn || dev.gcodeKnifeDn || [];
let laser_off = dev.gcodeLaserOff || []; let cut_off = dev.gcodeLaserOff || dev.gcodeWaterOff || dev.gcodeKnifeUp || [];
let knifeOn = proc.knifeOn; let knifeOn = proc.knifeOn;
let knifeDepth = proc.ctOutKnifeDepth; let knifeDepth = proc.ctOutKnifeDepth;
let passes = knifeOn ? proc.ctOutKnifePasses : 1; let passes = knifeOn ? proc.ctOutKnifePasses : 1;
@ -597,7 +597,7 @@ function exportGCode(settings, data) {
lines.appendAll(['; drag-knife down', `G0${space}Z${-i * knifeDepth}`]); lines.appendAll(['; drag-knife down', `G0${space}Z${-i * knifeDepth}`]);
} }
} else if (index === 1) { } else if (index === 1) {
laser_on.forEach(line => { cut_on.forEach(line => {
line = line.replace('{power}', power); line = line.replace('{power}', power);
line = line.replace('{color}', color); line = line.replace('{color}', color);
line = line.replace('{thick}', thick); line = line.replace('{thick}', thick);
@ -609,7 +609,7 @@ function exportGCode(settings, data) {
lines.push(`G1${space}${point}`); lines.push(`G1${space}${point}`);
} }
}); });
laser_off.forEach(line => { cut_off.forEach(line => {
lines.push(line); lines.push(line);
}); });
} }

14
src/kiri/conf.js
View file

@ -613,9 +613,9 @@ const conf = exports({
imageURL: "", imageURL: "",
internal: 0, internal: 0,
bedWidth: 300, bedWidth: 300,
bedDepth: 175, bedDepth: 200,
bedHeight: 2.5, bedHeight: 2.5,
maxHeight: 300, maxHeight: 100,
gcodePre: [], gcodePre: [],
gcodePost: [], gcodePost: [],
gcodeFExt: "", gcodeFExt: "",
@ -663,6 +663,8 @@ const conf = exports({
gcodePost: [], gcodePost: [],
gcodeFExt: "", gcodeFExt: "",
gcodeSpace: true, gcodeSpace: true,
gcodeKnifeDn: [";; Z down"],
gcodeKnifeUp: [";; Z up"]
}, },
// process defaults Drag:Process // process defaults Drag:Process
p:{ p:{
@ -704,8 +706,8 @@ const conf = exports({
gcodePost: [], gcodePost: [],
gcodeFExt: "", gcodeFExt: "",
gcodeSpace: true, gcodeSpace: true,
gcodeLaserOn: ["M106 S{power}"], gcodeWaterOn: ["M106 S{power}"],
gcodeLaserOff: ["M107"] gcodeWaterOff: ["M107"]
}, },
// process defaults WaterJet:Process // process defaults WaterJet:Process
p:{ p:{
@ -746,9 +748,7 @@ const conf = exports({
gcodePre: [], gcodePre: [],
gcodePost: [], gcodePost: [],
gcodeFExt: "", gcodeFExt: "",
gcodeSpace: true, gcodeSpace: true
gcodeLaserOn: ["M106 S{power}"],
gcodeLaserOff: ["M107"]
}, },
// process defaults WireEDM:Process // process defaults WireEDM:Process
p:{ p:{

4
src/kiri/init.js
View file

@ -1731,6 +1731,10 @@ gapp.register("kiri.init", [], (root, exports) => {
(ui.gcodeFeature = newGCode(LANG.dv_feat_s, {title:LANG.dv_feat_l, modes:FDM, area:gcode})).button, (ui.gcodeFeature = newGCode(LANG.dv_feat_s, {title:LANG.dv_feat_l, modes:FDM, area:gcode})).button,
(ui.gcodeLaserOn = newGCode(LANG.dv_lzon_s, {title:LANG.dv_lzon_l, modes:LASER, area:gcode})).button, (ui.gcodeLaserOn = newGCode(LANG.dv_lzon_s, {title:LANG.dv_lzon_l, modes:LASER, area:gcode})).button,
(ui.gcodeLaserOff = newGCode(LANG.dv_lzof_s, {title:LANG.dv_lzof_l, modes:LASER, area:gcode})).button, (ui.gcodeLaserOff = newGCode(LANG.dv_lzof_s, {title:LANG.dv_lzof_l, modes:LASER, area:gcode})).button,
(ui.gcodeWaterOn = newGCode(LANG.dv_waon_s, {title:LANG.dv_waon_l, modes:WJET, area:gcode})).button,
(ui.gcodeWaterOff = newGCode(LANG.dv_waof_s, {title:LANG.dv_waof_l, modes:WJET, area:gcode})).button,
(ui.gcodeKnifeDn = newGCode(LANG.dv_dkon_s, {title:LANG.dv_dkon_l, modes:DRAG, area:gcode})).button,
(ui.gcodeKnifeUp = newGCode(LANG.dv_dkof_s, {title:LANG.dv_dkof_l, modes:DRAG, area:gcode})).button,
(ui.gcodeChange = newGCode(LANG.dv_tool_s, {title:LANG.dv_tool_l, modes:CAM, area:gcode})).button, (ui.gcodeChange = newGCode(LANG.dv_tool_s, {title:LANG.dv_tool_l, modes:CAM, area:gcode})).button,
(ui.gcodeDwell = newGCode(LANG.dv_dwll_s, {title:LANG.dv_dwll_l, modes:CAM, area:gcode})).button, (ui.gcodeDwell = newGCode(LANG.dv_dwll_s, {title:LANG.dv_dwll_l, modes:CAM, area:gcode})).button,
(ui.gcodeSpindle = newGCode(LANG.dv_sspd_s, {title:LANG.dv_sspd_l, modes:CAM, area:gcode, show:() => ui.spindleMax.value > 0})).button (ui.gcodeSpindle = newGCode(LANG.dv_sspd_s, {title:LANG.dv_sspd_l, modes:CAM, area:gcode, show:() => ui.spindleMax.value > 0})).button

11
web/kiri/lang/en.js
View file

@ -175,6 +175,17 @@ self.kiri.lang['en-us'] = {
dv_lzon_l: "gcode laser on script", dv_lzon_l: "gcode laser on script",
dv_lzof_s: "laser off", dv_lzof_s: "laser off",
dv_lzof_l: "gcode laser off script", dv_lzof_l: "gcode laser off script",
dv_waon_s: "water on",
dv_waon_l: "gcode water pump on script",
dv_waof_s: "water off",
dv_waof_l: "gcode water pump off script",
dv_dkon_s: "knife down",
dv_dkon_l: "gcode knife down script",
dv_dkof_s: "knife up",
dv_dkof_l: "gcode knife up script",
dv_exts_s: "select", dv_exts_s: "select",
dv_exts_l: "gcode run to enable this extruder", dv_exts_l: "gcode run to enable this extruder",
dv_dext_s: "deselect", dv_dext_s: "deselect",