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}`;

64
wasm-port/tests/browser/interp_smoke.html
View File

@@ -9,9 +9,14 @@
<script type="module">
import { createLinuxCncInterpSdk } from "../../runtime/sdk/src/index.js";
import {
restoreMachineParametersFromOpfs,
saveMachineParametersToOpfs,
} from "../../runtime/opfs/linuxcnc-parameter-bridge.js";
import {
saveMachineToolTableToOpfs,
} from "../../runtime/opfs/linuxcnc-tool-table-bridge.js";
import {
loadMachineSessionFromOpfs,
} from "../../runtime/opfs/linuxcnc-machine-session-bridge.js";
import {
loadMachineTextFiles,
saveMachineTextFiles,
@@ -118,7 +123,7 @@
await saveMachineTextFiles("browser-interp", {
ini: "[EMC]\nMACHINE = browser-interp\n",
toolTable: "T0 P0 ; no tool\n",
toolTable: "T2 P7 Z3.125 D1.5 I12 J34 Q4 ;browser finish tool\n",
parameters: [
"5161 10.5",
"5162 20.25",
@@ -129,14 +134,18 @@
"",
].join("\n"),
});
const restoredParameters = await restoreMachineParametersFromOpfs(
const loadedSession = await loadMachineSessionFromOpfs(
interp,
"browser-interp",
{ wasmPath: "/work/browser-linuxcnc.var" },
{
iniWasmPath: "/work/browser-machine.ini",
parameterWasmPath: "/work/browser-linuxcnc.var",
toolTableWasmPath: "/work/browser-tool.tbl",
},
);
verifyExpectedOutput(
"opfs_restore_parameters",
restoredParameters.result,
loadedSession.parameters.result,
[
"restore_parameters=0",
"parameter_5161=10.5",
@@ -145,6 +154,22 @@
"parameter_5399=44",
].join("\n"),
);
verifyExpectedOutput(
"opfs_load_tool_table",
loadedSession.toolTable.result,
[
"tooldata_load=0",
"tool_1.toolno=2",
"tool_1.pocketno=7",
"tool_1.z=3.125",
"tool_1.diameter=1.5",
"tool_1.frontangle=12",
"tool_1.backangle=34",
"tool_1.orientation=4",
"tool_1.comment=browser finish tool",
"tool_index_for_tool_2=1",
].join("\n"),
);
const savedParameters = await saveMachineParametersToOpfs(
interp,
"browser-interp",
@@ -180,6 +205,35 @@
"absent=<_named_param>",
].join("\n"),
);
const savedToolTable = await saveMachineToolTableToOpfs(
interp,
"browser-interp",
{ wasmPath: "/work/browser-tool.tbl" },
);
verifyExpectedOutput(
"opfs_save_tool_table",
savedToolTable.result,
[
"tooldata_save=0",
"tool_1.toolno=2",
"tool_1.pocketno=7",
].join("\n"),
);
const savedMachineFiles = await loadMachineTextFiles("browser-interp");
verifyExpectedOutput(
"opfs_saved_tool_table_text",
savedMachineFiles.toolTable,
[
"T2",
"P7",
"Z+3.125000",
"D+1.500000",
"I+12.000000",
"J+34.000000",
"Q4",
";browser finish tool",
].join("\n"),
);
status.textContent = "browser_interp_smoke=ok";
} catch (error) {

3
wasm-port/tests/browser/verify_ini_panel_browser.sh
View File

@@ -12,6 +12,9 @@ fi
if [[ "${SKIP_INI_BUILD:-0}" != "1" ]]; then
"$ROOT_DIR/tools/build_ini_panel.sh"
fi
if [[ "${SKIP_INTERP_BUILD:-0}" != "1" ]]; then
"$ROOT_DIR/tools/build_wasm_core.sh"
fi
TMP_DIR="$(mktemp -d)"
PORT_FILE="$TMP_DIR/port"

2
wasm-port/tests/host/verify_host_smokes.sh
View File

@@ -8,7 +8,7 @@ ROOT_DIR="$(cd "$(dirname "$0")/../.." && pwd)"
SKIP_INI_BUILD=1 "$ROOT_DIR/tests/wasm/node/verify_ini_wasm.sh"
SKIP_INTERP_BUILD=1 "$ROOT_DIR/tests/wasm/node/verify_interp_wasm.sh"
"$ROOT_DIR/tests/opfs/node/verify_file_service.sh"
SKIP_INI_BUILD=1 "$ROOT_DIR/tests/browser/verify_ini_panel_browser.sh"
SKIP_INI_BUILD=1 SKIP_INTERP_BUILD=1 "$ROOT_DIR/tests/browser/verify_ini_panel_browser.sh"
SKIP_INTERP_BUILD=1 "$ROOT_DIR/tests/browser/verify_interp_browser.sh"
echo "host_wasm_opfs_browser_smokes=ok"

1
wasm-port/tests/native/verify_native_probes.sh
View File

@@ -203,6 +203,7 @@ check_exitcode linuxcnc_interp_o_word_source_probe
check_exitcode linuxcnc_rs274ngc_pre_source_probe
check_exitcode linuxcnc_interp_base_source_probe
check_exitcode linuxcnc_gomath_source_probe
check_exitcode linuxcnc_tooldata_common_source_probe
EMC_STATUS_STDOUT="$BUILD_DIR/linuxcnc_emc_status_probe.run.stdout.log"
grep -Fq "emc_status_default_linear_units=1" "$EMC_STATUS_STDOUT"

73
wasm-port/tests/opfs/node/verify_file_service.mjs
View File

@@ -32,6 +32,13 @@ import {
restoreMachineParametersFromOpfs,
saveMachineParametersToOpfs,
} from "../../../runtime/opfs/linuxcnc-parameter-bridge.js";
import {
loadMachineToolTableFromOpfs,
saveMachineToolTableToOpfs,
} from "../../../runtime/opfs/linuxcnc-tool-table-bridge.js";
import {
loadMachineSessionFromOpfs,
} from "../../../runtime/opfs/linuxcnc-machine-session-bridge.js";
class MockFileHandle {
constructor(name) {
@@ -176,6 +183,13 @@ const bridgeInterp = {
bridgeFiles.set(`${path}.bak`, "5161 0.0\n5162 0.0\n");
return `save_parameters=0\nsave_path=${path}\nvalues=${Object.keys(values).join(",")}\n`;
},
loadToolTable(path) {
return `tooldata_load=0\nload_tool_path=${path}\n`;
},
saveToolTable(path) {
bridgeFiles.set(path, "T2 P2 Z+1.250000 D+0.250000 ;loaded by LinuxCNC\n");
return `tooldata_save=0\nsave_tool_path=${path}\n`;
},
};
const restoredParameters = await restoreMachineParametersFromOpfs(
@@ -208,6 +222,65 @@ assert.equal(
"5161 0.0\n5162 0.0\n",
);
const loadedToolTable = await loadMachineToolTableFromOpfs(
bridgeInterp,
"xyzab-tdr",
{ storage, wasmPath: "/work/bridge-tool.tbl" },
);
assert.deepEqual(loadedToolTable, {
opfsPath: "linuxcnc/machines/xyzab-tdr/tool.tbl",
wasmPath: "/work/bridge-tool.tbl",
result: "tooldata_load=0\nload_tool_path=/work/bridge-tool.tbl\n",
});
assert.equal(bridgeFiles.get("/work/bridge-tool.tbl"), "T0 P0 ; no tool\nT2 P2 Z1.25 D0.25\n");
const savedToolTable = await saveMachineToolTableToOpfs(
bridgeInterp,
"xyzab-tdr",
{ storage, wasmPath: "/work/bridge-tool.tbl" },
);
assert.equal(savedToolTable.opfsPath, "linuxcnc/machines/xyzab-tdr/tool.tbl");
assert.equal(savedToolTable.wasmPath, "/work/bridge-tool.tbl");
assert.equal(savedToolTable.result.includes("tooldata_save=0"), true);
assert.equal(
await loadTextFile("linuxcnc/machines/xyzab-tdr/tool.tbl", storage),
"T2 P2 Z+1.250000 D+0.250000 ;loaded by LinuxCNC\n",
);
const loadedSession = await loadMachineSessionFromOpfs(
bridgeInterp,
"xyzab-tdr",
{
storage,
iniWasmPath: "/work/session.ini",
parameterWasmPath: "/work/session.var",
toolTableWasmPath: "/work/session-tool.tbl",
},
);
assert.deepEqual(loadedSession, {
machineId: "xyzab-tdr",
ini: {
opfsPath: "linuxcnc/machines/xyzab-tdr/machine.ini",
wasmPath: "/work/session.ini",
},
parameters: {
opfsPath: "linuxcnc/machines/xyzab-tdr/linuxcnc.var",
wasmPath: "/work/session.var",
result: "restore_parameters=0\nrestore_path=/work/session.var\n",
},
toolTable: {
opfsPath: "linuxcnc/machines/xyzab-tdr/tool.tbl",
wasmPath: "/work/session-tool.tbl",
result: "tooldata_load=0\nload_tool_path=/work/session-tool.tbl\n",
},
});
assert.equal(bridgeFiles.get("/work/session.ini"), "[EMC]\nMACHINE = xyzab-tdr\n");
assert.equal(bridgeFiles.get("/work/session.var"), "5161\t12.340000\n5162\t56.780000\n");
assert.equal(
bridgeFiles.get("/work/session-tool.tbl"),
"T2 P2 Z+1.250000 D+0.250000 ;loaded by LinuxCNC\n",
);
await assert.rejects(
() => loadTextFile("linuxcnc/machines/missing.ini", storage),
/missing file/,

53
wasm-port/tests/wasm/node/verify_interp_wasm.mjs
View File

@@ -203,4 +203,57 @@ assert.equal(savedParameterFile.includes("5221\t9.870000"), true);
assert.equal(savedParameterFile.includes("5399\t66.600000"), true);
assert.equal(savedParameterFile.includes("_named_param"), false);
assert.equal(backupParameterFile.includes("5161 10.5"), true);
const toolTablePath = "/work/tool.tbl";
interp.writeTextFile(
toolTablePath,
[
"T2 P7 Z3.125 D1.5 I12 J34 Q4 ;finish tool",
"T5 P9 X1 Y2 Z3 ;rough tool",
"",
].join("\n"),
);
verifyExpectedOutput(
"load_tool_table",
interp.loadToolTable(toolTablePath),
[
"tooldata_load=0",
"tooldata_last_index=2",
"tool_0.toolno=-1",
"tool_1.toolno=2",
"tool_1.pocketno=7",
"tool_1.z=3.125",
"tool_1.diameter=1.5",
"tool_1.frontangle=12",
"tool_1.backangle=34",
"tool_1.orientation=4",
"tool_1.comment=finish tool",
"tool_2.toolno=5",
"tool_2.pocketno=9",
"tool_2.z=3",
"tool_2.comment=rough tool",
"tool_index_for_tool_2=1",
].join("\n"),
);
verifyExpectedOutput(
"save_tool_table",
interp.saveToolTable(toolTablePath),
[
"tooldata_save=0",
"tool_1.toolno=2",
"tool_2.toolno=5",
].join("\n"),
);
const savedToolTable = interp.readTextFile(toolTablePath);
assert.equal(savedToolTable.includes("T2"), true);
assert.equal(savedToolTable.includes("P7"), true);
assert.equal(savedToolTable.includes("D+1.500000"), true);
assert.equal(savedToolTable.includes("Z+3.125000"), true);
assert.equal(savedToolTable.includes("I+12.000000"), true);
assert.equal(savedToolTable.includes("J+34.000000"), true);
assert.equal(savedToolTable.includes("Q4"), true);
assert.equal(savedToolTable.includes(";finish tool"), true);
assert.equal(savedToolTable.includes("T5"), true);
assert.equal(savedToolTable.includes("P9"), true);
assert.equal(savedToolTable.includes(";rough tool"), true);
console.log("interp_wasm_node_smoke=ok");