Ah, yes, The problem here is that 'spindle.0.orient' goes through that convoluted logic I mentioned above. So change this:
# M19 trigger orient.enable; orient-pid enable; spinena; select analogout
net spindle-orient <= spindle.0.orient
net spindle-orient => or2.1.in0 #to orient enable
net spindle-orient => and2.0.in0 #to spindle is oriented
net orient-lock <= spindle.0.locked
net orient-lock => or2.1.in1 #to orient ennable
net orient-enable => or2.1.out
net orient-enable => orient.enable
net orient-enable => orient-pid.enable
net orient-enable => or2.0.in1
net orient-enable => mux2.0.sel
To this:
# M19 trigger orient.enable; orient-pid enable; spinena; select analogout
net orient-enable <= spindle.0.orient
net orient-enable => orient.enable
net orient-enable => orient-pid.enable
net orient-enable => or2.0.in1
net orient-enable => mux2.0.sel
I'm not sure if you stil have these lines but remove them if you do :
net orient-complete => and2.0.in1
net spindle-is-oriented <= and2.0.out
Also remove the components 'or2.1' and 'and2.0' from 'loadrt/addf'