diff --git a/config.yaml b/config.yaml index 15c0062..ca7aa0d 100644 --- a/config.yaml +++ b/config.yaml @@ -124,7 +124,7 @@ locations: - "ac:44:f2:4e:87:27" # MAIN2-R bridge interface - ART6 # Wash - ART7 # Wash - - ART8 # Wash + - DMX8 # Wash - ART19 # Focus - name: Booth @@ -144,7 +144,7 @@ locations: - "SK_RACKPRO2 [452514]" - pigeon - showpi1 - - showpi2 + - d8:3a:dd:e3:5b:db # showpi2/artmap - name: Sound Control nodes: diff --git a/static/index.html b/static/index.html index bf4328e..908b23e 100644 --- a/static/index.html +++ b/static/index.html @@ -1741,6 +1741,11 @@ }); }); + danteNodes.forEach(info => { + info.txTo.sort((a, b) => a.split('\n')[0].localeCompare(b.split('\n')[0])); + info.rxFrom.sort((a, b) => a.split('\n')[0].localeCompare(b.split('\n')[0])); + }); + const artnetData = data.artnet_nodes || []; const artnetNodes = new Map(); @@ -1755,8 +1760,8 @@ return net + ':' + subnet + ':' + universe + ' (' + u + ')'; }; - const inputs = (an.inputs || []).map(formatUniverse); - const outputs = (an.outputs || []).map(formatUniverse); + const inputs = (an.inputs || []).slice().sort((a, b) => a - b).map(formatUniverse); + const outputs = (an.outputs || []).slice().sort((a, b) => a - b).map(formatUniverse); artnetNodes.set(nodeId, { isOut: outputs.length > 0, @@ -1773,7 +1778,7 @@ const nodeId = sn.node?.typeid; if (!nodeId) return; - const universes = (sn.universes || []).map(u => String(u)); + const universes = (sn.universes || []).slice().sort((a, b) => a - b).map(u => String(u)); sacnNodes.set(nodeId, { isConsumer: universes.length > 0,