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 absolute extrusion for flashforge finder. increase max zoom out

Browse source
This commit is contained in:
Stewart Allen 2017-10-10 15:38:47 -04:00
commit 405136df79
4 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/kiri-driver-fdm.js
View file

@ -353,9 +353,12 @@ var gs_kiri_fdm = exports;
}
if (typeof newpos.e === 'number') {
outputLength += newpos.e;
o.append(" E").append(UTIL.round(newpos.e,decimals));
// for flashforge finder that uses cumulative extruder position
// o.append(" E").append(UTIL.round(outputLength, decimals));
if (device.extrudeAbs) {
// for flashforge finder that uses cumulative extruder position
o.append(" E").append(UTIL.round(outputLength, decimals));
} else {
o.append(" E").append(UTIL.round(newpos.e,decimals));
}
}
if (rate && rate != pos.f) {
o.append(" F").append(Math.round(rate));

6
js/kiri.js
View file

@ -30,6 +30,7 @@ self.kiri.license = exports.LICENSE;
bedDepth: 1,
bedHeight: 1,
maxHeight: 1,
extrudeAbs: 1,
filamentSize: 1,
nozzleSize: 1,
gcodePre: 1,
@ -2050,6 +2051,7 @@ self.kiri.license = exports.LICENSE;
setDeviceDepth: UC.newInput("bed depth", {title:"millimeters", convert:UC.toInt}),
setDeviceHeight: UC.newInput("max height", {title:"max build height\nin millimeters", convert:UC.toInt, modes:FDM}),
setDeviceMaxSpindle: UC.newInput("max spindle rpm", {title:"max spindle speed\n0 to disable", convert:UC.toInt, modes:CAM}),
setDeviceExtrusion: UC.newBoolean("extrusion absolute", onBooleanClick, {title:"extrusion moves absolute"}),
setDeviceOrigin: UC.newBoolean("origin center", onBooleanClick, {title:"bed origin center"}),
setDeviceOriginTop: UC.newBoolean("origin top", onBooleanClick, {title:"part z origin top", modes:CAM}),
@ -2697,6 +2699,7 @@ self.kiri.license = exports.LICENSE;
filament_diameter: parseFloat(UI.setDeviceFilament.value) || 1.75,
origin_center: UI.setDeviceOrigin.checked,
origin_top: UI.setDeviceOriginTop.checked,
extrude_abs: UI.setDeviceExtrusion.checked,
spindle_max: parseInt(UI.setDeviceMaxSpindle.value) || 0
},
cmd: {
@ -2733,6 +2736,7 @@ self.kiri.license = exports.LICENSE;
maxHeight: valueOf(set.build_height, 150),
nozzleSize: valueOf(set.nozzle_size, 0.4),
filamentSize: valueOf(set.filament_diameter, 1.75),
extrudeAbs: valueOf(set.extrude_abs, false),
spindleMax: valueOf(set.spindle_max, 0),
gcodeFan: valueOf(cmd.fan_power, ''),
gcodeTrack: valueOf(cmd.progress, ''),
@ -2758,6 +2762,7 @@ self.kiri.license = exports.LICENSE;
UI.setDeviceWidth.value = dev.bedWidth;
UI.setDeviceDepth.value = dev.bedDepth;
UI.setDeviceHeight.value = dev.maxHeight;
UI.setDeviceExtrusion.checked = dev.extrudeAbs;
UI.setDeviceOrigin.checked = proc.outputOriginCenter;
// FDM
UI.setDeviceFan.value = dev.gcodeFan;
@ -2780,6 +2785,7 @@ self.kiri.license = exports.LICENSE;
UI.setDeviceDepth,
UI.setDeviceWidth,
UI.setDeviceHeight,
UI.setDeviceExtrusion,
UI.setDeviceOrigin,
UI.setDeviceOriginTop,
UI.setDeviceFan,

2
js/license.js
View file

@ -1,7 +1,7 @@
var exports = {
COPYRIGHT:"Copyright (C) 2014-2017 Stewart Allen <stewart@neuron.com> - All Rights Reserved",
LICENSE:"Unauthorized copying, modification and re-distribution are strictly prohibited without prior written consent.",
VERSION:"1.0.62"
VERSION:"1.0.63"
};
if (!module) var module = {};
module.exports = exports;

2
js/moto-space.js
View file

@ -158,7 +158,7 @@ var gs_moto_space = exports;
function setPlatformSize(width, depth, height) {
platform.scale.set(width || 300, depth || 175, height || 5);
viewControl.maxDistance = Math.max(width,depth) * 2;
viewControl.maxDistance = Math.max(width,depth) * 4;
updatePlatformPosition();
var y = Math.max(width, height) * 1;
light1.position.set( width, y, depth);