Skip to content

Commit 3977272

Browse files
hansuhansu
committed
Merge branch '2.8' into 'master'
2 parents 6f7d085 + 5f04670 commit 3977272

75 files changed

Lines changed: 17516 additions & 0 deletions

Some content is hidden

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

‎configs/sim/craftsman/ConfigParser_New.py‎

Lines changed: 668 additions & 0 deletions
Large diffs are not rendered by default.

‎configs/sim/craftsman/README‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
A GUI for a CNC router written from scratch in Glade and Python.
2+
3+
More details here:
4+
https://forum.linuxcnc.org/41-guis/27232-my-custom-designed-gui?start=0#41196
5+
6+
Use the "craftsmancnc" entry to start the config.
7+

‎configs/sim/craftsman/cm_axis_panel.glade‎

Lines changed: 354 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,354 @@
1+
<?xml version="1.0"?>
2+
<interface>
3+
<requires lib="gtk+" version="2.16"/>
4+
<!-- interface-requires gladevcp 0.0 -->
5+
<!-- interface-naming-policy project-wide -->
6+
<object class="GtkWindow" id="window1">
7+
<property name="width_request">200</property>
8+
<child>
9+
<object class="HAL_HBox" id="hal_hbox1">
10+
<property name="visible">True</property>
11+
<child>
12+
<object class="GtkVBox" id="vbox1">
13+
<property name="visible">True</property>
14+
<property name="spacing">1</property>
15+
<child>
16+
<object class="GtkHBox" id="hbox1">
17+
<property name="visible">True</property>
18+
<child>
19+
<object class="HAL_Button" id="hal_button1">
20+
<property name="label" translatable="yes">Zero X</property>
21+
<property name="visible">True</property>
22+
<property name="can_focus">True</property>
23+
<property name="receives_default">True</property>
24+
<signal name="clicked" handler="zero_x"/>
25+
</object>
26+
<packing>
27+
<property name="position">0</property>
28+
</packing>
29+
</child>
30+
<child>
31+
<object class="HAL_Button" id="hal_button12">
32+
<property name="label" translatable="yes">Zero Y</property>
33+
<property name="visible">True</property>
34+
<property name="can_focus">True</property>
35+
<property name="receives_default">True</property>
36+
<signal name="clicked" handler="zero_y"/>
37+
</object>
38+
<packing>
39+
<property name="position">1</property>
40+
</packing>
41+
</child>
42+
<child>
43+
<object class="HAL_Button" id="hal_button13">
44+
<property name="label" translatable="yes">Zero Z</property>
45+
<property name="visible">True</property>
46+
<property name="can_focus">True</property>
47+
<property name="receives_default">True</property>
48+
<signal name="clicked" handler="zero_z"/>
49+
</object>
50+
<packing>
51+
<property name="position">2</property>
52+
</packing>
53+
</child>
54+
<child>
55+
<object class="HAL_Button" id="hal_button14">
56+
<property name="label" translatable="yes">Zero A</property>
57+
<property name="visible">True</property>
58+
<property name="can_focus">True</property>
59+
<property name="receives_default">True</property>
60+
<signal name="clicked" handler="zero_a"/>
61+
</object>
62+
<packing>
63+
<property name="position">3</property>
64+
</packing>
65+
</child>
66+
</object>
67+
<packing>
68+
<property name="position">0</property>
69+
</packing>
70+
</child>
71+
<child>
72+
<object class="HAL_HBox" id="hal_hbox2">
73+
<property name="visible">True</property>
74+
<child>
75+
<placeholder/>
76+
</child>
77+
<child>
78+
<placeholder/>
79+
</child>
80+
<child>
81+
<placeholder/>
82+
</child>
83+
<child>
84+
<placeholder/>
85+
</child>
86+
</object>
87+
<packing>
88+
<property name="position">1</property>
89+
</packing>
90+
</child>
91+
<child>
92+
<object class="HAL_Button" id="hal_button2">
93+
<property name="label" translatable="yes">Touch Z</property>
94+
<property name="visible">True</property>
95+
<property name="can_focus">True</property>
96+
<property name="receives_default">True</property>
97+
<signal name="clicked" handler="touch_z"/>
98+
</object>
99+
<packing>
100+
<property name="position">2</property>
101+
</packing>
102+
</child>
103+
<child>
104+
<object class="HAL_Button" id="hal_button3">
105+
<property name="label" translatable="yes"> Home
106+
X - Y - Z</property>
107+
<property name="visible">True</property>
108+
<property name="can_focus">True</property>
109+
<property name="receives_default">True</property>
110+
<signal name="clicked" handler="home_all"/>
111+
</object>
112+
<packing>
113+
<property name="position">3</property>
114+
</packing>
115+
</child>
116+
<child>
117+
<object class="HAL_Button" id="hal_button4">
118+
<property name="label" translatable="yes">Home X</property>
119+
<property name="visible">True</property>
120+
<property name="can_focus">True</property>
121+
<property name="receives_default">True</property>
122+
<signal name="clicked" handler="home_x"/>
123+
</object>
124+
<packing>
125+
<property name="position">4</property>
126+
</packing>
127+
</child>
128+
<child>
129+
<object class="HAL_Button" id="hal_button5">
130+
<property name="label" translatable="yes">Home Y</property>
131+
<property name="visible">True</property>
132+
<property name="can_focus">True</property>
133+
<property name="receives_default">True</property>
134+
<signal name="clicked" handler="home_y"/>
135+
</object>
136+
<packing>
137+
<property name="position">5</property>
138+
</packing>
139+
</child>
140+
<child>
141+
<object class="HAL_Button" id="hal_button6">
142+
<property name="label" translatable="yes">Home Z</property>
143+
<property name="visible">True</property>
144+
<property name="can_focus">True</property>
145+
<property name="receives_default">True</property>
146+
<signal name="clicked" handler="home_z"/>
147+
</object>
148+
<packing>
149+
<property name="position">6</property>
150+
</packing>
151+
</child>
152+
<child>
153+
<object class="GtkHSeparator" id="hseparator1">
154+
<property name="visible">True</property>
155+
</object>
156+
<packing>
157+
<property name="expand">False</property>
158+
<property name="position">7</property>
159+
</packing>
160+
</child>
161+
<child>
162+
<object class="GtkHBox" id="hbox5">
163+
<property name="visible">True</property>
164+
<child>
165+
<object class="HAL_LED" id="tool_changing">
166+
<property name="width_request">25</property>
167+
<property name="visible">True</property>
168+
<property name="pick_color_off">#d3d3d3d3d3d3</property>
169+
<property name="pick_color_on">#ffffffff0000</property>
170+
<property name="led_blink_rate">500</property>
171+
<property name="on_color">yellow</property>
172+
</object>
173+
<packing>
174+
<property name="position">0</property>
175+
</packing>
176+
</child>
177+
<child>
178+
<object class="GtkLabel" id="label1">
179+
<property name="visible">True</property>
180+
<property name="label" translatable="yes">Tool no:</property>
181+
</object>
182+
<packing>
183+
<property name="position">1</property>
184+
</packing>
185+
</child>
186+
<child>
187+
<object class="HAL_Label" id="tool_number">
188+
<property name="width_request">6</property>
189+
<property name="visible">True</property>
190+
<property name="label" translatable="yes">Tool number</property>
191+
<signal name="hal_pin_changed" handler="tool_number_hal_pin_changed_cb"/>
192+
</object>
193+
<packing>
194+
<property name="position">2</property>
195+
</packing>
196+
</child>
197+
<child>
198+
<object class="HAL_Label" id="tool_prep">
199+
<property name="label" translatable="yes">label</property>
200+
<!--property name="visible">True</property-->
201+
<signal name="hal_pin_changed" handler="tool_number_prep"/>
202+
</object>
203+
<packing>
204+
<property name="position">3</property>
205+
</packing>
206+
</child>
207+
208+
</object>
209+
<packing>
210+
<property name="position">8</property>
211+
</packing>
212+
</child>
213+
<child>
214+
<object class="GtkLabel" id="tool_desc">
215+
<property name="visible">True</property>
216+
<property name="label" translatable="yes">No tool loaded</property>
217+
</object>
218+
<packing>
219+
<property name="position">9</property>
220+
</packing>
221+
</child>
222+
223+
<child>
224+
<object class="HAL_Button" id="hal_run_tc">
225+
<property name="label" translatable="yes">Start after tool change</property>
226+
<property name="visible">True</property>
227+
<property name="can_focus">True</property>
228+
<property name="active">False</property>
229+
<property name="receives_default">True</property>
230+
<signal name="clicked" handler="start_after_tool_change"/>
231+
</object>
232+
<packing>
233+
<property name="position">10</property>
234+
</packing>
235+
</child>
236+
<child>
237+
<object class="GtkHSeparator" id="hseparator2">
238+
<property name="visible">True</property>
239+
</object>
240+
<packing>
241+
<property name="expand">False</property>
242+
<property name="position">11</property>
243+
</packing>
244+
</child>
245+
<child>
246+
<object class="GtkHBox" id="hbox4">
247+
<property name="visible">True</property>
248+
<child>
249+
<object class="HAL_LED" id="spindle_delay">
250+
<property name="width_request">25</property>
251+
<property name="visible">True</property>
252+
<property name="pick_color_off">#d3d3d3d3d375</property>
253+
<property name="pick_color_on">#ffffffff0000</property>
254+
<property name="led_blink_rate">500</property>
255+
<property name="on_color">Yellow</property>
256+
</object>
257+
<packing>
258+
<property name="position">0</property>
259+
</packing>
260+
</child>
261+
<child>
262+
<object class="GtkLabel" id="label4">
263+
<property name="visible">True</property>
264+
<property name="label" translatable="yes">Spindle starting</property>
265+
</object>
266+
<packing>
267+
<property name="position">1</property>
268+
</packing>
269+
</child>
270+
</object>
271+
<packing>
272+
<property name="position">12</property>
273+
</packing>
274+
</child>
275+
<child>
276+
<object class="GtkHBox" id="hbox3">
277+
<property name="visible">True</property>
278+
<child>
279+
<object class="GtkLabel" id="label2">
280+
<property name="visible">True</property>
281+
<property name="label" translatable="yes">Spindle speed</property>
282+
</object>
283+
<packing>
284+
<property name="position">0</property>
285+
</packing>
286+
</child>
287+
<child>
288+
<object class="GtkEntry" id="entry2">
289+
<property name="width_request">94</property>
290+
<property name="visible">True</property>
291+
<property name="can_focus">True</property>
292+
<property name="invisible_char">&#x25CF;</property>
293+
<property name="text" translatable="yes">0</property>
294+
<property name="xalign">1</property>
295+
<signal name="key_release_event" handler="set_spindle_speed"/>
296+
</object>
297+
<packing>
298+
<property name="position">1</property>
299+
</packing>
300+
</child>
301+
<child>
302+
<object class="GtkLabel" id="label3">
303+
<property name="visible">True</property>
304+
<property name="label" translatable="yes">RPM</property>
305+
</object>
306+
<packing>
307+
<property name="position">2</property>
308+
</packing>
309+
</child>
310+
</object>
311+
<packing>
312+
<property name="position">13</property>
313+
</packing>
314+
</child>
315+
<child>
316+
<object class="GtkHBox" id="hbox2">
317+
<property name="visible">True</property>
318+
<child>
319+
<object class="HAL_Button" id="hal_button7">
320+
<property name="label" translatable="yes">Start spindle</property>
321+
<property name="visible">True</property>
322+
<property name="can_focus">True</property>
323+
<property name="receives_default">True</property>
324+
<signal name="clicked" handler="run_spindle"/>
325+
</object>
326+
<packing>
327+
<property name="position">0</property>
328+
</packing>
329+
</child>
330+
<child>
331+
<object class="HAL_LED" id="spindle_on">
332+
<property name="visible">True</property>
333+
<property name="pick_color_off">#d3d3d3d3d3d3</property>
334+
<property name="pick_color_on">#ffff00000000</property>
335+
<signal name="hal_pin_changed" handler="current_spindle_speed"/>
336+
</object>
337+
<packing>
338+
<property name="position">1</property>
339+
</packing>
340+
</child>
341+
</object>
342+
<packing>
343+
<property name="position">14</property>
344+
</packing>
345+
</child>
346+
</object>
347+
<packing>
348+
<property name="position">0</property>
349+
</packing>
350+
</child>
351+
</object>
352+
</child>
353+
</object>
354+
</interface>

‎configs/sim/craftsman/cm_axis_panel.hal‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
2+
net machine-on halui.machine.is-on => gladevcp.hal_hbox1
3+
4+
net spindle-on => gladevcp.spindle_on
5+
6+
net dwell <= halui.program.is-paused => gladevcp.spindle_delay
7+
net new-tool-number iocontrol.0.tool-number => gladevcp.tool_number
8+
9+
net tool-number => gladevcp.tool_prep
10+
net tool-change => gladevcp.tool_changing
11+
12+
13+
14+

0 commit comments

Comments
 (0)