RnD/machineGroupControl
3
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

equalFlowControl: mirror the optimalControl dispatch reorder

Browse Source 
The priority-control codepath had the same stale dispatch shape that
caused the live deadlock in optimalControl: only handling idle and
operational states, and chaining flowmovement after execsequence
startup. Aligns it with the optimalControl fix so a future mode switch
to prioritycontrol doesn't reintroduce the bug.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Rene De Ren
2026-05-08 11:47:17 +02:00
parent 8e684203a8
commit b7c40b0ddc
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/specificClass.js
View File

@@ -1121,15 +1121,17 @@ class MachineGroup {
this.logger.debug(this.machines[machineId].state); this.logger.debug(this.machines[machineId].state);
const currentState = this.machines[machineId].state.getCurrentState(); const currentState = this.machines[machineId].state.getCurrentState();
if (flow <= 0 && (currentState === "operational" || currentState === "accelerating" || currentState === "decelerating")) { // Same dispatch shape as optimalControl — see the comment
await machine.handleInput("parent", "execsequence", "shutdown"); // there for the rationale. flowmovement BEFORE startup so
} // concurrent retargets can update delayedMove without a
else if (currentState === "idle" && flow > 0) { // stale chained flowmovement overwriting it after startup.
if (flow > 0) {
await machine.handleInput("parent", "flowmovement", this._canonicalToOutputFlow(flow));
if (currentState === "idle") {
await machine.handleInput("parent", "execsequence", "startup"); await machine.handleInput("parent", "execsequence", "startup");
await machine.handleInput("parent", "flowmovement", this._canonicalToOutputFlow(flow));
} }
else if (currentState === "operational" && flow > 0) { } else if (currentState === "operational" || currentState === "accelerating" || currentState === "decelerating") {
await machine.handleInput("parent", "flowmovement", this._canonicalToOutputFlow(flow)); await machine.handleInput("parent", "execsequence", "shutdown");
} }
})); }));
} }