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

按规划持续工作

Browse Source 
结论：已将 vendored LinuxCNC impeller-7bl-xyzac.ngc 纳入五轴 TRT remap/tool-table/file 执行 baseline，native、Node WASM、browser 和 UI 均通过同源验证，未实现自有 M428/M429/M430 或运动学语义。
This commit is contained in:
wangdequan
2026-06-08 18:37:22 +08:00
parent c6c60c4866
commit 4cd01deafb
10 changed files with 100 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wasm-port/runtime/core/linuxcnc_wrap/linuxcnc_5axis_remap_asset_probe.cpp
View File

@@ -229,6 +229,12 @@ int main()
"configs/sim/axis/vismach/5axis/table-rotary-tilting/demos/boat-xyzbc.ngc",
true,
true);
ok &= check_text_mcodes(
"xyzac_trt_impeller",
"configs/sim/axis/vismach/5axis/table-rotary-tilting/demos/"
"impeller-7bl-xyzac.ngc",
true,
true);
print_bool("fiveaxis_remap_assets_from_linuxcnc", ok);
return ok ? 0 : 1;

9
wasm-port/runtime/core/linuxcnc_wrap/linuxcnc_5axis_remap_execute_harness.cpp
View File

@@ -53,7 +53,7 @@ void print_interp_error(Interp &interp, const std::string &label, int rc)
std::cout << label << "_blocktext=" << interp._setup.blocktext << "\n";
}
constexpr int kMaxDemoFileSteps = 4096;
constexpr int kMaxDemoFileSteps = 8192;
void seed_switchkins_hal()
{
@@ -328,6 +328,12 @@ int main()
"boat-xyzbc.ngc",
0.0,
},
{
"impeller_7bl_xyzac",
"configs/sim/axis/vismach/5axis/table-rotary-tilting/demos/"
"impeller-7bl-xyzac.ngc",
0.0,
},
};
ok &= execute_demo_file(cases[0], demos[0]);
@@ -336,6 +342,7 @@ int main()
ok &= execute_demo_file(cases[0], demos[3]);
ok &= execute_demo_file(cases[0], demos[4]);
ok &= execute_demo_file(cases[1], demos[5]);
ok &= execute_demo_file(cases[0], demos[6]);
print_bool("fiveaxis_linuxcnc_remap_execute_path", ok);
return ok ? 0 : 1;

2
wasm-port/runtime/core/linuxcnc_wrap/linuxcnc_interp_wasm.cpp
View File

@@ -485,7 +485,7 @@ char *lcinterp_run_fiveaxis_remap_file(const char *path, const char *ini_path)
return copy_result(output.str());
}
constexpr int max_file_steps = 4096;
constexpr int max_file_steps = 8192;
int file_read_count = 0;
int file_execute_count = 0;
int file_finish_count = 0;

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

@@ -179,8 +179,8 @@ async function writeFiveAxisTrtMachineFiles(interp) {
}
await writeFetchedTextFile(
interp,
`${FIVEAXIS_TRT_SOURCE_PATH}/demos/boat-xyzac.ngc`,
`${FIVEAXIS_TRT_WASM_DIR}/demos/boat-xyzac.ngc`,
`${FIVEAXIS_TRT_SOURCE_PATH}/demos/impeller-7bl-xyzac.ngc`,
`${FIVEAXIS_TRT_WASM_DIR}/demos/impeller-7bl-xyzac.ngc`,
);
}
@@ -311,7 +311,7 @@ document.getElementById("run-fiveaxis-remap").addEventListener("click", async ()
const interp = requireInterpSdk();
await writeFiveAxisTrtMachineFiles(interp);
const iniPath = `${FIVEAXIS_TRT_WASM_DIR}/xyzac-trt.ini`;
const programPath = `${FIVEAXIS_TRT_WASM_DIR}/demos/boat-xyzac.ngc`;
const programPath = `${FIVEAXIS_TRT_WASM_DIR}/demos/impeller-7bl-xyzac.ngc`;
const result = interp.runFiveAxisRemapFile(programPath, iniPath);
setField("fiveaxisRemap", "ok");
setCanonicalEvents(result.trim());