muehe/onefinity-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

control: properly wait for gantry homing before W

Browse Source 
api.put('home') returns immediately when queued, not when homing
finishes, so the previous polling loop saw cycle=='idle' (homing
hadn't started yet) and fired W right away. Now we first wait up
to 5s for the cycle to *leave* idle, then up to 2min for it to
return, before kicking off the auxcnc W home.
This commit is contained in:
muehe
2026-05-01 16:18:23 +02:00
parent cfc14643d2
commit 748f092795
1 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/js/control-view.js
View File

@@ -258,9 +258,12 @@ module.exports = {
// Home every enabled axis (legacy Onefinity "Home All"). Sequence: // Home every enabled axis (legacy Onefinity "Home All"). Sequence:
// 1. Z, X, Y (and A/B/C if enabled) via /api/home on the AVR // 1. Z, X, Y (and A/B/C if enabled) via /api/home on the AVR
// 2. W axis via /api/aux/home on the ESP // 2. W axis via /api/aux/home on the ESP
// The two cycles are dispatched serially: we wait for the main // /api/home returns as soon as the request is queued, not when
// homing cycle to drop back to idle before kicking off W so the // homing completes, so we have to watch state.cycle:
// gantry never moves while the W spindle is also homing. // - first wait for it to *leave* 'idle' (cycle began),
// - then wait for it to come *back* to 'idle' (cycle ended).
// Only then do we fire the W home, so the gantry and the auxcnc
// ESP never move at the same time.
home_all: async function () { home_all: async function () {
this.ask_home = false; this.ask_home = false;
try { try {
@@ -270,14 +273,34 @@ module.exports = {
return; return;
} }
if (!this.w || !this.w.enabled) return; if (!this.w || !this.w.enabled) return;
// Poll state.cycle until the main homing cycle finishes. The
// homing cycle leaves state.cycle as 'homing' until done, then const wait = (ms) => new Promise(r => setTimeout(r, ms));
// returns to 'idle'. const cycleNow = () => (this.state && this.state.cycle) || "idle";
const start = Date.now();
while (Date.now() - start < 120000) { // Phase 1: wait up to 5s for the homing cycle to actually start.
if (this.state && this.state.cycle == "idle") break; // If the request was rejected upstream (e.g. estopped) cycle
await new Promise(r => setTimeout(r, 200)); // never leaves idle and we bail rather than home W in isolation.
const startedAt = Date.now();
while (Date.now() - startedAt < 5000) {
if (cycleNow() != "idle") break;
await wait(100);
} }
if (cycleNow() == "idle") {
console.warn("home_all: main homing cycle never started; skipping W");
return;
}
// Phase 2: wait up to 2 minutes for the gantry to finish.
const settledAt = Date.now();
while (Date.now() - settledAt < 120000) {
if (cycleNow() == "idle") break;
await wait(200);
}
if (cycleNow() != "idle") {
console.warn("home_all: gantry homing did not complete in time");
return;
}
api.put("aux/home").catch(function (err) { api.put("aux/home").catch(function (err) {
console.error("W home failed:", err); console.error("W home failed:", err);
}); });