update

petmakris · Jan 26, 2024 · 53d0a9c · 53d0a9c
1 parent e02810e
commit 53d0a9c
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 55 deletions.
diff --git a/config/hal/12-panel-feed-override.hal b/config/hal/12-panel-feed-override.hal
@@ -0,0 +1,21 @@
+addf feed-pot.lowpass           servo-thread
+setp feed-pot.lowpass.gain      0.05
+
+addf feed-pot.scale             servo-thread
+addf feed-pot.conv              servo-thread
+
+setp feed-pot.scale.gain        50
+setp feed-pot.scale.offset      0
+
+
+setp halui.feed-override.scale          0.01
+setp halui.feed-override.direct-value   true
+setp halui.feed-override.count-enable   true
+
+
+net panel.feed-override.analog-in           <= hm2_7i97.0.7i84.0.0.analogin0        => feed-pot.lowpass.in
+net panel.feed-override.filtered            <= feed-pot.lowpass.out                 => feed-pot.scale.in
+net panel.feed-override.scaled              <= 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
+
diff --git a/config/hal/12-panel-jog-speed.hal b/config/hal/12-panel-jog-speed.hal
@@ -0,0 +1,7 @@
+addf jog-pot.scale                  servo-thread
+
+# setp jog-pot.scale.gain           20
+# setp jog-pot.scale.offset         0
+
+# net panel.jog-speed               pyvcp.jog-speed
+# net ssia-02-jog-speed             hm2_7i97.0.7i84.0.0.analogin2
diff --git a/config/hal/12-panel-spindle-speed.hal b/config/hal/12-panel-spindle-speed.hal
@@ -0,0 +1,13 @@
+addf spindle-pot.scale          servo-thread
+
+# setp spindle-pot.scale.gain     20
+# setp spindle-pot.scale.offset   0
+
+# net ssia-01-spindle-speed        hm2_7i97.0.7i84.0.0.analogin1
+
+# net pot-0-jog-speed-in           hm2_7i97.0.7i84.0.0.analogin0   => scale.pot.0.in
+# net pot-0-jog-speed-out          scale.pot.0.in                  => halui.axis.jog-speed
+
+# net panel.spindle-speed           pyvcp.spindle-speed
+
+
diff --git a/config/hal/12-panel.hal b/config/hal/12-panel.hal
diff --git a/config/maho.ini b/config/maho.ini
@@ -52,7 +52,9 @@ HALFILE = hal/7-lube.hal
 HALFILE = hal/9-tool-change.hal
 HALFILE = hal/10-coolant.hal
 HALFILE = hal/11-sserial.hal
-HALFILE = hal/12-panel.hal
+HALFILE = hal/12-panel-feed-override.hal
+HALFILE = hal/12-panel-jog-speed.hal
+HALFILE = hal/12-panel-spindle-speeed.hal
 HALFILE = hal/13-spindle.hal
 HALFILE = hal/20-xhc-whb04b-6.hal
 HALFILE = hal/21-xhc-whb04b-6-axis-x.hal