Skip to content

Commit 55aafbc

Browse files
c-morleyc-morley
committed
Merge branch '2.9'
2 parents 98cf176 + 2332bb1 commit 55aafbc

36 files changed

Lines changed: 1896 additions & 702 deletions

‎configs/sim/qtdragon/qtdragon_multi_joint/qtdragon_postgui.hal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ net tool-change hal_manualtoolchange.change <= iocontrol.0.tool-change
1010
net tool-changed hal_manualtoolchange.changed <= iocontrol.0.tool-changed
1111
net tool-prep-number hal_manualtoolchange.number <= iocontrol.0.tool-prep-number
1212

13-
# external offset stuff
13+
# external offset spindle auto raise on pause
14+
net spindle-pause qtdragon.spindle-inhibit spindle.0.inhibit
1415
net eoffset_clear qtdragon.eoffset-clear => axis.z.eoffset-clear
15-
net eoffset_count qtdragon.eoffset-count => axis.z.eoffset-counts
16+
net eoffset_count qtdragon.eoffset-spindle-count => axis.z.eoffset-counts
1617
net eoffset qtdragon.eoffset-value <= axis.z.eoffset
17-
#net limited qtdragon.led-limits-tripped <= motion.eoffset-limited
1818
setp axis.z.eoffset-enable 1
1919
setp axis.z.eoffset-scale 1.0
2020

‎configs/sim/qtdragon/qtdragon_tool_probe/qtdragon_postgui.hal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ net tool-change hal_manualtoolchange.change <= iocontrol.0.tool-change
1010
net tool-changed hal_manualtoolchange.changed <= iocontrol.0.tool-changed
1111
net tool-prep-number hal_manualtoolchange.number <= iocontrol.0.tool-prep-number
1212

13-
# external offset stuff
13+
# external offset spindle auto raise on pause
14+
net spindle-pause qtdragon.spindle-inhibit spindle.0.inhibit
1415
net eoffset_clear qtdragon.eoffset-clear => axis.z.eoffset-clear
15-
net eoffset_count qtdragon.eoffset-count => axis.z.eoffset-counts
16+
net eoffset_count qtdragon.eoffset-spindle-count => axis.z.eoffset-counts
1617
net eoffset qtdragon.eoffset-value <= axis.z.eoffset
17-
#net limited qtdragon.led-limits-tripped <= motion.eoffset-limited
1818
setp axis.z.eoffset-enable 1
1919
setp axis.z.eoffset-scale 1.0
2020

‎configs/sim/qtdragon/qtdragon_xyz/qtdragon_postgui.hal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ net tool-change hal_manualtoolchange.change <= iocontrol.0.tool-change
1010
net tool-changed hal_manualtoolchange.changed <= iocontrol.0.tool-changed
1111
net tool-prep-number hal_manualtoolchange.number <= iocontrol.0.tool-prep-number
1212

13-
# external offset stuff
13+
# external offset spindle auto raise on pause
14+
net spindle-pause qtdragon.spindle-inhibit spindle.0.inhibit
1415
net eoffset_clear qtdragon.eoffset-clear => axis.z.eoffset-clear
15-
net eoffset_count qtdragon.eoffset-count => axis.z.eoffset-counts
16+
net eoffset_count qtdragon.eoffset-spindle-count => axis.z.eoffset-counts
1617
net eoffset qtdragon.eoffset-value <= axis.z.eoffset
17-
#net limited qtdragon.led-limits-tripped <= motion.eoffset-limited
1818
setp axis.z.eoffset-enable 1
1919
setp axis.z.eoffset-scale 1.0
2020

‎configs/sim/qtdragon_hd/qtdragon_hd_xyz/qtdragon_hd_postgui.hal‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@ net eoffset-clear axis.z.eoffset-clear
3232
net eoffset-counts axis.z.eoffset-counts
3333
setp axis.z.eoffset-scale .001
3434
net eoffset-total axis.z.eoffset
35+
net eoffset-total qtdragon.eoffset-value
3536
setp axis.z.eoffset-enable True
3637

