@codesys/mcp-toolkit 2.3.0 → 2.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +55 -0
- package/README.md +63 -7
- package/README.zh-CN.md +43 -5
- package/dist/actions.js +7 -2
- package/dist/actions.js.map +1 -1
- package/dist/codesys/alarm-tools.d.ts +28 -0
- package/dist/codesys/alarm-tools.js +126 -0
- package/dist/codesys/alarm-tools.js.map +1 -0
- package/dist/codesys/graphical-read.d.ts +63 -0
- package/dist/codesys/graphical-read.js +214 -0
- package/dist/codesys/graphical-read.js.map +1 -0
- package/dist/codesys/graphical.js +13 -1
- package/dist/codesys/graphical.js.map +1 -1
- package/dist/codesys/report.d.ts +51 -0
- package/dist/codesys/report.js +100 -0
- package/dist/codesys/report.js.map +1 -0
- package/dist/hmi/native.d.ts +2 -1
- package/dist/hmi/native.js +42 -4
- package/dist/hmi/native.js.map +1 -1
- package/dist/hmi/render.d.ts +5 -0
- package/dist/hmi/render.js +33 -7
- package/dist/hmi/render.js.map +1 -1
- package/dist/hmi/route.d.ts +7 -7
- package/dist/hmi/route.js +36 -12
- package/dist/hmi/route.js.map +1 -1
- package/dist/hmi/service.d.ts +26 -1
- package/dist/hmi/service.js +113 -21
- package/dist/hmi/service.js.map +1 -1
- package/dist/hmi/spec.d.ts +104 -1
- package/dist/hmi/spec.js +20 -2
- package/dist/hmi/spec.js.map +1 -1
- package/dist/hmi/symbols.d.ts +89 -0
- package/dist/hmi/symbols.js +210 -0
- package/dist/hmi/symbols.js.map +1 -0
- package/dist/hmi/tools.d.ts +2 -0
- package/dist/hmi/tools.js +87 -10
- package/dist/hmi/tools.js.map +1 -1
- package/dist/panel/hmi.js +121 -27
- package/dist/panel.js +2 -1
- package/dist/panel.js.map +1 -1
- package/dist/progress.d.ts +17 -0
- package/dist/progress.js +36 -0
- package/dist/progress.js.map +1 -0
- package/dist/server.d.ts +1 -1
- package/dist/server.js +4 -3
- package/dist/server.js.map +1 -1
- package/dist/tools.js +126 -5
- package/dist/tools.js.map +1 -1
- package/package.json +1 -1
- package/watcher/mcp_alarms.py +58 -0
|
@@ -0,0 +1,214 @@
|
|
|
1
|
+
const ENT = { lt: "<", gt: ">", amp: "&", quot: '"', apos: "'" };
|
|
2
|
+
const unesc = (s) => s.replace(/&(lt|gt|amp|quot|apos|#\d+|#x[0-9a-f]+);/gi, (_, e) => (e[0] === "#" ? String.fromCodePoint(e[1] === "x" || e[1] === "X" ? parseInt(e.slice(2), 16) : parseInt(e.slice(1), 10)) : ENT[e.toLowerCase()]));
|
|
3
|
+
/** A small XML reader for well-formed PLCopenXML: elements, attributes, text, CDATA. */
|
|
4
|
+
export function parseXml(xml) {
|
|
5
|
+
const root = { name: "#root", attrs: {}, children: [], text: "" };
|
|
6
|
+
const stack = [root];
|
|
7
|
+
const re = /<!--[\s\S]*?-->|<\?[\s\S]*?\?>|<!\[CDATA\[([\s\S]*?)\]\]>|<!DOCTYPE[^>]*>|<(\/?)([A-Za-z_][\w.:-]*)((?:\s+[\w.:-]+\s*=\s*(?:"[^"]*"|'[^']*'))*)\s*(\/?)>|([^<]+)/g;
|
|
8
|
+
for (const m of xml.matchAll(re)) {
|
|
9
|
+
const top = stack[stack.length - 1];
|
|
10
|
+
if (m[1] !== undefined)
|
|
11
|
+
top.text += m[1];
|
|
12
|
+
else if (m[6] !== undefined)
|
|
13
|
+
top.text += unesc(m[6]);
|
|
14
|
+
else if (m[3]) {
|
|
15
|
+
if (m[2]) {
|
|
16
|
+
if (stack.length > 1)
|
|
17
|
+
stack.pop();
|
|
18
|
+
continue;
|
|
19
|
+
}
|
|
20
|
+
const attrs = {};
|
|
21
|
+
for (const a of m[4].matchAll(/([\w.:-]+)\s*=\s*(?:"([^"]*)"|'([^']*)')/g))
|
|
22
|
+
attrs[a[1].replace(/^.*:/, "")] = unesc(a[2] ?? a[3] ?? "");
|
|
23
|
+
const el = { name: m[3].replace(/^.*:/, ""), attrs, children: [], text: "" };
|
|
24
|
+
top.children.push(el);
|
|
25
|
+
if (!m[5])
|
|
26
|
+
stack.push(el);
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
return root;
|
|
30
|
+
}
|
|
31
|
+
const kids = (e, name) => (e?.children ?? []).filter((c) => c.name === name);
|
|
32
|
+
const kid = (e, name) => (e?.children ?? []).find((c) => c.name === name);
|
|
33
|
+
const find = (e, name) => (e.name === name ? e : e.children.reduce((f, c) => f ?? find(c, name), undefined));
|
|
34
|
+
const allText = (e) => (e ? e.text + e.children.map(allText).join("") : "");
|
|
35
|
+
/** The connections of an element's (first) connectionPointIn. */
|
|
36
|
+
const inputsOf = (e) => kids(kid(e, "connectionPointIn"), "connection").map((c) => ({ ref: c.attrs.refLocalId, ...(c.attrs.formalParameter ? { param: c.attrs.formalParameter } : {}) }));
|
|
37
|
+
/** A graphical POU's PLCopenXML as create_graphical's description; undefined when the body isn't LD, FBD or SFC. */
|
|
38
|
+
export function describeGraphical(xml) {
|
|
39
|
+
const doc = parseXml(xml);
|
|
40
|
+
const pou = find(doc, "pou");
|
|
41
|
+
const body = kid(pou, "body") ?? find(doc, "body");
|
|
42
|
+
if (!body)
|
|
43
|
+
return undefined;
|
|
44
|
+
const ld = kid(body, "LD");
|
|
45
|
+
if (ld)
|
|
46
|
+
return readLadder(ld);
|
|
47
|
+
const fbd = kid(body, "FBD");
|
|
48
|
+
if (fbd)
|
|
49
|
+
return readFbd(fbd);
|
|
50
|
+
const sfc = kid(body, "SFC");
|
|
51
|
+
if (sfc)
|
|
52
|
+
return readSfc(sfc, pou);
|
|
53
|
+
return undefined;
|
|
54
|
+
}
|
|
55
|
+
function readLadder(ld) {
|
|
56
|
+
const notes = new Set();
|
|
57
|
+
const byId = new Map(ld.children.filter((c) => c.attrs.localId !== undefined).map((c) => [c.attrs.localId, c]));
|
|
58
|
+
const memo = new Map();
|
|
59
|
+
const and = (parts) => {
|
|
60
|
+
const flat = parts.flatMap((p) => (p === null ? [] : typeof p === "object" && "and" in p ? p.and : [p]));
|
|
61
|
+
return flat.length === 0 ? null : flat.length === 1 ? flat[0] : { and: flat };
|
|
62
|
+
};
|
|
63
|
+
/** The condition at an element's output (null = straight from the rail, always TRUE). */
|
|
64
|
+
const flow = (ref, seen = new Set()) => {
|
|
65
|
+
if (memo.has(ref))
|
|
66
|
+
return memo.get(ref);
|
|
67
|
+
const e = byId.get(ref);
|
|
68
|
+
if (!e || seen.has(ref))
|
|
69
|
+
return null;
|
|
70
|
+
seen.add(ref);
|
|
71
|
+
let out;
|
|
72
|
+
if (e.name === "leftPowerRail")
|
|
73
|
+
out = null;
|
|
74
|
+
else if (e.name === "contact" || e.name === "coil") {
|
|
75
|
+
const left = into(e, seen);
|
|
76
|
+
if (e.name === "coil")
|
|
77
|
+
out = left; // power passes through a coil to the next one
|
|
78
|
+
else
|
|
79
|
+
out = and([left, `${e.attrs.negated === "true" ? "NOT " : ""}${allText(kid(e, "variable")).trim()}`]);
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
notes.add(`${e.name}${e.attrs.typeName ? ` ${e.attrs.typeName}` : ""} elements (function boxes in a rung) aren't part of the description; read_objects shows the XML`);
|
|
83
|
+
out = into(e, seen);
|
|
84
|
+
}
|
|
85
|
+
memo.set(ref, out);
|
|
86
|
+
return out;
|
|
87
|
+
};
|
|
88
|
+
const into = (e, seen) => {
|
|
89
|
+
const ins = inputsOf(e).map((c) => flow(c.ref, seen));
|
|
90
|
+
if (ins.length <= 1)
|
|
91
|
+
return ins[0] ?? null;
|
|
92
|
+
if (ins.some((x) => x === null))
|
|
93
|
+
return null; // a path straight from the rail: always TRUE
|
|
94
|
+
return { or: ins };
|
|
95
|
+
};
|
|
96
|
+
const rungs = [];
|
|
97
|
+
for (const c of ld.children.filter((x) => x.name === "coil")) {
|
|
98
|
+
const when = into(c, new Set()) ?? "TRUE";
|
|
99
|
+
const kind = c.attrs.storage === "set" ? "set" : c.attrs.storage === "reset" ? "reset" : c.attrs.negated === "true" ? "negated" : "coil";
|
|
100
|
+
const coil = { coil: allText(kid(c, "variable")).trim(), kind };
|
|
101
|
+
const last = rungs[rungs.length - 1];
|
|
102
|
+
if (last && JSON.stringify(last.when) === JSON.stringify(when))
|
|
103
|
+
last.then.push(coil);
|
|
104
|
+
else
|
|
105
|
+
rungs.push({ when, then: [coil] });
|
|
106
|
+
}
|
|
107
|
+
return { kind: "ladder", spec: { rungs }, notes: [...notes] };
|
|
108
|
+
}
|
|
109
|
+
function readFbd(fbd) {
|
|
110
|
+
const notes = new Set();
|
|
111
|
+
const byId = new Map(fbd.children.filter((c) => c.attrs.localId !== undefined).map((c) => [c.attrs.localId, c]));
|
|
112
|
+
const consumed = new Set();
|
|
113
|
+
const build = (ref, param) => {
|
|
114
|
+
const e = byId.get(ref);
|
|
115
|
+
if (!e)
|
|
116
|
+
return "?";
|
|
117
|
+
consumed.add(ref);
|
|
118
|
+
if (e.name === "inVariable" || e.name === "inOutVariable")
|
|
119
|
+
return allText(kid(e, "expression")).trim();
|
|
120
|
+
if (e.name !== "block") {
|
|
121
|
+
notes.add(`${e.name} elements aren't part of the description`);
|
|
122
|
+
return "?";
|
|
123
|
+
}
|
|
124
|
+
const ins = kids(kid(e, "inputVariables"), "variable").map((v) => ({ name: v.attrs.formalParameter, src: inputsOf(v)[0] }));
|
|
125
|
+
const arg = (x) => (x.src ? build(x.src.ref, x.src.param) : "?");
|
|
126
|
+
if (!e.attrs.instanceName)
|
|
127
|
+
return { fn: e.attrs.typeName, args: ins.map(arg) };
|
|
128
|
+
return { fb: e.attrs.typeName, instance: e.attrs.instanceName, inputs: Object.fromEntries(ins.filter((x) => x.src).map((x) => [x.name, arg(x)])), output: param ?? "Q" };
|
|
129
|
+
};
|
|
130
|
+
const nets = [];
|
|
131
|
+
const fbNets = new Map();
|
|
132
|
+
const order = [];
|
|
133
|
+
for (const e of fbd.children) {
|
|
134
|
+
if (e.name === "outVariable" || e.name === "inOutVariable") {
|
|
135
|
+
const src = inputsOf(e)[0];
|
|
136
|
+
if (!src)
|
|
137
|
+
continue;
|
|
138
|
+
const target = allText(kid(e, "expression")).trim();
|
|
139
|
+
const s = byId.get(src.ref);
|
|
140
|
+
if (s?.name === "block" && s.attrs.instanceName) {
|
|
141
|
+
const n = fbNets.get(src.ref) ?? { block: s, outs: {} };
|
|
142
|
+
n.outs[src.param ?? "Q"] = target;
|
|
143
|
+
if (!fbNets.has(src.ref))
|
|
144
|
+
(fbNets.set(src.ref, n), order.push(src.ref));
|
|
145
|
+
}
|
|
146
|
+
else
|
|
147
|
+
order.push({ expr: build(src.ref, src.param), to: target });
|
|
148
|
+
}
|
|
149
|
+
else if (e.name === "block" && e.attrs.instanceName) {
|
|
150
|
+
// Outputs written straight on the block (CODESYS's "output assignment").
|
|
151
|
+
for (const v of kids(kid(e, "outputVariables"), "variable")) {
|
|
152
|
+
const target = allText(kid(kid(v, "connectionPointOut"), "expression")).trim();
|
|
153
|
+
if (!target)
|
|
154
|
+
continue;
|
|
155
|
+
const n = fbNets.get(e.attrs.localId) ?? { block: e, outs: {} };
|
|
156
|
+
n.outs[v.attrs.formalParameter] = target;
|
|
157
|
+
if (!fbNets.has(e.attrs.localId))
|
|
158
|
+
(fbNets.set(e.attrs.localId, n), order.push(e.attrs.localId));
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
for (const o of order) {
|
|
163
|
+
if (typeof o !== "string") {
|
|
164
|
+
nets.push(o);
|
|
165
|
+
continue;
|
|
166
|
+
}
|
|
167
|
+
const n = fbNets.get(o);
|
|
168
|
+
const output = "Q" in n.outs ? "Q" : Object.keys(n.outs)[0];
|
|
169
|
+
const { [output]: to, ...assign } = n.outs;
|
|
170
|
+
const expr = build(o, output);
|
|
171
|
+
nets.push({ expr, ...(to ? { to } : {}), ...(Object.keys(assign).length ? { assign } : {}) });
|
|
172
|
+
}
|
|
173
|
+
// Function block calls whose outputs nothing uses.
|
|
174
|
+
for (const e of fbd.children)
|
|
175
|
+
if (e.name === "block" && e.attrs.instanceName && !consumed.has(e.attrs.localId) && !fbNets.has(e.attrs.localId))
|
|
176
|
+
nets.push({ expr: build(e.attrs.localId) });
|
|
177
|
+
return { kind: "fbd", spec: { networks: nets }, notes: [...notes] };
|
|
178
|
+
}
|
|
179
|
+
function readSfc(sfc, pou) {
|
|
180
|
+
const notes = new Set();
|
|
181
|
+
const byId = new Map(sfc.children.filter((c) => c.attrs.localId !== undefined).map((c) => [c.attrs.localId, c]));
|
|
182
|
+
const bodies = new Map(kids(kid(pou, "actions"), "action").map((a) => [a.attrs.name, allText(find(a, "xhtml") ?? find(a, "ST")).trim()]));
|
|
183
|
+
for (const e of sfc.children)
|
|
184
|
+
if (/Divergence|Convergence/.test(e.name))
|
|
185
|
+
notes.add(`${e.name} (a branch): the description holds one sequence; read_objects shows the XML`);
|
|
186
|
+
const after = (ref) => sfc.children.filter((c) => inputsOf(c).some((i) => i.ref === ref));
|
|
187
|
+
const steps = sfc.children
|
|
188
|
+
.filter((c) => c.name === "step")
|
|
189
|
+
.map((s) => {
|
|
190
|
+
const id = s.attrs.localId;
|
|
191
|
+
const acts = after(id)
|
|
192
|
+
.filter((c) => c.name === "actionBlock")
|
|
193
|
+
.flatMap((b) => kids(b, "action").map((a) => {
|
|
194
|
+
const name = kid(a, "reference")?.attrs.name ?? "";
|
|
195
|
+
const inline = allText(find(a, "xhtml")).trim();
|
|
196
|
+
return { name, qualifier: a.attrs.qualifier ?? "N", st: bodies.get(name) ?? inline };
|
|
197
|
+
}));
|
|
198
|
+
const tr = after(id).find((c) => c.name === "transition");
|
|
199
|
+
let when = "";
|
|
200
|
+
let next = "";
|
|
201
|
+
if (tr) {
|
|
202
|
+
const cond = kid(tr, "condition");
|
|
203
|
+
const src = inputsOf(cond)[0];
|
|
204
|
+
when = src ? allText(kid(byId.get(src.ref), "expression")).trim() : allText(find(cond ?? tr, "xhtml")).trim() || (kid(cond, "reference")?.attrs.name ?? "");
|
|
205
|
+
const to = after(tr.attrs.localId)[0];
|
|
206
|
+
next = to?.name === "step" ? to.attrs.name : to?.name === "jumpStep" ? to.attrs.targetName : "";
|
|
207
|
+
if (!to || !next)
|
|
208
|
+
notes.add(`the transition after step ${s.attrs.name} leads into a branch`);
|
|
209
|
+
}
|
|
210
|
+
return { name: s.attrs.name, ...(s.attrs.initialStep === "true" ? { initial: true } : {}), ...(acts.length ? { actions: acts } : {}), next, when };
|
|
211
|
+
});
|
|
212
|
+
return { kind: "sfc", spec: { steps }, notes: [...notes] };
|
|
213
|
+
}
|
|
214
|
+
//# sourceMappingURL=graphical-read.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"graphical-read.js","sourceRoot":"","sources":["../../src/codesys/graphical-read.ts"],"names":[],"mappings":"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"}
|
|
@@ -200,6 +200,7 @@ export function registerGraphicalActions(reg, ctx, run) {
|
|
|
200
200
|
fbd: fbdSchema.optional(),
|
|
201
201
|
sfc: sfcSchema.optional(),
|
|
202
202
|
parent: z.string().optional().describe("Folder or object to create it under (default: the application)"),
|
|
203
|
+
replace: z.boolean().optional().describe("Replace an existing POU of this name (read it with read_objects, edit the description, send it back). The old one is deleted first; revert_object brings it back from a checkpoint"),
|
|
203
204
|
}),
|
|
204
205
|
}, async (a) => run(async () => {
|
|
205
206
|
const kinds = [a.ladder && "ladder", a.fbd && "fbd", a.sfc && "sfc"].filter(Boolean);
|
|
@@ -217,10 +218,21 @@ export function registerGraphicalActions(reg, ctx, run) {
|
|
|
217
218
|
throw new Error(p.join("\n"));
|
|
218
219
|
}
|
|
219
220
|
const xml = a.ladder ? ladderXml(a.name, pouType, a.ladder) : a.fbd ? fbdXml(a.name, pouType, a.fbd) : sfcXml(a.name, pouType, a.sfc);
|
|
221
|
+
let replaced = false;
|
|
222
|
+
if (a.replace) {
|
|
223
|
+
try {
|
|
224
|
+
await ctx.bridge.call("object.delete", { path: a.parent ? `${a.parent}/${a.name}` : a.name, save: false });
|
|
225
|
+
replaced = true;
|
|
226
|
+
}
|
|
227
|
+
catch (e) {
|
|
228
|
+
if (!/not.?found|no object/i.test(e instanceof Error ? e.message : String(e)))
|
|
229
|
+
throw e;
|
|
230
|
+
}
|
|
231
|
+
}
|
|
220
232
|
const r = await ctx.bridge.call("object.import_xml", { parent: a.parent, xml, save: false }, { timeoutMs: 120_000 });
|
|
221
233
|
const path = r.added[0];
|
|
222
234
|
await ctx.bridge.call("object.write", { path, declaration: a.declaration, save: ctx.autosave });
|
|
223
|
-
return
|
|
235
|
+
return `${replaced ? "Replaced" : "Created"} ${path} in ${kinds[0] === "ladder" ? "ladder (LD)" : kinds[0] === "fbd" ? "FBD" : "SFC"}${a.sfc ? ` with ${a.sfc.steps.length} steps` : ""}. Compile to check it, and call it from a task (configure_task) or another POU.`;
|
|
224
236
|
}));
|
|
225
237
|
}
|
|
226
238
|
//# sourceMappingURL=graphical.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"graphical.js","sourceRoot":"","sources":["../../src/codesys/graphical.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"graphical.js","sourceRoot":"","sources":["../../src/codesys/graphical.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A project report for the handover: what the project contains (tasks, POUs,
|
|
3
|
+
* I/O, devices, libraries, alarms, HMI pages) as a readable Markdown document,
|
|
4
|
+
* ending with a commissioning checklist built from the project itself. Pure:
|
|
5
|
+
* the project_report action gathers the data and writes the file.
|
|
6
|
+
*/
|
|
7
|
+
import type { AlarmGroupDef } from "./alarm-tools.js";
|
|
8
|
+
import type { IoChannel } from "./devices.js";
|
|
9
|
+
import type { IoEntry } from "./outline.js";
|
|
10
|
+
import type { TreeNode } from "./st.js";
|
|
11
|
+
export interface ReportTask {
|
|
12
|
+
name: string;
|
|
13
|
+
kind?: string;
|
|
14
|
+
interval?: string;
|
|
15
|
+
interval_unit?: string;
|
|
16
|
+
priority?: string;
|
|
17
|
+
watchdog?: {
|
|
18
|
+
enabled?: boolean;
|
|
19
|
+
time?: string;
|
|
20
|
+
time_unit?: string;
|
|
21
|
+
} | null;
|
|
22
|
+
pous: string[];
|
|
23
|
+
}
|
|
24
|
+
export interface ReportInput {
|
|
25
|
+
project: string;
|
|
26
|
+
application?: string;
|
|
27
|
+
compiler?: string;
|
|
28
|
+
generated: string;
|
|
29
|
+
nodes: TreeNode[];
|
|
30
|
+
outline: string;
|
|
31
|
+
tasks: ReportTask[];
|
|
32
|
+
io: IoEntry[];
|
|
33
|
+
mapped: IoChannel[];
|
|
34
|
+
devices: string;
|
|
35
|
+
libraries: {
|
|
36
|
+
name: string;
|
|
37
|
+
resolution?: string;
|
|
38
|
+
}[];
|
|
39
|
+
alarms: AlarmGroupDef[];
|
|
40
|
+
hmi: {
|
|
41
|
+
name: string;
|
|
42
|
+
title: string;
|
|
43
|
+
widgets: number;
|
|
44
|
+
variables: number;
|
|
45
|
+
}[];
|
|
46
|
+
compile?: {
|
|
47
|
+
errors: number;
|
|
48
|
+
warnings: number;
|
|
49
|
+
};
|
|
50
|
+
}
|
|
51
|
+
export declare function projectReport(r: ReportInput): string;
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
import { condition } from "./alarm-tools.js";
|
|
2
|
+
const cell = (s) => (s ?? "").replace(/\|/g, "\\|").replace(/\r?\n/g, " ");
|
|
3
|
+
const table = (head, rows) => (rows.length ? [`| ${head.join(" | ")} |`, `| ${head.map(() => "---").join(" | ")} |`, ...rows.map((r) => `| ${r.map(cell).join(" | ")} |`)].join("\n") : "_None._");
|
|
4
|
+
const interval = (t) => (t.interval ? `${t.interval}${t.interval_unit && !/[a-z]/i.test(t.interval) ? ` ${t.interval_unit}` : ""}` : "");
|
|
5
|
+
export function projectReport(r) {
|
|
6
|
+
const name = r.project.replace(/\\/g, "/").split("/").pop().replace(/\.project$/i, "");
|
|
7
|
+
const count = (k) => r.nodes.filter((n) => n.kind === k).length;
|
|
8
|
+
const pous = r.nodes.filter((n) => n.kind === "pou");
|
|
9
|
+
const kindOf = (n) => /^\s*(PROGRAM|FUNCTION_BLOCK|FUNCTION|INTERFACE)\b/i.exec(n.declaration ?? "")?.[1]?.toUpperCase();
|
|
10
|
+
const programs = pous.filter((n) => kindOf(n) === "PROGRAM").length;
|
|
11
|
+
const fbs = pous.filter((n) => kindOf(n) === "FUNCTION_BLOCK").length;
|
|
12
|
+
const functions = pous.filter((n) => kindOf(n) === "FUNCTION").length;
|
|
13
|
+
const called = new Set(r.tasks.flatMap((t) => t.pous.map((p) => p.toLowerCase())));
|
|
14
|
+
const uncalled = pous.filter((n) => kindOf(n) === "PROGRAM" && !called.has(n.name.toLowerCase())).map((n) => n.name);
|
|
15
|
+
const inputs = r.io.filter((x) => x.direction === "input");
|
|
16
|
+
const outputs = r.io.filter((x) => x.direction === "output");
|
|
17
|
+
const alarmCount = r.alarms.reduce((s, g) => s + g.alarms.length, 0);
|
|
18
|
+
const persistent = r.nodes.filter((n) => /VAR_GLOBAL\s+(PERSISTENT|RETAIN)/i.test(n.declaration ?? "") || /persistent/i.test(n.sub ?? ""));
|
|
19
|
+
const out = [];
|
|
20
|
+
out.push(`# ${name}: project report`);
|
|
21
|
+
out.push("");
|
|
22
|
+
out.push(`Generated ${r.generated} by codesys-mcp-toolkit from \`${r.project}\`${r.compiler ? ` (compiler ${r.compiler})` : ""}. It describes the project as it is; check it against the machine before commissioning.`);
|
|
23
|
+
out.push("");
|
|
24
|
+
out.push("## Summary");
|
|
25
|
+
out.push("");
|
|
26
|
+
out.push(`- **Application:** ${r.application ?? "?"}: ${programs} programs, ${fbs} function blocks, ${functions} functions, ${count("dut")} data types, ${count("gvl")} global variable lists.`);
|
|
27
|
+
out.push(`- **Tasks:** ${r.tasks.map((t) => `${t.name} (${[t.kind, interval(t)].filter(Boolean).join(", ")})`).join("; ") || "none"}.`);
|
|
28
|
+
if (uncalled.length)
|
|
29
|
+
out.push(`- **Programs no task calls:** ${uncalled.join(", ")}. They never run.`);
|
|
30
|
+
out.push(`- **I/O:** ${inputs.length} inputs and ${outputs.length} outputs declared with AT addresses${r.mapped.length ? `; ${r.mapped.length} channels mapped in the device tree` : ""}.`);
|
|
31
|
+
out.push(`- **Alarms:** ${alarmCount ? `${alarmCount} in ${r.alarms.length} group(s) of CODESYS alarm management` : "none in CODESYS alarm management"}.`);
|
|
32
|
+
out.push(`- **HMI:** ${r.hmi.length ? `${r.hmi.length} page(s): ${r.hmi.map((h) => h.title).join(", ")}` : "none"}.`);
|
|
33
|
+
out.push(`- **Libraries:** ${r.libraries.length}.`);
|
|
34
|
+
if (r.compile)
|
|
35
|
+
out.push(`- **Last compile:** ${r.compile.errors} errors, ${r.compile.warnings} warnings.`);
|
|
36
|
+
out.push("");
|
|
37
|
+
out.push("## Tasks");
|
|
38
|
+
out.push("");
|
|
39
|
+
out.push(table(["Task", "Kind", "Interval", "Priority", "Watchdog", "Calls"], r.tasks.map((t) => [t.name, t.kind ?? "", interval(t), t.priority ?? "", t.watchdog?.enabled ? `${t.watchdog.time ?? ""}${t.watchdog.time_unit && t.watchdog.time && !/[a-z]/i.test(t.watchdog.time) ? ` ${t.watchdog.time_unit}` : ""}` : "off", t.pous.join(", ")])));
|
|
40
|
+
out.push("");
|
|
41
|
+
out.push("## I/O");
|
|
42
|
+
out.push("");
|
|
43
|
+
out.push(table(["Address", "Variable", "Type", "Direction", "Comment"], r.io.map((x) => [x.at, `${x.owner}.${x.name}`, x.type, x.direction, x.comment ?? ""])));
|
|
44
|
+
if (r.mapped.length) {
|
|
45
|
+
out.push("");
|
|
46
|
+
out.push("Mapped in the device tree:");
|
|
47
|
+
out.push("");
|
|
48
|
+
out.push(table(["Address", "Variable", "Device", "Channel", "Description"], r.mapped.map((c) => [c.address, c.variable.replace(/^Application\./, ""), c.device, c.parameter, c.description])));
|
|
49
|
+
}
|
|
50
|
+
out.push("");
|
|
51
|
+
out.push("## Alarms");
|
|
52
|
+
out.push("");
|
|
53
|
+
out.push(table(["Group", "ID", "Class", "Message", "Condition"], r.alarms.flatMap((g) => g.alarms.map((a) => [g.name, a.id, a.cls, a.text, condition(a)]))));
|
|
54
|
+
out.push("");
|
|
55
|
+
out.push("## HMI pages");
|
|
56
|
+
out.push("");
|
|
57
|
+
out.push(table(["Page", "Title", "Widgets", "Variables"], r.hmi.map((h) => [h.name, h.title, String(h.widgets), String(h.variables)])));
|
|
58
|
+
out.push("");
|
|
59
|
+
out.push("## Libraries");
|
|
60
|
+
out.push("");
|
|
61
|
+
out.push(table(["Library", "Resolved to"], r.libraries.map((l) => [l.name, l.resolution ?? ""])));
|
|
62
|
+
out.push("");
|
|
63
|
+
out.push("## Devices");
|
|
64
|
+
out.push("");
|
|
65
|
+
out.push("```text", r.devices.trim() || "No devices.", "```");
|
|
66
|
+
out.push("");
|
|
67
|
+
out.push("## Program structure");
|
|
68
|
+
out.push("");
|
|
69
|
+
out.push("```text", r.outline.trim(), "```");
|
|
70
|
+
out.push("");
|
|
71
|
+
out.push("## Commissioning checklist");
|
|
72
|
+
out.push("");
|
|
73
|
+
out.push("Tested so far only in CODESYS's simulation. On the machine, with the responsible engineer:");
|
|
74
|
+
out.push("");
|
|
75
|
+
const box = (s) => out.push(`- [ ] ${s}`);
|
|
76
|
+
box("Safety functions (emergency stop, guards, interlocks) are designed and verified separately; this program is not a safety controller.");
|
|
77
|
+
box("The controller, its runtime version and the device tree match the real hardware; the project compiles with 0 errors for the real target.");
|
|
78
|
+
for (const t of r.tasks)
|
|
79
|
+
box(`Task ${t.name}: ${t.watchdog?.enabled ? "the cycle time and watchdog hold" : "the cycle time holds"} on the real controller (${[t.kind, interval(t)].filter(Boolean).join(", ")}).`);
|
|
80
|
+
if (uncalled.length)
|
|
81
|
+
box(`Programs no task calls (${uncalled.join(", ")}): intended, or add them to a task.`);
|
|
82
|
+
for (const x of inputs)
|
|
83
|
+
box(`Input ${x.at} ${x.owner}.${x.name}${x.comment ? ` (${x.comment})` : ""}: changes when the field device does.`);
|
|
84
|
+
for (const x of outputs)
|
|
85
|
+
box(`Output ${x.at} ${x.owner}.${x.name}${x.comment ? ` (${x.comment})` : ""}: drives the right actuator, and is safe when the controller stops.`);
|
|
86
|
+
for (const c of r.mapped)
|
|
87
|
+
box(`Channel ${c.address || c.parameter} of ${c.device} -> ${c.variable.replace(/^Application\./, "")}: wired and scaled correctly.`);
|
|
88
|
+
for (const g of r.alarms)
|
|
89
|
+
for (const a of g.alarms)
|
|
90
|
+
box(`Alarm ${g.name}/${a.id} "${a.text}": raise ${condition(a)} on the machine; it shows with class ${a.cls || "?"} and can be acknowledged.`);
|
|
91
|
+
for (const h of r.hmi)
|
|
92
|
+
box(`HMI page ${h.title}: every value matches the machine and every button does what its label says.`);
|
|
93
|
+
if (persistent.length)
|
|
94
|
+
box(`Persistent/retain variables (${persistent.map((p) => p.name).join(", ")}): keep their values over a power cycle and a download.`);
|
|
95
|
+
box("Setpoints, limits and timers are set for the real process, not the simulation's.");
|
|
96
|
+
box("The project is archived (Project Archive) and versioned after commissioning.");
|
|
97
|
+
out.push("");
|
|
98
|
+
return out.join("\n");
|
|
99
|
+
}
|
|
100
|
+
//# sourceMappingURL=report.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"report.js","sourceRoot":"","sources":["../../src/codesys/report.ts"],"names":[],"mappings":"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"}
|
package/dist/hmi/native.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { Screen, Tone } from "./spec.js";
|
|
2
|
+
import { type SymbolLib } from "./symbols.js";
|
|
2
3
|
type Argb = number;
|
|
3
4
|
export interface NativeElement {
|
|
4
5
|
kind: "rect" | "round" | "circle" | "switcher" | "image";
|
|
@@ -85,5 +86,5 @@ export declare function symbols(p: Palette): {
|
|
|
85
86
|
export declare function nativePlan(screen: Screen, pages?: {
|
|
86
87
|
name: string;
|
|
87
88
|
title: string;
|
|
88
|
-
}[]): NativePlan;
|
|
89
|
+
}[], custom?: SymbolLib): NativePlan;
|
|
89
90
|
export {};
|
package/dist/hmi/native.js
CHANGED
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
import { canvasOf, tileBox } from "./render.js";
|
|
8
8
|
import { routed } from "./route.js";
|
|
9
9
|
import { screenVariables } from "./spec.js";
|
|
10
|
+
import { BUILTIN_SYMBOLS, findSymbol, symbolPicture, symbolSize } from "./symbols.js";
|
|
10
11
|
const PALETTES = {
|
|
11
12
|
dark: {
|
|
12
13
|
bg: 0xff0a1222,
|
|
@@ -91,8 +92,17 @@ ${on ? `<circle cx="50" cy="50" r="46" fill="none" stroke="${ring}" stroke-width
|
|
|
91
92
|
{ id: "valve_closed_v", svg: valve(false).replace(/(<svg[^>]*>)([\s\S]*)(<\/svg>)/, '$1<g transform="rotate(90 50 50)">$2</g>$3') },
|
|
92
93
|
];
|
|
93
94
|
}
|
|
94
|
-
export function nativePlan(screen, pages = []) {
|
|
95
|
+
export function nativePlan(screen, pages = [], custom = {}) {
|
|
95
96
|
const p = PALETTES[screen.theme];
|
|
97
|
+
const lib = { ...BUILTIN_SYMBOLS, ...custom };
|
|
98
|
+
const dark = screen.theme === "dark";
|
|
99
|
+
const symColors = (state) => ({
|
|
100
|
+
state: hex(state === "on" ? p.tones.ok : state === "fault" ? p.tones.alarm : p.tones.neutral),
|
|
101
|
+
body: dark ? "#334155" : "#f1f5f9",
|
|
102
|
+
body2: dark ? "#1e293b" : "#cbd5e1",
|
|
103
|
+
line: hex(p.muted),
|
|
104
|
+
accent: hex(p.tones.accent),
|
|
105
|
+
});
|
|
96
106
|
const visu = `Visu_${screen.name}`;
|
|
97
107
|
const pool = `IP_${screen.name}`;
|
|
98
108
|
const helperName = `PRG_HMI_${screen.name}`;
|
|
@@ -262,7 +272,7 @@ export function nativePlan(screen, pages = []) {
|
|
|
262
272
|
const sy = box.h / 100;
|
|
263
273
|
const X = (x) => box.x + x * sx;
|
|
264
274
|
const Y = (y) => box.y + y * sy;
|
|
265
|
-
const items = routed(w.items, box.h / box.w).sort((a, b2) => (a.type === "pipe" ? -1 : 0) - (b2.type === "pipe" ? -1 : 0));
|
|
275
|
+
const items = routed(w.items, box.h / box.w, lib).sort((a, b2) => (a.type === "pipe" ? -1 : 0) - (b2.type === "pipe" ? -1 : 0));
|
|
266
276
|
for (const it of items)
|
|
267
277
|
processItem(it, X, Y, sx);
|
|
268
278
|
break;
|
|
@@ -272,6 +282,34 @@ export function nativePlan(screen, pages = []) {
|
|
|
272
282
|
function processItem(it, X, Y, sx) {
|
|
273
283
|
const label = (cx, y, t) => t && els.push(text(cx - 60, y, 120, 18, t, [SEMI, 8.5], p.muted, "HCENTER"));
|
|
274
284
|
switch (it.type) {
|
|
285
|
+
case "symbol": {
|
|
286
|
+
const f = findSymbol(lib, it.symbol);
|
|
287
|
+
if (!f)
|
|
288
|
+
break;
|
|
289
|
+
const [name, d] = f;
|
|
290
|
+
const rot = it.rotate ?? 0;
|
|
291
|
+
const { w, h } = symbolSize(d, it.size);
|
|
292
|
+
const [vw, vh] = rot % 180 ? [h, w] : [w, h];
|
|
293
|
+
const wpx = Math.max(4, r(vw * sx)), hpx = Math.max(4, r(vh * sx));
|
|
294
|
+
const cx = X(it.x), cy = Y(it.y);
|
|
295
|
+
// One picture per state; the bitmap ID expression picks it (fault wins over on).
|
|
296
|
+
const pic = (state) => {
|
|
297
|
+
const id = `sym_${name}_${state}${rot ? `_r${rot}` : ""}_${wpx}x${hpx}`;
|
|
298
|
+
if (!needed.has(id))
|
|
299
|
+
needed.set(id, symbolPicture(d, name, symColors(state), rot, wpx, hpx));
|
|
300
|
+
return `${pool}.${id}`;
|
|
301
|
+
};
|
|
302
|
+
let expr = `'${pic("off")}'`;
|
|
303
|
+
if (it.on)
|
|
304
|
+
expr = `SEL(${it.on}, ${expr}, '${pic("on")}')`;
|
|
305
|
+
if (it.fault)
|
|
306
|
+
expr = `SEL(${it.fault}, ${expr}, '${pic("fault")}')`;
|
|
307
|
+
els.push({ kind: "image", x: r(cx - wpx / 2), y: r(cy - hpx / 2), w: wpx, h: hpx, props: { "Static ID": pic("off"), ...(it.on || it.fault ? { "Bitmap ID variable.Bitmap ID": expr } : {}) } });
|
|
308
|
+
if (it.faceplate)
|
|
309
|
+
els.push({ kind: "rect", x: r(cx - wpx / 2), y: r(cy - hpx / 2), w: wpx, h: hpx, fill: null, frame: null, dialog: { name: dialogFor(it.label ?? name, it.faceplate, it), x: r(cx + wpx / 2 + 10), y: r(cy - 60) } });
|
|
310
|
+
label(cx, cy + hpx / 2 + 2, it.label);
|
|
311
|
+
break;
|
|
312
|
+
}
|
|
275
313
|
case "pipe": {
|
|
276
314
|
const th = 7;
|
|
277
315
|
const pts = it.points ?? [];
|
|
@@ -374,9 +412,9 @@ export function nativePlan(screen, pages = []) {
|
|
|
374
412
|
d.push({ kind: "circle", x, y: y + 4, w: 14, h: 14, fill: p.track, frame: null, props: { "Color variables.Toggle color": v, "Colors.Alarm state.Fill color": c(p.tones[tone]), "Colors.Alarm state.Frame color": c(p.tones[tone]) } });
|
|
375
413
|
d.push(text(x + 22, y, 120, 22, label, [FONT, 10], p.text));
|
|
376
414
|
};
|
|
377
|
-
const running = sym.type === "pump" || sym.type === "fan" ? sym.running : undefined;
|
|
415
|
+
const running = sym.type === "pump" || sym.type === "fan" ? sym.running : sym.type === "symbol" ? sym.on : undefined;
|
|
378
416
|
const open = sym.type === "valve" ? sym.open : undefined;
|
|
379
|
-
const fault = sym.type === "pump" ? sym.fault : undefined;
|
|
417
|
+
const fault = sym.type === "pump" || sym.type === "symbol" ? sym.fault : undefined;
|
|
380
418
|
if (running)
|
|
381
419
|
lamp("Running", running, "ok", 18);
|
|
382
420
|
if (open)
|