Skip to content

Commit a94eb24

Browse files
pcw-mesapcw-mesa
committed
Merge branch 'master' of ssh://github.com/linuxcnc/linuxcnc
2 parents 0af2f08 + 464c0c3 commit a94eb24

216 files changed

Lines changed: 9018 additions & 5826 deletions

File tree

Some content is hidden

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

‎configs/sim/axis/anglejog/anglejog.halshow‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
pin+anglejog.enable-in
2+
pin+anglejog.enable-out
3+
pin+anglejog.active
4+
pin+anglejog.scale-in
5+
pin+anglejog.current-scale
6+
pin+anglejog.current-scale-out
7+
pin+anglejog.angle-degrees-in
8+
pin+anglejog.current-angle-degrees
9+
pin+anglejog.counts-in
10+
pin+anglejog.coscounts
11+
pin+anglejog.sincounts
12+
pin+anglejog.cos-accel-fraction
13+
pin+anglejog.sin-accel-fraction
14+
pin+anglejog.current-mag
15+
pin+anglejog.current-vel

‎configs/sim/axis/anglejog/anglejog.ini‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
[EMC]
2+
VERSION = 1.1
3+
MACHINE = LATHE-Anglejog
4+
5+
[DISPLAY]
6+
OPEN_FILE = ''
7+
DISPLAY = axis
8+
PYVCP = anglejog.xml
9+
LATHE = 1
10+
CYCLE_TIME = 0.100
11+
POSITION_OFFSET = RELATIVE
12+
POSITION_FEEDBACK = ACTUAL
13+
MAX_FEED_OVERRIDE = 1.2
14+
MAX_SPINDLE_OVERRIDE = 1.0
15+
PROGRAM_PREFIX = .
16+
INTRO_GRAPHIC = linuxcnc.gif
17+
INTRO_TIME = 5
18+
19+
[RS274NGC]
20+
PARAMETER_FILE = anglejog.var
21+
22+
[EMCMOT]
23+
EMCMOT = motmod
24+
COMM_TIMEOUT = 1.0
25+
BASE_PERIOD = 100000
26+
SERVO_PERIOD = 1000000
27+
28+
[TASK]
29+
TASK = milltask
30+
CYCLE_TIME = 0.001
31+
32+
[HAL]
33+
HALUI = halui
34+
HALFILE = LIB:basic_sim.tcl -no_sim_spindle -no_use_hal_manualtoolchange
35+
# all provisions for anglejog:
36+
POSTGUI_HALFILE = anglejog_postgui.hal
37+
38+
[TRAJ]
39+
NO_FORCE_HOMING = 1
40+
COORDINATES = X Z
41+
LINEAR_UNITS = inch
42+
ANGULAR_UNITS = degree
43+
DEFAULT_LINEAR_VELOCITY = 1.0
44+
DEFAULT_LINEAR_ACCELERATION = 10.0
45+
MAX_LINEAR_VELOCITY = 10.0
46+
MAX_LINEAR_ACCELERATION = 100.0
47+
48+
[EMCIO]
49+
EMCIO = io
50+
CYCLE_TIME = 0.100
51+
TOOL_TABLE = anglejog.tbl
52+
53+
[KINS]
54+
KINEMATICS = trivkins coordinates=xz
55+
JOINTS = 2
56+
57+
# Note: immediate joint homing
58+
[JOINT_0]
59+
MIN_LIMIT = -10.0
60+
MAX_LIMIT = 10.0
61+
MAX_VELOCITY = 1.0
62+
MAX_ACCELERATION = 10.0
63+
HOME_SEQUENCE = 0
64+
65+
[JOINT_1]
66+
MIN_LIMIT = -2.0
67+
MAX_LIMIT = 4.0
68+
MAX_VELOCITY = 1.0
69+
MAX_ACCELERATION = 10.0
70+
HOME_SEQUENCE = 0
71+
72+
[AXIS_X]
73+
MIN_LIMIT = -10.0
74+
MAX_LIMIT = 10.0
75+
MAX_VELOCITY = 1.0
76+
MAX_ACCELERATION = 10.0
77+
78+
[AXIS_Z]
79+
MIN_LIMIT = -2.0
80+
MAX_LIMIT = 4.0
81+
MAX_VELOCITY = 1.0
82+
MAX_ACCELERATION = 10.0

‎configs/sim/axis/anglejog/anglejog.txt‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
anglejog -- demonstrate jogging at an
2+
angle for a lathe (xz) configuration.
3+
4+
Usage:
5+
6+
1) F1 (Estop Off)
7+
2) F2 (Machine On)
8+
3) Ctrl-HOME (Home All)
9+
4) pyvcp panel: Set to Enable
10+
5) pyvcp panel: change MPG counts
11+
and note jogging at current angle
12+
6) pyvcp panel: Set to Disable
13+
7) pyvcp panel: alter Angle or Scale
14+
8) repeat from 4)

‎configs/sim/axis/anglejog/anglejog.xml‎

