fix drill and dwell time estimation. fix stock recalc on new import. allow zero z stock offset
This commit is contained in:
parent
b090d6f2f5
commit
acdcadccf6
2 changed files with 3 additions and 3 deletions
|
|
@ -1685,7 +1685,7 @@ var gs_kiri_cam = exports;
|
|||
// no point == dwell
|
||||
// out.speed = time to dwell in ms
|
||||
if (!newpos) {
|
||||
time += out.speed;
|
||||
time += out.speed / 60;
|
||||
consts.time_sec = out.speed / 1000;
|
||||
consts.time_ms = out.speed;
|
||||
consts.time = consts.time_sec;
|
||||
|
|
|
|||
|
|
@ -1193,7 +1193,7 @@ self.kiri.copyright = exports.COPYRIGHT;
|
|||
}
|
||||
|
||||
if (MODE === MODES.CAM) {
|
||||
platform.update_stock();
|
||||
platform.update_stock(true);
|
||||
}
|
||||
platform.update_origin();
|
||||
|
||||
|
|
@ -1203,7 +1203,7 @@ self.kiri.copyright = exports.COPYRIGHT;
|
|||
function platformUpdateStock(refresh) {
|
||||
let sd = settings.process;
|
||||
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();
|
||||
settings.stock = { };
|
||||
camTopZ = topZ;
|
||||
|
|
|
|||
Loading…
Reference in a new issue