Skip to content

Commit 393d4b5

Browse files
author
Curtis Dutton
committed
Merge branch 'master' of https://github.com/LinuxCNC/linuxcnc 
2 parents 8d7690d + 388bb3e commit 393d4b5

File tree

134 files changed

+92000
-70880
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+92000
-70880
lines changed

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
[![Weblate](https://img.shields.io/badge/website-weblate.org-blue.svg)](https://weblate.org/) [![Translation Status of LinuxCNC](https://hosted.weblate.org/widgets/linuxcnc/-/svg-badge.svg)](https://hosted.weblate.org/engage/linuxcnc/)
2+
13
# LinuxCNC
24

35
LinuxCNC controls CNC machines. It can drive milling machines, lathes, 3D printers, laser cutters, plasma cutters, robot arms, hexapods, and more. https://linuxcnc.org/

‎configs/by_machine/qtplasmac/qtplasmac_imperial_ini.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ ESTOP_TYPE = 0
1010
# estop is a button
1111
#ESTOP_TYPE = 2
1212

13-
CAMERA_TOUCHOFF = 1.0 0
14-
LASER_TOUCHOFF = -1 0
13+
CAMERA_TOUCHOFF = X1.0 Y0
14+
LASER_TOUCHOFF = X-1 Y0
1515

1616
# user buttons in the main window
1717
BUTTON_1_NAME = OHMIC\TEST

‎configs/by_machine/qtplasmac/qtplasmac_metric_ini.inc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ ESTOP_TYPE = 0
1010
# estop is a button
1111
#ESTOP_TYPE = 2
1212

13-
CAMERA_TOUCHOFF = 25 0
14-
LASER_TOUCHOFF = -25 0
13+
CAMERA_TOUCHOFF = X25 Y0
14+
LASER_TOUCHOFF = X-25 Y0
1515

1616
# user buttons in the main window
1717
BUTTON_1_NAME = OHMIC\TEST

‎configs/sim/axis/db_demo/README‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,41 @@ tool 10 in pocket 11
99
tool 11 in pocket 12
1010
...
1111

12+
Usage (for db_nonran.ini):
13+
14+
1) In a terminal, start as
15+
$ linuxcnc db_nonran.ini
16+
F1 --------- Estop off
17+
F2 --------- Machine On
18+
Ctrl-Home -- Home All
19+
R ---------- Run program
20+
21+
You can also experiment with MDI for the releveant
22+
commands (TnM6, T0M6, G10L0, G10L1, G10L10, M61)
23+
24+
The default program runs a loop that a) loads tool
25+
T10 and applies its offset (G43), b) displays the
26+
zoffset, c) pauses, d) unloads the tool, e)
27+
reloads the tool data.
28+
29+
The display will show different zoffsets at each
30+
tool change since the tool data includes several
31+
tools with the same diameter but different
32+
zoffsets and the applied database rule selects the
33+
tool with the minimun time usage. Since the pause
34+
time is nominally the same for each tool offered,
35+
the database will select different tools for T10
36+
with each reload.
37+
38+
To watch the tool data changes and tool usage time
39+
accrual, use the following command in a separate
40+
terminal (source if rip_environment for RIP
41+
builds):
42+
43+
$ watch -n 0.2 cat /tmp/db_nonran_file
44+
45+
The M parameter in the /tmp/db_nonran_file
46+
accounts for tool time measured in minutes
1247

1348
To get more information (stdout):
1449

‎configs/sim/axis/db_demo/base.ngc‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,14 @@
1-
#<toolno> = 12
2-
; demo file using tool from database
3-
4-
t#<toolno> (debug,tool:#<toolno>: zoffset=#5403)
5-
g4p1 ;dwell
6-
7-
m6 (debug,m6 zoffset=#5403)
8-
g4p1 ;dwell
9-
10-
g43 (debug,g43 zoffset=#5403)
11-
g4p1 ;dwell
12-
13-
g43h12 (debug,g43h12 zoffset=#5403)
14-
15-
g0x0y0
16-
g1f1000 x1
17-
g1f1000 y1
18-
g0x0y0
19-
20-
g49 (debug,g49 zoffset=#5403)
21-
t0
22-
m6
23-
m2
1+
%
2+
#<toolno> = 10
3+
#<ct> = 0
4+
#<howmany> = 5
5+
6+
o100 while [[#<ct> lt #<howmany>] and [#<_task> ne 0]]
7+
#<ct> = [#<ct> +1]
8+
t#<toolno> m6 g43
9+
(debug,ct=#<ct> zoff=#5403)
10+
g4p[0.05*60] ;approx 0.05 minutes
11+
t0m6
12+
g10l0 ; reload tooldata (apply_db_rules)
13+
o100 endwhile
14+
%

0 commit comments

Comments
 (0)