Skip to content
This repository was archived by the owner on Jul 15, 2023. It is now read-only.

Updated LinuxCNC 2.8 Support #13

Open
kiall wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Updated LinuxCNC 2.8 Support #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d9ad56e
Update stdglue to LinuxCNC's 2.8.0 version
kiall Nov 21, 2020
04c54d9
Replace Axis numbers with letters
kiall Nov 21, 2020
7ee4285
Ensure methods which change the command mode restore it once done
kiall Nov 21, 2020
27c9d6e
Cosmtic - Fix net directions
kiall Nov 21, 2020
81ee5f3
Add *.pyc to .gitignore
kiall Nov 21, 2020
2c6c5a1
Update Jog commands for 2.8
kiall Nov 21, 2020
20aa9b6
Fix tool changing
kiall Nov 21, 2020
bf60973
Add missing gtkbutton arguments
kiall Nov 21, 2020
b422bff
No need to return to change position after tool change measuement
kiall Nov 21, 2020
67ce46f
Swap FEATURES=30 for the 2.8 equivalent
kiall Nov 21, 2020
621a67c
Cosmtic - Fix net directions in duplicated 1024x768 probe_screen.hal
kiall Nov 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.pyc
2 changes: 1 addition & 1 deletion macros/block_down.ngc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ o<block_down> sub
(cancel all Z offsets)
G49
G92.1
G10 L20 P0 Z[#<_hal[axis.2.joint-pos-cmd]>]
G10 L20 P0 Z[#<_hal[axis.z.pos-cmd]>]

G91
F #<_hal[probe.ps_searchvel]>
Expand Down
2 changes: 1 addition & 1 deletion macros/gotots.ngc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
o<gotots> sub
F#<_ini[TOOLSENSOR]RAPID_SPEED>
G53 G1 Z[#<_ini[AXIS_2]MAX_LIMIT>]
G53 G1 Z[#<_ini[AXIS_Z]MAX_LIMIT>]
G53 G1 X[#<_ini[TOOLSENSOR]X>] Y[#<_ini[TOOLSENSOR]Y>]
G53 G1 Z[#<_ini[TOOLSENSOR]Z>]

Expand Down
8 changes: 4 additions & 4 deletions macros/manual_change.ngc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ O100 return [999]
O100 endif

;first go up
G53 G0 Z[#<_ini[AXIS_2]MAX_LIMIT>-0.1]
G53 G0 Z[#<_ini[AXIS_Z]MAX_LIMIT>-0.1]
; then move to change position
G53 G0 X[#<_ini[CHANGE_POSITION]X>] Y[#<_ini[CHANGE_POSITION]Y>]
G53 G0 Z[#<_ini[CHANGE_POSITION]Z>]
Expand Down Expand Up @@ -46,10 +46,11 @@ O400 endif
F #<_hal[probe.ps_searchvel]>
G91
G38.2 Z #<_ini[TOOLSENSOR]MAXPROBE>
G0 Z0.26
G38.4 Z2
G0 Z0.5
Copy link
Author

@kiall kiall Nov 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This isn't strictly a 2.8 change - I found just lifting 0.26 up wasn't always enough, so instead I updated this to probe in the opposite direction, then go a little bit more again.

; This is commented out only for sim.
F #<_hal[probe.ps_probevel]>
G38.2 Z-0.5
G38.2 Z-3

O500 if [#5070 EQ 0]
G90
Expand All @@ -58,7 +59,6 @@ O500 endif

G90
G53 G0 Z[#<_ini[CHANGE_POSITION]Z>]
G53 G0 X[#<_ini[CHANGE_POSITION]X>] Y[#<_ini[CHANGE_POSITION]Y>]
Copy link
Author

@kiall kiall Nov 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, this wasn't strictly a 2.8 change - however there was no reason to return to the X/Y change position after a tool change that I could see.


#<touch_result> = #5063
#<probeheight> = #<_hal[probe.probeheight]>
Expand Down
4 changes: 2 additions & 2 deletions macros/probe_down.ngc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
o<probe_down> sub
F#<_ini[TOOLSENSOR]RAPID_SPEED>
G53 G1 Z[#<_ini[AXIS_2]MAX_LIMIT>-0.1]
G53 G1 Z[#<_ini[AXIS_Z]MAX_LIMIT>-0.1]
G53 G1 X[#<_ini[TOOLSENSOR]X>] Y[#<_ini[TOOLSENSOR]Y>]
G53 G1 Z[#<_ini[TOOLSENSOR]Z>]
(cancel all Z offsets)
G92.1
G49
G10 L20 P0 Z[#<_hal[axis.2.joint-pos-cmd]>]
G10 L20 P0 Z[#<_hal[axis.z.pos-cmd]>]

G91
F #<_hal[probe.ps_searchvel]>
Expand Down
6 changes: 3 additions & 3 deletions my-mill-postgui.hal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@


# The next two lines are only needed if the pins had been connected before
unlinkp iocontrol.0.tool-change
unlinkp iocontrol.0.tool-changed
#unlinkp iocontrol.0.tool-change
#unlinkp iocontrol.0.tool-changed
Copy link
Author

@kiall kiall Nov 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If users copy this file as is / as per the readme, we end up unlinking the connections made in probe_screen.hal. I haven't checked, but I suspect the ordering of when different things are loaded has changed in 2.8.


# link to auto tool measurement toolchange, so you get the advantage of tool description on change dialog

# this settings were moved to probe_screen.hal:
#net tool-change probe.toolchange-change <= iocontrol.0.tool-change
#net tool-changed probe.toolchange-changed <= iocontrol.0.tool-changed
#net tool-changed probe.toolchange-changed => iocontrol.0.tool-changed
#net tool-prep-number probe.toolchange-number <= iocontrol.0.tool-prep-number

net tool-prep-loop iocontrol.0.tool-prepare <= iocontrol.0.tool-prepared
4 changes: 3 additions & 1 deletion my-mill.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ Y = 10
Z = 60

[RS274NGC]
FEATURES=30
RETAIN_G43 = 0
INI_VARS = 1
HAL_PIN_VARS = 1
SUBROUTINE_PATH = macros
REMAP=M6 modalgroup=6 prolog=change_prolog ngc=manual_change epilog=change_epilog

Expand Down
2 changes: 1 addition & 1 deletion probe_icons/probe_screen.hal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
net tool-change probe.toolchange-change <= iocontrol.0.tool-change
net tool-changed probe.toolchange-changed <= iocontrol.0.tool-changed
net tool-changed probe.toolchange-changed => iocontrol.0.tool-changed
net tool-prep-number probe.toolchange-number <= iocontrol.0.tool-prep-number
2 changes: 1 addition & 1 deletion probe_icons_1024x768/probe_screen.hal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
net tool-change probe.toolchange-change <= iocontrol.0.tool-change
net tool-changed probe.toolchange-changed <= iocontrol.0.tool-changed
net tool-changed probe.toolchange-changed => iocontrol.0.tool-changed
net tool-prep-number probe.toolchange-number <= iocontrol.0.tool-prep-number
Loading