updates

petmakris · Jan 26, 2024 · 4775684 · 4775684
1 parent 1234939
commit 4775684
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 15 deletions.
diff --git a/config/hal/12-panel.hal b/config/hal/12-panel.hal
@@ -4,7 +4,6 @@ addf spindle-pot.scale          servo-thread
 addf jog-pot.scale              servo-thread
 addf feed-pot.conv              servo-thread
 
-
 setp feed-pot.scale.gain        20
 setp feed-pot.scale.offset      0
 
@@ -23,9 +22,11 @@ setp halui.feed-override.scale          0.01
 setp halui.feed-override.direct-value   false
 setp halui.feed-override.count-enable   true
 
-net panel.feed-override.analog-in       <= hm2_7i97.0.7i84.0.0.analogin0        => feed-pot.conv.in
-net panel.feed-override.counts          <= feed-pot.conv.out                    => halui.feed-override.counts
-net panel.feed-override.value           <= halui.feed-override.value
+net panel.feed-override.analog-in           <= hm2_7i97.0.7i84.0.0.analogin0        => feed-pot.scale.in
+net panel.feed-override.scale-out-conv-in   <= feed-pot.scale.out                   => feed-pot.conv.in
+
+net panel.feed-override.counts              <= feed-pot.conv.out                    => halui.feed-override.counts
+net panel.feed-override.value               <= halui.feed-override.value
 
 # ======================================  
 # SPINDLE SPEED
@@ -46,7 +47,6 @@ net panel.feed-override.value           <= halui.feed-override.value
 # ======================================  
 
 # net panel.jog-speed           pyvcp.jog-speed
-
 # net ssia-02-jog-speed                    hm2_7i97.0.7i84.0.0.analogin2
 
 
diff --git a/config/hal/20-xhc-whb04b-6.hal b/config/hal/20-xhc-whb04b-6.hal
@@ -50,13 +50,3 @@ net pendant.mist.on             <= whb.halui.mist.on                => halui.mis
 net pendant.lube.is-on          <= halui.lube.is-on                 => whb.halui.lube.is-on
 net pendant.lube.off            <= whb.halui.lube.off               => halui.lube.off
 net pendant.lube.on             <= whb.halui.lube.on                => halui.lube.on
-
-# net pendant.feed-override.value              halui.feed-override.value             whb.halui.feed-override.value
-# net pendant.feed-override.increase           whb.halui.feed-override.increase      halui.feed-override.increase
-# net pendant.feed-override.decrease           whb.halui.feed-override.decrease      halui.feed-override.decrease
-
-# needed for both FeedOverride+/- and rotary knob button
-# net pendant.feed-override.scale              whb.halui.feed-override.scale         halui.feed-override.scale
-
-# needed for Mpg mode : button feed position% * max-velocity = Mpg feedrate
-# net pendant.max-velocity.value               whb.halui.max-velocity.value          halui.max-velocity.value