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 fast feed speed for G0 moves

Browse source
This commit is contained in:
Stewart Allen 2020-02-05 16:19:36 -05:00
commit c2ea795867
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
js/kiri-driver-cam.js
View file

@ -1495,8 +1495,9 @@ var gs_kiri_cam = exports;
filterEmit(cmdToolChange, consts); filterEmit(cmdToolChange, consts);
} }
var feed = out.speed, var speed = out.speed,
nl = [feed ? 'G1' : 'G0'], feed = speed || spro.camFastFeed,
nl = [speed ? 'G1' : 'G0'],
dx = newpos.x - pos.x, dx = newpos.x - pos.x,
dy = newpos.y - pos.y, dy = newpos.y - pos.y,
dz = newpos.z - pos.z, dz = newpos.z - pos.z,

6
js/kiri.js
View file

@ -131,6 +131,7 @@ self.kiri.license = exports.LICENSE;
// fields permitted in CAM:Process // fields permitted in CAM:Process
p:{ p:{
processName: 1, processName: 1,
camFastFeed: 1,
roughingTool: 1, roughingTool: 1,
roughingSpindle: 1, roughingSpindle: 1,
roughingDown: 1, roughingDown: 1,
@ -346,6 +347,8 @@ self.kiri.license = exports.LICENSE;
// --- CAM --- // --- CAM ---
camFastFeed: 6000,
roughingTool: 1000, roughingTool: 1000,
roughingSpindle: 1000, roughingSpindle: 1000,
roughingDown: 2, roughingDown: 2,
@ -2632,6 +2635,9 @@ self.kiri.license = exports.LICENSE;
laserSliceHeight: UC.newInput("height", {title:"millimeters\n0 = auto/detect", convert:UC.toFloat, modes:LASER}), laserSliceHeight: UC.newInput("height", {title:"millimeters\n0 = auto/detect", convert:UC.toFloat, modes:LASER}),
laserSliceSingle: UC.newBoolean("single", onBooleanClick, {title:"perform one slice\nat specified height", modes:LASER}), laserSliceSingle: UC.newBoolean("single", onBooleanClick, {title:"perform one slice\nat specified height", modes:LASER}),
camCommon: UC.newGroup("common", null, {modes:CAM}),
camFastFeed: UC.newInput("rapid feed", {title:"rapid moves feedrate\nin millimeters / minute", convert:UC.toInt, modes:CAM}),
roughing: UC.newGroup("roughing", null, {modes:CAM}), roughing: UC.newGroup("roughing", null, {modes:CAM}),
roughingTool: UC.newSelectField("tool", {modes:CAM}), roughingTool: UC.newSelectField("tool", {modes:CAM}),
roughingSpindle: UC.newInput("spindle rpm", {title:"spindle speed rpm", convert:UC.toInt, modes:CAM}), roughingSpindle: UC.newInput("spindle rpm", {title:"spindle speed rpm", convert:UC.toInt, modes:CAM}),