wangdequan/cnc_wams
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

按规划继续工作

Browse Source 
结论：接入 vendored LinuxCNC tooldata_common.cc 负责刀具表解析与保存，WASM/SDK/OPFS/UI 仅做运行时边界搬运；native、WASM、OPFS 和浏览器 smoke 验证已通过。
This commit is contained in:
wangdequan
2026-06-08 08:31:10 +08:00
parent 5ea07606d7
commit a16f3605fa
24 changed files with 1302 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

185
wasm-port/runtime/ui/ini-panel/app.js
View File

@@ -1,18 +1,58 @@
import { createLinuxCncIniSdk } from "../../sdk/src/index.js";
import {
createLinuxCncIniSdk,
createLinuxCncInterpSdk,
} from "../../sdk/src/index.js";
import {
getOpfsRoot,
loadTextFile,
saveTextFile,
} from "../../opfs/file-service.js";
import {
loadGcodeProgram,
loadMachineTextFiles,
machineFilePaths,
saveGcodeProgram,
saveMachineTextFiles,
} from "../../opfs/machine-file-store.js";
import {
loadMachineSessionFromOpfs,
} from "../../opfs/linuxcnc-machine-session-bridge.js";
const SAMPLE_PATH =
"../../../linuxcnc/configs/sim/axis/vismach/5axis/table-dual-rotary/xyzab-tdr.ini";
const OPFS_FILE = "linuxcnc/xyzab-tdr.ini";
const MACHINE_ID = "xyzab-tdr";
const MACHINE_PATHS = machineFilePaths(MACHINE_ID);
const OPFS_FILE = MACHINE_PATHS.ini;
const WASM_FILE = "/work/xyzab-tdr.ini";
const SESSION_WASM_FILES = {
iniWasmPath: "/work/session-machine.ini",
parameterWasmPath: "/work/session-linuxcnc.var",
toolTableWasmPath: "/work/session-tool.tbl",
};
const GCODE_FILENAME = "ui-session.ngc";
const GCODE_WASM_FILE = "/work/ui-session.ngc";
const DEFAULT_TOOL_TABLE = "T2 P7 Z3.125 D1.5 I12 J34 Q4 ;ui session tool\n";
const DEFAULT_PARAMETERS = [
"5161 0.0",
"5162 0.0",
"5220 1",
"5221 0.0",
"5399 0.0",
"",
].join("\n");
const DEFAULT_GCODE = [
"G0 X1.0 Y2.0 (Comment)",
"G1 X3.0 Y4.0 F120.0",
"",
].join("\n");
const editor = document.getElementById("ini-editor");
const logNode = document.getElementById("log");
const eventNode = document.getElementById("canon-events");
const eventFilterNode = document.getElementById("event-filter");
const eventCountNode = document.getElementById("event-count");
const wasmBadge = document.getElementById("wasm-badge");
const interpBadge = document.getElementById("interp-badge");
const opfsBadge = document.getElementById("opfs-badge");
const fields = {
@@ -22,9 +62,17 @@ const fields = {
joints: document.getElementById("field-joints"),
coordinates: document.getElementById("field-coordinates"),
parameterFile: document.getElementById("field-parameter-file"),
sessionIni: document.getElementById("field-session-ini"),
sessionParameters: document.getElementById("field-session-parameters"),
sessionToolTable: document.getElementById("field-session-tool-table"),
sessionGcode: document.getElementById("field-session-gcode"),
runStatus: document.getElementById("field-run-status"),
};
let iniSdk = null;
let interpSdk = null;
let loadedSession = null;
let canonicalEventText = "";
function setBadge(node, text, className = "badge") {
node.className = className;
@@ -36,17 +84,40 @@ function setLog(message, isError = false) {
logNode.className = `log${isError ? " danger" : ""}`;
}
function setCanonicalEvents(text) {
canonicalEventText = text || "";
renderCanonicalEvents();
}
function renderCanonicalEvents() {
const lines = canonicalEventText.split("\n").filter(Boolean);
const filter = eventFilterNode.value.trim().toLowerCase();
const visibleLines = filter
? lines.filter((line) => line.toLowerCase().includes(filter))
: lines;
eventNode.textContent = visibleLines.join("\n");
eventCountNode.textContent = `${visibleLines.length} / ${lines.length}`;
}
function setField(name, value) {
fields[name].textContent = value ?? "-";
}
function requireIniSdk() {
if (!iniSdk) {
throw new Error("WASM module is not ready yet.");
throw new Error("INI WASM module is not ready yet.");
}
return iniSdk;
}
function requireInterpSdk() {
if (!interpSdk) {
throw new Error("Interpreter WASM module is not ready yet.");
}
return interpSdk;
}
function syncEditorToWasmFs() {
requireIniSdk().writeTextFile(WASM_FILE, editor.value);
}
@@ -64,10 +135,19 @@ async function loadSample() {
async function boot() {
try {
iniSdk = await createLinuxCncIniSdk();
setBadge(wasmBadge, "WASM: ready");
setBadge(wasmBadge, "INI WASM: ready");
} catch (error) {
setBadge(wasmBadge, "WASM: failed", "badge danger");
setLog(`WASM init failed: ${error.message}`, true);
setBadge(wasmBadge, "INI WASM: failed", "badge danger");
setLog(`INI WASM init failed: ${error.message}`, true);
throw error;
}
try {
interpSdk = await createLinuxCncInterpSdk();
setBadge(interpBadge, "Interpreter WASM: ready");
} catch (error) {
setBadge(interpBadge, "Interpreter WASM: failed", "badge danger");
setLog(`Interpreter WASM init failed: ${error.message}`, true);
throw error;
}
@@ -97,6 +177,78 @@ document.getElementById("save-opfs").addEventListener("click", async () => {
}
});
document.getElementById("save-machine-files").addEventListener("click", async () => {
try {
const paths = await saveMachineTextFiles(MACHINE_ID, {
ini: editor.value,
toolTable: DEFAULT_TOOL_TABLE,
parameters: DEFAULT_PARAMETERS,
});
const gcodePath = await saveGcodeProgram(GCODE_FILENAME, DEFAULT_GCODE);
setLog(
[
"Saved machine text files to OPFS.",
`INI: ${paths.ini}`,
`Tool table: ${paths.toolTable}`,
`Parameters: ${paths.parameters}`,
`G-code: ${gcodePath}`,
].join("\n"),
);
} catch (error) {
setLog(`Machine file save failed: ${error.message}`, true);
}
});
document.getElementById("load-session").addEventListener("click", async () => {
try {
loadedSession = await loadMachineSessionFromOpfs(
requireInterpSdk(),
MACHINE_ID,
SESSION_WASM_FILES,
);
setField("sessionIni", loadedSession.ini.wasmPath);
setField("sessionParameters", loadedSession.parameters.wasmPath);
setField("sessionToolTable", loadedSession.toolTable.wasmPath);
setLog(
[
"Loaded machine session into the interpreter WASM filesystem.",
`INI: ${loadedSession.ini.opfsPath} -> ${loadedSession.ini.wasmPath}`,
`Parameters: ${loadedSession.parameters.result.trim()}`,
`Tool table: ${loadedSession.toolTable.result.trim()}`,
].join("\n"),
);
} catch (error) {
setLog(`Machine session load failed: ${error.message}`, true);
}
});
document.getElementById("run-gcode").addEventListener("click", async () => {
try {
if (!loadedSession) {
throw new Error("Load a machine session before running G-code.");
}
const interp = requireInterpSdk();
const programText = await loadGcodeProgram(GCODE_FILENAME);
interp.writeTextFile(GCODE_WASM_FILE, programText);
const result = interp.runFileWithIni(GCODE_WASM_FILE, loadedSession.ini.wasmPath);
setField("sessionGcode", GCODE_WASM_FILE);
setField("runStatus", "ok");
setCanonicalEvents(result.trim());
setLog(
[
"Ran G-code through LinuxCNC interpreter WASM.",
`Program: ${GCODE_WASM_FILE}`,
`INI: ${loadedSession.ini.wasmPath}`,
result.trim(),
].join("\n"),
);
} catch (error) {
setField("runStatus", "failed");
setCanonicalEvents("");
setLog(`G-code run failed: ${error.message}`, true);
}
});
document.getElementById("load-opfs").addEventListener("click", async () => {
try {
editor.value = await loadTextFile(OPFS_FILE);
@@ -137,4 +289,25 @@ document.getElementById("query").addEventListener("click", async () => {
}
});
document.getElementById("load-machine-files").addEventListener("click", async () => {
try {
const files = await loadMachineTextFiles(MACHINE_ID);
editor.value = files.ini;
setLog(
[
"Loaded machine text files from OPFS.",
`INI bytes: ${files.ini.length}`,
`Tool table bytes: ${files.toolTable.length}`,
`Parameter bytes: ${files.parameters.length}`,
].join("\n"),
);
} catch (error) {
setLog(`Machine file load failed: ${error.message}`, true);
}
});
eventFilterNode.addEventListener("input", () => {
renderCanonicalEvents();
});
boot().catch(() => {});

52
wasm-port/runtime/ui/ini-panel/index.html
View File

@@ -123,6 +123,32 @@
font: 13px/1.5 "SFMono-Regular", "Consolas", monospace;
white-space: pre-wrap;
}
.events {
border: 1px solid var(--border);
border-radius: 6px;
background: #fbfdff;
padding: 12px;
min-height: 180px;
max-height: 320px;
overflow: auto;
font: 12px/1.5 "SFMono-Regular", "Consolas", monospace;
white-space: pre-wrap;
}
.event-tools {
display: grid;
grid-template-columns: minmax(0, 1fr) auto;
gap: 8px;
align-items: center;
}
input {
border: 1px solid var(--border);
border-radius: 6px;
padding: 9px 10px;
font: 13px/1.4 "SFMono-Regular", "Consolas", monospace;
color: var(--text);
background: #fbfdff;
min-width: 0;
}
.danger { color: var(--danger); }
@media (max-width: 960px) {
.grid { grid-template-columns: 1fr; }
@@ -148,8 +174,12 @@
<button id="load-sample" class="primary">Load LinuxCNC Sample</button>
<button id="save-opfs">Save To OPFS</button>
<button id="load-opfs">Load From OPFS</button>
<button id="save-machine-files">Save Machine Files</button>
<button id="load-machine-files">Load Machine Files</button>
<button id="sync-wasm">Sync To WASM FS</button>
<button id="query" class="secondary">Query LinuxCNC Fields</button>
<button id="load-session" class="secondary">Load Machine Session</button>
<button id="run-gcode" class="secondary">Run G-code</button>
</div>
<textarea id="ini-editor" spellcheck="false"></textarea>
</section>
@@ -157,7 +187,8 @@
<section class="panel">
<h2>Control Panel</h2>
<div class="status">
<div><span id="wasm-badge" class="badge">WASM: loading</span></div>
<div><span id="wasm-badge" class="badge">INI WASM: loading</span></div>
<div><span id="interp-badge" class="badge">Interpreter WASM: loading</span></div>
<div><span id="opfs-badge" class="badge">OPFS: checking</span></div>
</div>
@@ -175,12 +206,29 @@
<dt>Parameter File</dt>
<dd id="field-parameter-file">-</dd>
<dt>OPFS Path</dt>
<dd id="field-opfs-path">linuxcnc/xyzab-tdr.ini</dd>
<dd id="field-opfs-path">linuxcnc/machines/xyzab-tdr/machine.ini</dd>
<dt>WASM Path</dt>
<dd id="field-wasm-path">/work/xyzab-tdr.ini</dd>
<dt>Session INI</dt>
<dd id="field-session-ini">-</dd>
<dt>Session Params</dt>
<dd id="field-session-parameters">-</dd>
<dt>Session Tools</dt>
<dd id="field-session-tool-table">-</dd>
<dt>Session G-code</dt>
<dd id="field-session-gcode">-</dd>
<dt>Run Status</dt>
<dd id="field-run-status">-</dd>
</dl>
<div class="log" id="log"></div>
<h2>Canonical Events</h2>
<div class="event-tools">
<input id="event-filter" type="search" placeholder="Filter event text">
<span id="event-count" class="badge">0 / 0</span>
</div>
<pre class="events" id="canon-events"></pre>
</section>
</section>
</main>