viewit/KX-Bridge-Release
12
18
Fork 10
Code Issues 5 Pull Requests Actions Packages Projects Releases 59 Wiki Activity

Merge pull request 'fix: slot assignment dialog matches PLA Silk, Matte PLA etc. to PLA slots' (#64) from p2l/KX-Bridge-Release:feature/slot-assignment-fix into master

Browse Source
This commit is contained in:
viewit
2026-06-21 21:40:28 +02:00
parent 891b679230 d7f4983d0d
commit fc504b4e3b
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
web/themes/default/app.js
View File

@@ -1193,6 +1193,7 @@ function doProfileImportUpload(files){
var _slotEditIndex=-1; var _slotEditIndex=-1;
var _slotEditLoaded=false; var _slotEditLoaded=false;
var _MAT_PRESETS=['PLA','PETG','ABS','ASA','TPU','PA','PC','HIPS']; var _MAT_PRESETS=['PLA','PETG','ABS','ASA','TPU','PA','PC','HIPS'];
var _BASE_MATERIAL_TYPES=['PLA','PETG','ABS','ASA','TPU','TPE','PA','PC','HIPS','PEI','PEEK'];
function updateSlotEditFeedButton(){ function updateSlotEditFeedButton(){
var btn=document.getElementById('btn-slot-edit-feed'); var btn=document.getElementById('btn-slot-edit-feed');
if(!btn)return; if(!btn)return;
@@ -2332,6 +2333,20 @@ function _normalizeMaterialKey(material){
var key=(material||'').toUpperCase().replace(/[^A-Z0-9+]/g,''); var key=(material||'').toUpperCase().replace(/[^A-Z0-9+]/g,'');
// Orca often uses PLA for PLA+, while AMS may report PLA+. // Orca often uses PLA for PLA+, while AMS may report PLA+.
if(key==='PLA+'||key==='PLAPLUS') return 'PLA'; if(key==='PLA+'||key==='PLAPLUS') return 'PLA';
// Handle modifier+base patterns in either order: "Matte PLA", "Silk PETG",
// "PLA Silk", "PLA Matte". OrcaSlicer always writes the base type in GCode
// (filament_type = PLA), but users label slots with the full product-style name.
// Scan each space-separated word; return the first one that is a known base material.
// Dash-suffix variants ("PLA-CF", "PETG-CF") contain no space and fall through
// unchanged, preserving correct incompatibility with their base types.
var trimmed=(material||'').trim();
if(trimmed.indexOf(' ')>=0){
var words=trimmed.toUpperCase().split(/\s+/);
for(var i=0;i<words.length;i++){
var w=words[i].replace(/[^A-Z0-9+]/g,'');
if(_BASE_MATERIAL_TYPES.indexOf(w)>=0) return w;
}
}
return key; return key;
} }
function _materialsCompatible(a,b){ function _materialsCompatible(a,b){