From 046926f0e8075de94125a2083d95c07db1fc7f19 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sun, 8 Mar 2020 11:13:05 -0400 Subject: [PATCH] fix units inversion --- js/kiri-driver-cam.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/js/kiri-driver-cam.js b/js/kiri-driver-cam.js index fc26e195..e2d90d43 100644 --- a/js/kiri-driver-cam.js +++ b/js/kiri-driver-cam.js @@ -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,