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 deselect script. relegate extruder abs/rel to detection via gcode header parsing

Browse source
This commit is contained in:
Stewart Allen 2021-02-09 10:25:23 -05:00
commit b5c8b19864
6 changed files with 36 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/kiri/conf.js
View file

@ -77,6 +77,7 @@
extFilament: device.filamentSize,
extNozzle: device.nozzleSize,
extSelect: ["T0"],
extDeselect: [],
extOffsetX: 0,
extOffsetY: 0
}];
@ -143,6 +144,7 @@
if (rec.offset_x) e.extOffsetX = rec.offset_x;
if (rec.offset_y) e.extOffsetY = rec.offset_y;
if (rec.select) e.extSelect = rec.select;
if (rec.deselect) e.extDeselect = rec.deselect;
device.extruders.push(e);
});
} else {
@ -273,6 +275,7 @@
extFilament: 1.75,
extNozzle: 0.4,
extSelect: ["T0"],
extDeselect: [],
extOffsetX: 0,
extOffsetY: 0
}]

13
src/kiri/init.js
View file

@ -739,6 +739,12 @@
// add extruder selection buttons
if (dev.extruders) {
for (let ext of dev.extruders) {
// add missing deselect field from legacy configs
if (!ext.extDeselect) {
ext.extDeselect = [];
}
}
let ext = API.lists.extruders = [];
dev.internal = 0;
let selext = $('pop-nozzle');
@ -768,7 +774,6 @@
UI.bedDepth,
UI.bedWidth,
UI.maxHeight,
UI.extrudeAbs,
UI.deviceOrigin,
UI.deviceRound,
UI.deviceBelt,
@ -792,12 +797,12 @@
UI.extDel,
UI.extOffsetX,
UI.extOffsetY,
UI.extSelect
UI.extSelect,
UI.extDeselect
].forEach(function(e) {
e.disabled = !local;
});
UI.extrudeAbs.style.display = mode === 'CAM' ? 'none' : 'flex';
UI.deviceSave.disabled = !local;
UI.deviceDelete.disabled = !local;
UI.deviceExport.disabled = !local;
@ -1570,7 +1575,7 @@
extOffsetX: UC.newInput(LANG.dv_exox_s, {title:LANG.dv_exox_l, convert:UC.toFloat, modes:FDM}),
extOffsetY: UC.newInput(LANG.dv_exoy_s, {title:LANG.dv_exoy_l, convert:UC.toFloat, modes:FDM}),
extSelect: UC.newText(LANG.dv_exts_s, {title:LANG.dv_exts_l, modes:FDM, size:14, height:3, modes:FDM, area:gcode}),
extrudeAbs: UC.newBoolean(LANG.dv_xtab_s, onBooleanClick, {title:LANG.dv_xtab_l, modes:FDM}),
extDeselect: UC.newText(LANG.dv_dext_s, {title:LANG.dv_dext_l, modes:FDM, size:14, height:3, modes:FDM, area:gcode}),
extActions: UC.newRow([
UI.extPrev = UC.newButton(undefined, undefined, {icon:'<i class="fas fa-less-than"></i>'}),
UI.extAdd = UC.newButton(undefined, undefined, {icon:'<i class="fas fa-plus"></i>'}),

1
src/kiri/main.js
View file

@ -1974,6 +1974,7 @@
UI.extAdd.onclick = function() {
let copy = clone(device.extruders[device.internal]);
copy.extSelect = [`T${device.extruders.length}`];
copy.extDeselect = [];
device.extruders.push(copy);
device.internal = device.extruders.length - 1;
updateExtruderFields(device);