3738
## external offsets for spindle pause function
3839
##################################################
39-
#net eoffset-clear qtdragon.eoffset-clear
40+
net eoffset-clear qtdragon.eoffset-clear
4041
net eoffset-spindle-count <= qtdragon.eoffset-spindle-count
42+
net spindle-pause qtdragon.spindle-inhibit spindle.0.inhibit
4143

4244
## Z level compensation
4345
####################################################
@@ -49,7 +51,7 @@ net z_compensation_on z_level_compensation.enable-in <= qtdragon.comp-on
4951
net eoffset-zlevel-count z_level_compensation.counts => qtdragon.eoffset-zlevel-count
5052

5153
net eoffset-spindle-count scaled-s32-sums.0.in0
52-
net eoffset-zlevel-count scaled-s32-sums.0.in1 qtdragon.eoffset-value
54+
net eoffset-zlevel-count scaled-s32-sums.0.in1
5355
setp scaled-s32-sums.0.scale0 1000
5456
net eoffset-counts scaled-s32-sums.0.out-s
5557

‎configs/sim/qtdragon_hd/qtdragon_hd_z_compensation/README‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
QtDragonHD sample configs
2+
3+
Fantastic large screen for mills/routers designed by forum personality Persei.
4+
Optional choice of basic or versa probe screens.
5+
Optional laser sight control
6+
Optional toolplate Z setting
7+
Optional auto lift spindle at pause
8+
bolt circle and basic facing wizards
9+
10+
Demo of z level compensation using probed_points file.
11+
Probed point is made with included gcode ripper.
12+

