${ch.address}
@@ -253,7 +254,6 @@ async function importConfig(file) {
function renderRail() {
const rail = document.getElementById("rail");
rail.innerHTML = "";
-
// coupler block on the left
const coupler = document.createElement("div");
coupler.className = "coupler";
@@ -293,7 +293,7 @@ function renderRail() {
html += `
`;
let chIndex = 0;
for (const ch of mod.channels) {
- const id = `ch-${ch.kind}-${mod.index}-${channelNo(ch.address)}`;
+ const id = `ch-${ch.kind}-${moduleNo(ch.address)}-${channelNo(ch.address)}`;
const chNo = String(channelNo(ch.address)); // 0-based channel only
if (isDigital) {
if (chIndex > 0 && chIndex % 8 === 0) {
@@ -302,7 +302,7 @@ function renderRail() {
}
html += `
+ onclick="clickChannel('${ch.kind}', ${moduleNo(ch.address)}, ${channelNo(ch.address)})">
${chNo}`;
chIndex += 1;
} else {
@@ -313,7 +313,7 @@ function renderRail() {
${chNo}
+ onclick="clickBar('${ch.kind}', ${moduleNo(ch.address)}, ${channelNo(ch.address)}, event)">
${chNo}
@@ -337,6 +337,13 @@ function channelNo(address) {
return dot >= 0 ? Number(address.slice(dot + 1)) : 0;
}
+function moduleNo(address) {
+ // address is like "DI2.1" — the module part before the dot;
+ // per FR-4.3.11 v1.5 this is the PER-TYPE module number (DI0, DO0…)
+ const dot = address.indexOf(".");
+ return dot >= 0 ? Number(address.slice(2, dot)) : 0;
+}
+
function updateChannel(kind, module, channel, value) {
const id = `ch-${kind}-${module}-${channel}`;
const el = document.getElementById(id);
@@ -371,9 +378,12 @@ function updateChannel(kind, module, channel, value) {
function findChannel(kind, module, channel) {
if (!NODE) return null;
for (const mod of NODE.modules) {
- if (mod.index !== module) continue;
- return mod.channels.find((c) => c.kind === kind &&
- channelNo(c.address) === channel) || null;
+ for (const c of mod.channels) {
+ if (c.kind === kind && moduleNo(c.address) === module
+ && channelNo(c.address) === channel) {
+ return c;
+ }
+ }
}
return null;
}
@@ -525,6 +535,13 @@ async function renderConfig() {
${m.output_bits ? m.output_bits + " DO" : ""}
${m.input_words ? m.input_words + " AIw" : ""}
${m.output_words ? m.output_words + " AOW" : ""}
+
+
+
+
`).join("");
const pick = document.getElementById("catalog-pick");
pick.innerHTML = mc.catalog.map((c) =>
@@ -629,9 +646,26 @@ function renderModuleRows() {
`).join("");
}
+async function moveModule(index, delta) {
+ // FR-11.2.6: reorder by swapping with the neighbor, then SAVE CONFIG
+ // (rebuild + persist) so the rail reflects the new physical order
+ const target = index + delta;
+ if (target < 0 || target >= MODULE_ARTICLES.length) return;
+ [MODULE_ARTICLES[index], MODULE_ARTICLES[target]] =
+ [MODULE_ARTICLES[target], MODULE_ARTICLES[index]];
+ await saveModules();
+}
+
// ---------------- tabs ----------------
document.querySelectorAll(".tab").forEach((btn) => {
diff --git a/src/wago_sim/webui/static/index.html b/src/wago_sim/webui/static/index.html
index 979e358..4f3cd62 100644
--- a/src/wago_sim/webui/static/index.html
+++ b/src/wago_sim/webui/static/index.html
@@ -4,7 +4,7 @@
WAGO 750-362 Simulator
-
+