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

116
wasm-port/tests/browser/ini_panel_smoke.html
View File

@@ -29,6 +29,33 @@
}
}
function delay(ms) {
return new Promise((resolve) => setTimeout(resolve, ms));
}
async function waitFor(predicate, label) {
const deadline = performance.now() + 8000;
while (performance.now() < deadline) {
const value = predicate();
if (value) {
return value;
}
await delay(50);
}
throw new Error(`Timed out waiting for ${label}`);
}
async function loadUiFrame() {
const frame = document.createElement("iframe");
frame.src = "../../runtime/ui/ini-panel/index.html";
document.body.appendChild(frame);
await new Promise((resolve, reject) => {
frame.addEventListener("load", resolve, { once: true });
frame.addEventListener("error", reject, { once: true });
});
return frame.contentDocument;
}
try {
const ini = await createLinuxCncIniSdk();
const wasmPath = "/work/browser-smoke.ini";
@@ -90,6 +117,95 @@ JOINTS = 3
await saveGcodeProgram("browser-smoke.ngc", "G0 X0 Y0\nM2\n");
assertEqual(await loadGcodeProgram("browser-smoke.ngc"), "G0 X0 Y0\nM2\n", "gcode text");
const uiDocument = await loadUiFrame();
await waitFor(
() => uiDocument.getElementById("wasm-badge")?.textContent.includes("ready"),
"INI panel INI WASM readiness",
);
await waitFor(
() => uiDocument.getElementById("interp-badge")?.textContent.includes("ready"),
"INI panel interpreter WASM readiness",
);
await waitFor(
() => uiDocument.getElementById("opfs-badge")?.textContent.includes("ready"),
"INI panel OPFS readiness",
);
uiDocument.getElementById("ini-editor").value = iniText;
uiDocument.getElementById("save-machine-files").click();
await waitFor(
() => uiDocument.getElementById("log")?.textContent.includes("Saved machine text files"),
"machine file save",
);
uiDocument.getElementById("load-session").click();
await waitFor(
() => uiDocument.getElementById("log")?.textContent.includes("Loaded machine session"),
"machine session load",
);
assertEqual(
uiDocument.getElementById("field-session-ini").textContent,
"/work/session-machine.ini",
"UI session INI path",
);
assertEqual(
uiDocument.getElementById("field-session-parameters").textContent,
"/work/session-linuxcnc.var",
"UI session parameter path",
);
assertEqual(
uiDocument.getElementById("field-session-tool-table").textContent,
"/work/session-tool.tbl",
"UI session tool table path",
);
const uiLog = uiDocument.getElementById("log").textContent;
if (!uiLog.includes("restore_parameters=0") || !uiLog.includes("tooldata_load=0")) {
throw new Error(`UI session log missing LinuxCNC load result: ${uiLog}`);
}
uiDocument.getElementById("run-gcode").click();
await waitFor(
() => uiDocument.getElementById("log")?.textContent.includes("Ran G-code"),
"G-code run",
);
assertEqual(
uiDocument.getElementById("field-session-gcode").textContent,
"/work/ui-session.ngc",
"UI session G-code path",
);
assertEqual(
uiDocument.getElementById("field-run-status").textContent,
"ok",
"UI G-code run status",
);
const runLog = uiDocument.getElementById("log").textContent;
if (
!runLog.includes("canon_event=STRAIGHT_TRAVERSE") ||
!runLog.includes("canon_event=STRAIGHT_FEED")
) {
throw new Error(`UI G-code run missing LinuxCNC canonical events: ${runLog}`);
}
const eventText = uiDocument.getElementById("canon-events").textContent;
if (
!eventText.includes("canon_event=STRAIGHT_TRAVERSE") ||
!eventText.includes("canon_event=STRAIGHT_FEED")
) {
throw new Error(`UI canonical event panel missing LinuxCNC events: ${eventText}`);
}
const eventFilter = uiDocument.getElementById("event-filter");
eventFilter.value = "STRAIGHT_FEED";
eventFilter.dispatchEvent(new Event("input", { bubbles: true }));
const filteredEventText = uiDocument.getElementById("canon-events").textContent;
if (
filteredEventText.includes("canon_event=STRAIGHT_TRAVERSE") ||
!filteredEventText.includes("canon_event=STRAIGHT_FEED")
) {
throw new Error(`UI canonical event filter did not preserve raw LinuxCNC lines: ${filteredEventText}`);
}
assertEqual(
uiDocument.getElementById("event-count").textContent,
"1 / 4",
"UI canonical event count",
);
status.textContent = "browser_ini_opfs_smoke=ok";
} catch (error) {
status.textContent = `browser_ini_opfs_smoke=fail ${error.stack || error.message}`;