‎configs/sim/qtdragon_hd/qtdragon_hd_z_compensation/on_abort.ngc‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
o<on_abort> sub
2+
3+
4+
o100 if [#1 eq 5]
5+
(machine on)
6+
o100 elseif [#1 eq 6]
7+
(machine off)
8+
o100 elseif [#1 eq 7]
9+
(estopped)
10+
o100 elseif [#1 eq 8]
11+
(msg,Process Aborted)
12+
o100 else
13+
(DEBUG,Abort Parameter is %d[#1])
14+
o100 endif
15+
16+
o<on_abort> endsub
17+
m2
18+
19+
These are potential abort number:
20+
21+
EMC_ABORT_TASK_EXEC_ERROR = 1,
22+
EMC_ABORT_AUX_ESTOP = 2,
23+
EMC_ABORT_MOTION_OR_IO_RCS_ERROR = 3,
24+
EMC_ABORT_TASK_STATE_OFF = 4,
25+
EMC_ABORT_TASK_STATE_ESTOP_RESET = 5,
26+
EMC_ABORT_TASK_STATE_ESTOP = 6,
27+
EMC_ABORT_TASK_STATE_NOT_ON = 7,
28+
EMC_ABORT_TASK_ABORT = 8,
29+
EMC_ABORT_INTERPRETER_ERROR = 9, // interpreter failed during readahead
30+
EMC_ABORT_INTERPRETER_ERROR_MDI = 10, // interpreter failed during MDI execution
31+
EMC_ABORT_USER = 100 // user-defined abort codes start here

‎configs/sim/qtdragon_hd/qtdragon_hd_z_compensation/probe_points.txt‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
-50.000000 -50.000000 -0.032200 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
2+
-25.000000 -50.000000 -0.008866 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
3+
0.000000 -50.000000 0.011133 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
4+
25.000000 -50.000000 0.037800 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
5+
50.000000 -50.000000 0.041133 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
6+
-50.000000 -25.000000 -0.028867 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
7+
-25.000000 -25.000000 -0.002200 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
8+
0.000000 -25.000000 0.024467 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
9+
25.000000 -25.000000 0.054467 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
10+
50.000000 -25.000000 0.044467 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
11+
-50.000000 0.000000 -0.045533 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
12+
-25.000000 0.000000 -0.012200 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
13+
-0.000000 0.000000 0.021133 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
14+
25.000000 0.000000 0.044467 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
15+
50.000000 0.000000 0.034467 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
16+
-50.000000 25.000000 -0.055533 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
17+
-25.000000 25.000000 -0.025533 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
18+
0.000000 25.000000 0.007800 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
19+
25.000000 25.000000 0.034467 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
20+
50.000000 25.000000 0.041134 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
21+
-50.000000 50.000000 -0.068867 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
22+
-25.000000 50.000000 -0.038866 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
23+
0.000000 50.000000 -0.008866 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
24+
25.000000 50.000000 0.027800 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000
25+
50.000000 50.000000 0.031133 0.000000 0.000000 0.000000 0.000000 0.000000 0.000000

‎configs/sim/qtdragon_hd/qtdragon_hd_z_compensation/qtdragon_hd_postgui.hal‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# load components
2+
########################################################################
3+
4+
loadrt logic names=logic-and personality=0x102
5+
addf logic-and servo-thread
6+
7+
# load a summing compnent for adding spindle lift and Z compensation
8+
loadrt scaled_s32_sums
9+
addf scaled-s32-sums.0 servo-thread
10+
11+
loadusr -Wn z_level_compensation z_level_compensation
12+
# method parameter must be one of nearest(2), linear(1), cubic (0)
13+
setp z_level_compensation.fade-height 0.0
14+
setp z_level_compensation.method 1
15+
16+
# connect signals
17+
########################################################################
18+
19+
net spindle-speed-limited => spindle.0.speed-out-rps => spindle.0.speed-in
20+
21+
# the unlink pin commands are only used, because they are connected
22+
# in core_sim.hal and we use this file to simulate
23+
unlinkp iocontrol.0.tool-change
24+
unlinkp iocontrol.0.tool-changed
25+
unlinkp iocontrol.0.tool-prep-number
26+
27+
net tool-change hal_manualtoolchange.change <= iocontrol.0.tool-change
28+
net tool-changed hal_manualtoolchange.changed <= iocontrol.0.tool-changed
29+
net tool-prep-number hal_manualtoolchange.number <= iocontrol.0.tool-prep-number
30+
31+
net eoffset-clear axis.z.eoffset-clear
32+
net eoffset-counts axis.z.eoffset-counts
33+
setp axis.z.eoffset-scale .001
34+
net eoffset-total axis.z.eoffset
35+
net eoffset-total qtdragon.eoffset-value
36+
setp axis.z.eoffset-enable True
37+
38+
## external offsets for spindle pause function
39+
##################################################
40+
net eoffset-clear qtdragon.eoffset-clear
41+
net eoffset-spindle-count <= qtdragon.eoffset-spindle-count
42+
net spindle-pause qtdragon.spindle-inhibit spindle.0.inhibit
43+
44+
## Z level compensation
45+
####################################################
46+
net eoffset-clr2 z_level_compensation.clear => logic-and.in-01
47+
net xpos-cmd z_level_compensation.x-pos <= axis.x.pos-cmd
48+
net ypos-cmd z_level_compensation.y-pos <= axis.y.pos-cmd
49+
net zpos-cmd z_level_compensation.z-pos <= axis.z.pos-cmd
50+
net z_compensation_on z_level_compensation.enable-in <= qtdragon.comp-on
51+
net eoffset-zlevel-count z_level_compensation.counts => qtdragon.eoffset-zlevel-count
52+
53+
net eoffset-spindle-count scaled-s32-sums.0.in0
54+
net eoffset-zlevel-count scaled-s32-sums.0.in1
55+
setp scaled-s32-sums.0.scale0 1000
56+
net eoffset-counts scaled-s32-sums.0.out-s
57+

0 commit comments

Comments
 (0)