@@ -2199,7 +2363,8 @@ nav.bottom-nav{display:none;position:fixed;bottom:0;left:0;right:0;
var S={nozzle_temp:0,nozzle_target:0,bed_temp:0,bed_target:0,
print_state:'standby',filename:'',progress:0,print_duration:0,remain_time:0,
curr_layer:0,total_layers:0,printer_name:'Kobra X',firmware_version:'–',
- camera_url:'',fan_speed:0,print_speed_mode:2,light_on:false,light_brightness:80,ams_slots:[]};
+ camera_url:'',fan_speed:0,print_speed_mode:2,light_on:false,light_brightness:80,
+ ams_slots:[],filament_mode:'toolhead'};
var tempHistory={n:[],b:[]};
var camOn=false;
var currentStep=1;
@@ -2721,26 +2886,77 @@ function applyState(){
var spdBar=document.getElementById('d-spd-bar');
if(spdBar) spdBar.style.width=(spdWidths[s.print_speed_mode]||55)+'%';
+ var amsTitle=document.getElementById('d-card-ams');
+ if(amsTitle){
+ var baseTitle=T.card_ams||'AMS / Filamentbox';
+ var modeMap={toolhead:'Toolhead',ace_direct:'ACE Direct',ace_hub:'ACE Hub'};
+ var modeTxt=modeMap[s.filament_mode]||'';
+ amsTitle.textContent=modeTxt?(baseTitle+' · '+modeTxt):baseTitle;
+ }
+
// AMS
if(s.ams_slots&&s.ams_slots.length){
window._amsSlots=s.ams_slots;
- var html='';
+ // Group by box_id (-1=Toolhead, 0=ACE 1, 1=ACE 2, ...)
+ var boxMap={};
s.ams_slots.forEach(function(slot,i){
- var empty=slot.status!==5;
- var rgb=empty?[80,80,80]:(Array.isArray(slot.color)?slot.color:[128,128,128]);
- var col='rgb('+rgb[0]+','+rgb[1]+','+rgb[2]+')';
- var active=slot.status===1||slot.active;
- var pct=empty?T.ams_empty:(slot.consumables_percent!=null?slot.consumables_percent+'%':'–');
- var idx=slot.index!=null?slot.index:i;
- html+='
'
- +'
'
- +'
'+(empty?'–':(slot.type||slot.material_type||'–'))+'
'
- +'
Slot '+(idx+1)+'
'
- +'
'+pct+'
'
- +'
✏
'
- +'
';
+ var bid=slot.box_id!=null?slot.box_id:-1;
+ if(!boxMap[bid])boxMap[bid]=[];
+ boxMap[bid].push({slot:slot,arrIdx:i});
+ });
+ var boxIds=Object.keys(boxMap).map(Number).sort(function(a,b){return a-b});
+ var acePresent=boxIds.some(function(b){return b>=0;});
+ var html='';
+ boxIds.forEach(function(bid){
+ var entries=boxMap[bid];
+ var label=bid===-1
+ ?(acePresent?'Toolhead (Slots 1–3)':'Toolhead')
+ :('ACE '+(bid+1));
+ html+='
'
+ +'
'+label+'
'
+ +'
';
+ entries.forEach(function(e){
+ var slot=e.slot;var i=e.arrIdx;
+ var empty=slot.status!==5;
+ var rgb=empty?[80,80,80]:(Array.isArray(slot.color)?slot.color:[128,128,128]);
+ var col='rgb('+rgb[0]+','+rgb[1]+','+rgb[2]+')';
+ var globalIdx=slot.global_index!=null?slot.global_index:i;
+ var active=slot.status===1||slot.active;
+ var loaded=(s.ams_loaded_slot!=null&&s.ams_loaded_slot>=0&&globalIdx===s.ams_loaded_slot);
+ var activity=(slot.activity||'');
+ var pct=empty?T.ams_empty:(slot.consumables_percent!=null?slot.consumables_percent+'%':'–');
+ var slotLabel='Slot '+(globalIdx+1);
+ if(bid>=0){
+ slotLabel='ACE '+(bid+1)+'.'+(slot.index!=null?slot.index+1:(i-2));
+ }
+ html+='
'
+ +'
'
+ +'
'+(empty?'–':(slot.type||slot.material_type||'–'))+'
'
+ +'
'+slotLabel+'
'
+ +'
'+pct+'
'
+ +'
✏
'
+ +'
';
+ });
+ if(bid===-1&&acePresent){
+ html+='
';
+ }
+ html+='
';
});
document.getElementById('ams-slots').innerHTML=html;
+ // Update feed/unload slot slider range
+ var sel=document.getElementById('ams-slot-sel');
+ if(sel){
+ var maxSlot=s.ams_slots.length-1;
+ sel.max=maxSlot;
+ if(parseInt(sel.value)>maxSlot){
+ sel.value=0;
+ var lbl=document.getElementById('ams-slot-label');
+ if(lbl)lbl.textContent='Slot 1';
+ }
+ }
}
// camera overlay
@@ -2847,9 +3063,9 @@ var _slotEditIndex=-1;
var _MAT_PRESETS=['PLA','PETG','ABS','ASA','TPU','PA','PC','HIPS'];
function openSlotEdit(i){
var slot=(window._amsSlots||[])[i]||{};
- var index=slot.index!=null?slot.index:i;
- _slotEditIndex=index;
- document.getElementById('slot-edit-title').textContent=T.slot_edit_title+' '+(index+1);
+ var globalIdx=slot.global_index!=null?slot.global_index:(slot.index!=null?slot.index:i);
+ _slotEditIndex=globalIdx;
+ document.getElementById('slot-edit-title').textContent=T.slot_edit_title+' '+(globalIdx+1);
var rgb=Array.isArray(slot.color)?slot.color:[128,128,128];
var hex='#'+rgb.map(function(v){return('0'+Math.min(255,v).toString(16)).slice(-2)}).join('');
var ci=document.getElementById('slot-edit-color');
@@ -3103,9 +3319,11 @@ function quickFan(v){
// ── AMS ──
function amsFeed(type){
- var slot=parseInt(document.getElementById('ams-slot-sel').value);
- post('/api/ams/feed',{slot_index:slot,type:type})
- .then(function(){clog((type===1?T.lbl_feed:T.lbl_unload)+' Slot '+(slot+1),'msg-ok')})
+ var i=parseInt(document.getElementById('ams-slot-sel').value);
+ var slot=(window._amsSlots||[])[i]||{};
+ var globalIdx=slot.global_index!=null?slot.global_index:i;
+ post('/api/ams/feed',{slot_index:globalIdx,type:type})
+ .then(function(){clog((type===1?T.lbl_feed:T.lbl_unload)+' Slot '+(globalIdx+1),'msg-ok')})
.catch(function(e){clog('AMS-Fehler: '+e,'msg-err')});
}
@@ -3830,25 +4048,26 @@ function loadPrinterTab(){
body = await request.json()
except Exception:
body = {}
- index = int(body.get("index", 0))
+ index = int(body.get("index", 0)) # global slot index
mat = str(body.get("type", "PLA")).upper()
color = body.get("color", [255, 255, 255])
if not (isinstance(color, list) and len(color) == 3):
return web.json_response({"error": "color must be [r,g,b]"}, status=400)
+ box_id, local_slot = self._global_to_box_slot(index)
loop = asyncio.get_event_loop()
def _send():
resp = self.client.publish(
"multiColorBox", "setInfo",
- {"multi_color_box": [{"id": -1, "slots": [{"index": index, "type": mat, "color": color}]}]},
+ {"multi_color_box": [{"id": box_id, "slots": [{"index": local_slot, "type": mat, "color": color}]}]},
timeout=5
)
- log.info(f"setInfo slot={index} type={mat} color={color} → {resp}")
+ log.info(f"setInfo global={index} box={box_id} local_slot={local_slot} type={mat} color={color} → {resp}")
return resp
resp = await loop.run_in_executor(None, _send)
if resp and resp.get("code") == 200:
# Update cached slot immediately
for s in self._ams_slots:
- if s.get("index") == index:
+ if s.get("global_index") == index:
s["type"] = mat
s["color"] = color
break
@@ -3861,17 +4080,20 @@ function loadPrinterTab(){
body = {}
slot_index = int(body.get("slot_index", 0))
feed_type = int(body.get("type", 1))
+ if feed_type == 1:
+ self._pending_load_slot = slot_index
# Ausziehen (type=2): wenn kein Slot explizit gewählt, den zuletzt geladenen nehmen
if feed_type == 2 and self._ams_loaded_slot >= 0:
slot_index = self._ams_loaded_slot
+ box_id, local_slot = self._global_to_box_slot(slot_index)
loop = asyncio.get_event_loop()
def _send():
resp = self.client.publish(
"multiColorBox", "feedFilament",
- {"multi_color_box": [{"id": -1, "feed_status": {"slot_index": slot_index, "type": feed_type}}]},
+ {"multi_color_box": [{"id": box_id, "feed_status": {"slot_index": local_slot, "type": feed_type}}]},
timeout=5
)
- log.info(f"feedFilament type={feed_type} slot={slot_index} loaded_slot={self._ams_loaded_slot} → {resp}")
+ log.info(f"feedFilament type={feed_type} global_slot={slot_index} box={box_id} local_slot={local_slot} loaded_slot={self._ams_loaded_slot} → {resp}")
await loop.run_in_executor(None, _send)
return web.json_response({"result": "ok"})
@@ -4104,6 +4326,7 @@ function loadPrinterTab(){
"light_brightness": s["light_brightness"],
"ams_slots": self._ams_slots,
"ams_loaded_slot": self._ams_loaded_slot,
+ "filament_mode": s.get("filament_mode", self._filament_mode),
"thumbnail": self._thumbnail_b64,
"connection_error": s["connection_error"],
"file_ready": s["file_ready"],
@@ -4145,11 +4368,19 @@ function loadPrinterTab(){
"""Frische Slot-Daten per getInfo holen, Fallback auf gecachte."""
resp = self.client.publish("multiColorBox", "getInfo", None, timeout=5)
if resp and resp.get("data"):
- boxes = resp["data"].get("multi_color_box") or []
+ data = resp["data"]
+ self._head_tools_model = int(data.get("head_tools_model", self._head_tools_model))
+ boxes = data.get("multi_color_box") or []
if boxes:
- slots = boxes[0].get("slots") or []
- if slots:
- self._ams_slots = slots
+ self._filament_mode = self._detect_filament_mode(boxes, self._head_tools_model)
+ self._state["filament_mode"] = self._filament_mode
+ global_slots, global_loaded = self._aggregate_slots(boxes, self._filament_mode)
+ activity_map = self._slot_activity_map(boxes, global_loaded)
+ for s in global_slots:
+ s["activity"] = activity_map.get(s.get("global_index"), "")
+ if global_slots:
+ self._ams_slots = global_slots
+ self._ams_loaded_slot = global_loaded
return self._ams_slots
# ─── Settings ────────────────────────────────────────────────────────────
@@ -4726,10 +4957,19 @@ function loadPrinterTab(){
self._on_print(print_r)
box = self.client.query_multicolor_box()
if box:
- boxes = (box.get("data") or {}).get("multi_color_box") or []
- slots = boxes[0].get("slots") or [] if boxes else []
- if slots:
- self._ams_slots = slots
+ data = box.get("data") or {}
+ self._head_tools_model = int(data.get("head_tools_model", self._head_tools_model))
+ boxes = data.get("multi_color_box") or []
+ if boxes:
+ self._filament_mode = self._detect_filament_mode(boxes, self._head_tools_model)
+ self._state["filament_mode"] = self._filament_mode
+ global_slots, global_loaded = self._aggregate_slots(boxes, self._filament_mode)
+ activity_map = self._slot_activity_map(boxes, global_loaded)
+ for s in global_slots:
+ s["activity"] = activity_map.get(s.get("global_index"), "")
+ if global_slots:
+ self._ams_slots = global_slots
+ self._ams_loaded_slot = global_loaded
except Exception as e:
log.warning(f"Poll-Fehler: {e}")
# Prüfen ob Drucker wirklich weg ist