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 extruder selector

Browse source
This commit is contained in:
Stewart Allen 2020-04-10 11:53:07 -04:00
commit e706bb3699
6 changed files with 114 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -386,6 +386,7 @@ var gs_kiri_fdm = exports;
zoff = 0,
meshIndex,
lastIndex,
lastOut,
closest,
mindist,
minidx,
@ -553,6 +554,10 @@ var gs_kiri_fdm = exports;
layerout.height = layerout.height || closest.slice.height;
slices[minidx] = null;
closest.offset.z = zoff;
// detect extruder change and print purge block
if (lastOut && lastOut.extruder !== closest.slice.extruder) {
console.log({extruder_swap: closest.slice.extruder, from: lastOut.extruder});
}
// output seek to start point between mesh slices if previous data
printPoint = print.slicePrintPath(
closest.slice,
@ -561,6 +566,7 @@ var gs_kiri_fdm = exports;
layerout,
{ first: closest.slice.index === 0 }
);
lastOut = closest.slice,
lastIndex = minidx;
}
@ -595,9 +601,10 @@ var gs_kiri_fdm = exports;
fan_power = device.gcodeFan,
trackLayers = device.gcodeLayer,
trackProgress = device.gcodeTrack,
extruder = 0,
nozzleSize = extruders[extruder].extNozzle,
filamentSize = extruders[extruder].extFilament,
tool = 0,
extruder = extruders[tool],
offset_x = extruder.extOffsetX,
offset_y = extruder.extOffsetY,
time = 0,
layer = 0,
pause = [],
@ -766,8 +773,8 @@ var gs_kiri_fdm = exports;
while (layer < layers.length) {
path = layers[layer];
emitPerMM = print.extrudePerMM(
nozzleSize,
filamentSize,
extruder.extNozzle,
extruder.extFilament,
path.layer === 0 ?
(process.firstSliceHeight || process.sliceHeight) : path.height);
@ -828,13 +835,14 @@ var gs_kiri_fdm = exports;
speedMMM = (out.speed || process.outputFeedrate) * 60;
// look for extruder change and recalc emit factor
if (out.tool !== undefined && out.tool !== extruder) {
extruder = out.tool;
nozzleSize = extruders[extruder].extNozzle;
filamentSize = extruders[extruder].extFilament;
if (out.tool !== undefined && out.tool !== tool) {
tool = out.tool;
extruder = extruders[tool];
offset_x = extruder.extOffsetX;
offset_y = extruder.extOffsetY;
emitPerMM = print.extrudePerMM(
nozzleSize,
filamentSize,
extruder.extNozzle,
extruder.extFilament,
path.layer === 0 ?
(process.firstSliceHeight || process.sliceHeight) : path.height);
}
@ -844,8 +852,8 @@ var gs_kiri_fdm = exports;
dwell(out.speed);
continue;
}
var x = out.point.x,
y = out.point.y,
var x = out.point.x + offset_x,
y = out.point.y + offset_y,
z = out.point.z;
// adjust for inversions and offsets

17
js/kiri-init.js
View file

@ -540,6 +540,23 @@ var gs_kiri_init = exports;
UI.deviceName.value = devicename;
UI.deviceOrigin.checked = proc.outputOriginCenter;
// add extruder selection buttons
if (dev.extruders) {
let selext = $('sel-ext');
selext.innerHTML = '';
let arr = [];
for (let i=dev.extruders.length-1; i>=0; i--) {
let b = DOC.createElement('button');
b.appendChild(DOC.createTextNode(i));
b.onclick = function() {
API.selection.for_widgets(w => {
current.widget[w.id] = {extruder: i};
});
};
selext.appendChild(b);
}
}
if (mode === 'CAM') {
proc.camOriginTop = dev.outputOriginTop;
}

27
js/kiri-widget.js
View file

@ -51,6 +51,16 @@ let gs_kiri_widget = exports;
let Group = Widget.Groups = {
forid: function(id) {
for (let i=0; i<groups.length; i++) {
if (groups[i].id === id) return groups[i];
}
let group = [];
group.id = id;
groups.push(group);
return group;
},
remove: function(widget) {
groups.slice().forEach(group => {
let pos = group.indexOf(widget);
@ -114,6 +124,9 @@ let gs_kiri_widget = exports;
this.id = id || new Date().getTime().toString(36)+(nextId++);
this.group = group || [];
this.group.push(this);
if (!this.group.id) {
this.group.id = this.id;
}
if (groups.indexOf(this.group) < 0) {
groups.push(this.group);
}
@ -169,13 +182,13 @@ let gs_kiri_widget = exports;
};
Widget.loadFromState = function(id, ondone, move) {
let widget = newWidget();
widget.id = id;
widget.saved = time();
KIRI.odb.get('ws-save-'+id, function(data) {
if (data) {
let vertices = data.geo || data,
track = data.track || null;
track = data.track || undefined,
group = data.group || id,
widget = newWidget(id, Group.forid(group));
widget.saved = time();
ondone(widget.loadVertices(vertices));
// restore widget position if specified
if (move && track && track.pos) {
@ -308,7 +321,11 @@ let gs_kiri_widget = exports;
PRO.saveState = function(ondone) {
let widget = this;
KIRI.odb.put('ws-save-'+this.id, {geo:widget.getGeoVertices(), track:widget.track}, function(result) {
KIRI.odb.put('ws-save-'+this.id, {
geo:widget.getGeoVertices(),
track:widget.track,
group:this.group.id
}, function(result) {
widget.saved = time();
if (ondone) ondone();
});

8
js/kiri.js
View file

@ -1062,16 +1062,19 @@ self.kiri.copyright = exports.COPYRIGHT;
}
function platformAdd(widget, shift, nolayout) {
settings.widget[widget.id] = {extruder: 0};
if (!settings.widget[widget.id]) {
settings.widget[widget.id] = {extruder: 0};
}
WIDGETS.push(widget);
SPACE.platform.add(widget.mesh);
platform.select(widget, shift);
platform.compute_max_z();
API.event.emit('widget.add', widget);
if (nolayout) return;
if (layoutOnAdd) platform.layout();
if (!grouping) {
platformGroupDone();
} else if (layoutOnAdd) {
platform.layout();
}
}
@ -1097,6 +1100,7 @@ self.kiri.copyright = exports.COPYRIGHT;
if (MODE !== MODES.FDM) platform.layout();
SPACE.update();
platformUpdateSelected();
if (layoutOnAdd) platform.layout();
API.event.emit('widget.delete', widget);
}