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 drill and dwell time estimation. fix stock recalc on new import. allow zero z stock offset

Browse source
This commit is contained in:
Stewart Allen 2020-05-09 18:04:30 -04:00
commit acdcadccf6
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1685,7 +1685,7 @@ var gs_kiri_cam = exports;
// no point == dwell // no point == dwell
// out.speed = time to dwell in ms // out.speed = time to dwell in ms
if (!newpos) { if (!newpos) {
time += out.speed; time += out.speed / 60;
consts.time_sec = out.speed / 1000; consts.time_sec = out.speed / 1000;
consts.time_ms = out.speed; consts.time_ms = out.speed;
consts.time = consts.time_sec; consts.time = consts.time_sec;

4
js/kiri.js
View file

@ -1193,7 +1193,7 @@ self.kiri.copyright = exports.COPYRIGHT;
} }
if (MODE === MODES.CAM) { if (MODE === MODES.CAM) {
platform.update_stock(); platform.update_stock(true);
} }
platform.update_origin(); platform.update_origin();
@ -1203,7 +1203,7 @@ self.kiri.copyright = exports.COPYRIGHT;
function platformUpdateStock(refresh) { function platformUpdateStock(refresh) {
let sd = settings.process; let sd = settings.process;
let offset = UI.camStockOffset.checked; let offset = UI.camStockOffset.checked;
let stockSet = sd.camStockX && sd.camStockY && sd.camStockZ; let stockSet = sd.camStockX && sd.camStockY && sd.camStockZ >= 0;
let scale = unitScale(); let scale = unitScale();
settings.stock = { }; settings.stock = { };
camTopZ = topZ; camTopZ = topZ;