Lines changed: 203 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,203 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<pyvcp>
3+
4+
<vbox>
5+
<relief>"sunken"</relief>
6+
<bd>3</bd>
7+
<label>
8+
<text>"ANGLE JOG"</text>
9+
<anchor>"w"</anchor>
10+
</label>
11+
<label>
12+
<bg>"black"</bg>
13+
<fg>"gold"</fg>
14+
<font>"bold"</font>
15+
<text>"NOTE:\nDisable required to change\nScale or Angle"</text>
16+
</label>
17+
<hbox>
18+
<checkbutton>
19+
<halpin>"enable"</halpin>
20+
<text>""</text>
21+
<initval>0</initval>
22+
</checkbutton>
23+
<label>
24+
<anchor>"w"</anchor>
25+
<text>"Enable/Disable"</text>
26+
</label>
27+
</hbox>
28+
29+
<hbox>
30+
<led>
31+
<halpin>"enabled"</halpin>
32+
<on_color>"light green"</on_color>
33+
<off_color>"#d9d9d9"</off_color>
34+
</led>
35+
<label>
36+
<text>" Enabled"</text>
37+
<anchor>"w"</anchor>
38+
</label>
39+
</hbox>
40+
<hbox>
41+
<led>
42+
<halpin>"active"</halpin>
43+
<on_color>"blue"</on_color>
44+
<off_color>"#d9d9d9"</off_color>
45+
</led>
46+
<label>
47+
<text>" active"</text>
48+
<anchor>"w"</anchor>
49+
</label>
50+
</hbox>
51+
<hbox>
52+
<spinbox>
53+
<halpin>"max-vel"</halpin>
54+
<width>10</width>
55+
<initval>1.0</initval>
56+
<resolution>.1</resolution>
57+
<format>"10.1f"</format>
58+
<font>"bold"</font>
59+
<param_pin>1</param_pin>
60+
</spinbox>
61+
<label>
62+
<anchor>"w"</anchor>
63+
<text>"Max vel"</text>
64+
<font>"bold"</font>
65+
</label>
66+
</hbox>
67+
<hbox>
68+
<spinbox>
69+
<halpin>"max-accel"</halpin>
70+
<width>10</width>
71+
<initval>10.0</initval>
72+
<resolution>.1</resolution>
73+
<format>"10.1f"</format>
74+
<font>"bold"</font>
75+
<param_pin>1</param_pin>
76+
</spinbox>
77+
<label>
78+
<anchor>"w"</anchor>
79+
<text>"Max accel"</text>
80+
<font>"bold"</font>
81+
</label>
82+
</hbox>
83+
84+
<hbox>
85+
<spinbox>
86+
<halpin>"accel-fraction"</halpin>
87+
<width>10</width>
88+
<initval>1.0</initval>
89+
<resolution>.1</resolution>
90+
<format>"10.1f"</format>
91+
<font>"bold"</font>
92+
<param_pin>1</param_pin>
93+
</spinbox>
94+
<label>
95+
<anchor>"w"</anchor>
96+
<text>"Accel fraction"</text>
97+
<font>"bold"</font>
98+
</label>
99+
</hbox>
100+
101+
<hbox>
102+
<spinbox>
103+
<halpin>"scale-in"</halpin>
104+
<width>10</width>
105+
<initval>0.001</initval>
106+
<resolution>0.001</resolution>
107+
<format>"10.4f"</format>
108+
<font>"bold"</font>
109+
<max_>0.1</max_>
110+
<min_>0.0001</min_>
111+
<param_pin>1</param_pin>
112+
</spinbox>
113+
<label>
114+
<anchor>"w"</anchor>
115+
<text>"Scale"</text>
116+
<font>"bold"</font>
117+
</label>
118+
</hbox>
119+
<hbox>
120+
<number>
121+
<halpin>"current-scale"</halpin>
122+
<format>"10.8f"</format>
123+
<width>"13"</width>
124+
<bg>"black"</bg>
125+
<fg>"cyan"</fg>
126+
</number>
127+
<label>
128+
<text>"current-scale"</text>
129+
<anchor>"w"</anchor>
130+
</label>
131+
</hbox>
132+
<hbox>
133+
<number>
134+
<halpin>"current-scale-out"</halpin>
135+
<format>"10.8f"</format>
136+
<width>"13"</width>
137+
<bg>"black"</bg>
138+
<fg>"cyan"</fg>
139+
</number>
140+
<label>
141+
<text>"current-scale-out"</text>
142+
<anchor>"w"</anchor>
143+
</label>
144+
</hbox>
145+
<hbox>
146+
<spinbox>
147+
<halpin>"angle-degrees"</halpin>
148+
<min_>-90.0</min_>
149+
<max_>90.0</max_>
150+
<width>10</width>
151+
<initval>30</initval>
152+
<resolution>5</resolution>
153+
<format>"10.1f"</format>
154+
<font>"bold"</font>
155+
<param_pin>1</param_pin>
156+
</spinbox>
157+
<label>
158+
<anchor>"w"</anchor>
159+
<text>"Angle"</text>
160+
<font>"bold"</font>
161+
</label>
162+
</hbox>
163+
<hbox>
164+
<number>
165+
<halpin>"current-angle-degrees"</halpin>
166+
<format>"10.3f"</format>
167+
<width>"13"</width>
168+
<bg>"black"</bg>
169+
<fg>"cyan"</fg>
170+
</number>
171+
<label>
172+
<text>"Current angle"</text>
173+
<anchor>"w"</anchor>
174+
</label>
175+
</hbox>
176+
<hbox>
177+
<scale>
178+
<width>"25"</width>
179+
<halpin>"mpg"</halpin>
180+
<param_pin>1</param_pin>
181+
<resolution>1</resolution>
182+
<orient>HORIZONTAL</orient>
183+
<initval>0</initval>
184+
<min_>-500</min_>
185+
<max_> 500</max_>
186+
</scale>
187+
<label>
188+
<text>"MPG counts"</text>
189+
<anchor>"w"</anchor>
190+
</label>
191+
</hbox>
192+
193+
<vbox>
194+
<button>
195+
<halpin>"mpgreset"</halpin>
196+
<text>"MPG Reset"</text>
197+
<bd>4</bd>
198+
<justify>"center"</justify>
199+
</button>
200+
</vbox>
201+
202+
</vbox>
203+
</pyvcp>

0 commit comments

Comments
 (0)