public_git/bambuddy
1
0
Fork 0
mirror of https://github.com/maziggy/bambuddy.git synced 2026-10-21 10:15:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(ams): show "?" for loaded-but-unconfigured AMS slots (#1694)

Browse Source 
Reporter on a 3-AMS P1S saw slots labelled "Empty" even though spools
  were physically loaded - OrcaSlicer's Device view showed the same
  slots as loaded.

  Root cause: the compact label below the AMS slot circle rendered
  tray.tray_type || t('ams.slotEmpty'), falling back to "Empty" whenever
  the printer firmware hadn't been told which material is in the slot.
  getEmptySlotKind already distinguishes 'physical' (firmware confirmed
  empty via state 9/10) from 'reset' (tray_type absent but firmware
  hasn't confirmed empty - spool loaded, just unassigned). The hover
  card and circle border already used that distinction; the compact
  label did not.

  Fix: label branches on emptyKind - 'physical' keeps "Empty", 'reset'
  shows "?" matching the slicer's own convention. External / VT tray
  label is unchanged (external trays have no "configured/unconfigured"
  distinction - they're either loaded or not). SpoolBuddy AmsUnitCard
  carried the same bug and got the same fix plus a tooltip.
This commit is contained in:
maziggy
2026-06-09 08:41:46 +02:00
parent 7a9c78c32c
commit 529155413f
17 changed files with 121 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/__tests__/components/spoolbuddy/AmsUnitCard.test.tsx
+23 -2
View File
@@ -50,7 +50,9 @@ function makeUnit(overrides: Partial<AMSUnit> = {}): AMSUnit {
makeTray({ id: 0, tray_color: 'FF0000FF', tray_type: 'PLA', remain: 80 }),
makeTray({ id: 1, tray_color: '00FF00FF', tray_type: 'PETG', remain: 50 }),
makeTray({ id: 2, tray_color: '0000FFFF', tray_type: 'ABS', remain: 10 }),
makeTray({ id: 3, tray_color: null, tray_type: '', remain: -1 }),
// state=9 = firmware-confirmed empty (#1694: vs state=null which would
// be "spool loaded but unconfigured", labelled "?" in the UI).
makeTray({ id: 3, tray_color: null, tray_type: '', remain: -1, state: 9 } as Partial<AMSTray> & { state: number }),
],
serial_number: 'AMS001',
sw_ver: '1.0.0',
@@ -88,11 +90,30 @@ describe('AmsUnitCard', () => {
expect(screen.getByText('ABS')).toBeDefined();
});
it('shows "Empty" for empty slot', () => {
it('shows "Empty" for firmware-confirmed empty slot (state 9/10)', () => {
render(<AmsUnitCard unit={makeUnit()} activeSlot={null} />);
expect(screen.getByText('Empty')).toBeDefined();
});
it('shows "?" for loaded-but-unconfigured slot (#1694)', () => {
// No state reported by firmware + empty tray_type = spool loaded into the
// slot but no material assigned. Reporter on a 3-AMS P1S saw these slots
// mislabelled as "Empty" because the prior logic only checked tray_type.
const unit = makeUnit({
tray: [
makeTray({ id: 0, tray_type: 'PLA', remain: 80 }),
makeTray({ id: 1, tray_color: null, tray_type: '', remain: -1 } as Partial<AMSTray> & { state?: number }),
makeTray({ id: 2, tray_type: 'ABS', remain: 10 }),
makeTray({ id: 3, tray_color: null, tray_type: '', remain: -1, state: 9 } as Partial<AMSTray> & { state: number }),
],
});
render(<AmsUnitCard unit={unit} activeSlot={null} />);
expect(screen.getByText('?')).toBeDefined();
// The firmware-empty slot still reads "Empty" — the two states are visually
// distinct, not collapsed.
expect(screen.getByText('Empty')).toBeDefined();
});
it('renders fill level bars for slots with filament', () => {
const { container } = render(
<AmsUnitCard unit={makeUnit()} activeSlot={null} />