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

fix units inversion

Browse source
This commit is contained in:
Stewart Allen 2020-03-08 11:13:05 -04:00
commit 046926f0e8
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -693,10 +693,10 @@ var gs_kiri_cam = exports;
outp = conf.process,
sliceAll = widget.slices = [],
unitsName = settings.controller.units,
units = unitsName === 'in' ? (1/25.4) : 1,
roughToolDiam = getToolDiameter(conf, proc.roughingTool) * units,
finishToolDiam = getToolDiameter(conf, proc.finishingTool) * units,
drillToolDiam = getToolDiameter(conf, proc.drillTool) * units,
units = unitsName === 'in' ? 25.4 : 1,
roughToolDiam = getToolDiameter(conf, proc.roughingTool),
finishToolDiam = getToolDiameter(conf, proc.finishingTool),
drillToolDiam = getToolDiameter(conf, proc.drillTool),
procRough = proc.roughingOn && proc.roughingDown && roughToolDiam,
procFinish = proc.finishingOn && proc.finishingDown && finishToolDiam,
procFinishX = proc.finishingXOn && proc.finishingPlunge && finishToolDiam,
@ -944,7 +944,7 @@ var gs_kiri_cam = exports;
if (widgetIndex >= widgetCount || !widget) return;
var slices = widget.slices,
bounds = widget.getCamBounds(settings),
units = settings.controller.units === 'in' ? (1/25.4) : 1,
units = settings.controller.units === 'in' ? 25.4 : 1,
hasStock = process.camStockZ && process.camStockX && process.camStockY,
startCenter = process.outputOriginCenter,
zclear = (process.camZClearance || 1) * units,
@ -1410,7 +1410,7 @@ var gs_kiri_cam = exports;
cmdSpindle = gcodes.gcodeSpindle || [ "M3 S{speed}" ],
cmdDwell = gcodes.gcodeDwell || [ "G4 P{time}" ],
bounds = widget.getCamBounds(settings),
units = settings.controller.units === 'in' ? (1/25.4) : 1,
units = settings.controller.units === 'in' ? 25.4 : 1,
spro = settings.process,
dev = settings.device,
decimals = 4,