dlawler489/printhive
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Call untagged spools by their material and reported colour, not a Bambu colour name

Browse source 
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
dlawler489 2026-09-17 23:55:16 +10:00
parent 88988237ae
commit 73176cc41d
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
public/app.js
View file

@ -2630,8 +2630,11 @@ function drawnSlots(p) {
// What's in each slot, as last reported, under the drawing. // What's in each slot, as last reported, under the drawing.
function loadedHtml(p) { function loadedHtml(p) {
if (!p.loaded) return p.id ? '<p class="form-hint">Nothing reported yet — “Test & sync” to read it.</p>' : ''; if (!p.loaded) return p.id ? '<p class="form-hint">Nothing reported yet — “Test & sync” to read it.</p>' : '';
// The tracked spool in that slot names the colour; otherwise the nearest Bambu colour. // A tagged spool is Bambu's, so its colour has a name: from the tracked spool,
// or the Bambu colour it matches. An untagged one could be any brand, so it
// gets the colour the printer reports and nothing more.
const colourName = (t) => { const colourName = (t) => {
if (!t.tagged) return t.colour || '';
const s = spools.find((x) => x.ams_slot === `${p.serial}/${t.unit == null ? 'ext' : t.unit}/${t.slot == null ? 0 : t.slot}`); const s = spools.find((x) => x.ams_slot === `${p.serial}/${t.unit == null ? 'ext' : t.unit}/${t.slot == null ? 0 : t.slot}`);
return (s && s.colour) || (t.colour ? paletteName(t.colour, t.material) : '') || ''; return (s && s.colour) || (t.colour ? paletteName(t.colour, t.material) : '') || '';
}; };