Skip to content

Commit b6244e5

Browse files
c-morleyc-morley
committed
qtdragon -update test config test panel
1 parent f0ea653 commit b6244e5

3 files changed

Lines changed: 144 additions & 14 deletions

File tree

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
net rate halui.axis.jog-speed panel.Jog-rate-f
1+
net rate halui.axis.jog-speed panel.Jog-rate-f
22

3-
net sx halui.axis.x.select panel.axis-x
4-
net sy halui.axis.y.select panel.axis-y
5-
net sz halui.axis.z.select panel.axis-z
3+
net sx halui.axis.x.select panel.axis-x
4+
net sy halui.axis.y.select panel.axis-y
5+
net sz halui.axis.z.select panel.axis-z
66

7-
net jog-p halui.axis.selected.plus
8-
net jog-m halui.axis.selected.minus
9-
net m0 halui.gui.mdi-command-MACRO0 panel.mdi-0
10-
net m1 halui.gui.mdi-command-MACRO1 panel.mdi-1
7+
net jog-p halui.axis.selected.plus panel.jog-pos
8+
net jog-m halui.axis.selected.minus panel.jog-neg
119

12-
net pause halui.cycle.start panel.cycle-start
13-
net start halui.cycle.pause panel.cycle-pause
10+
#net m0 halui.gui.mdi-command-MACRO0 panel.mdi-0
11+
#net m1 halui.gui.mdi-command-MACRO1 panel.mdi-1
12+
#net m2 halui.gui.mdi-command-0 panel.mdi-2
1413

15-
net cancel halui.gui.cancel panel.cancel
14+
net pause halui.cycle.start panel.cycle-start
15+
net start halui.cycle.pause panel.cycle-pause
16+
17+
net cancel halui.gui.cancel panel.cancel
1618
net ok halui.gui.ok panel.ok
1719

‎configs/sim/qtdragon/qtdragon_xyz/panel.ui‎

Lines changed: 129 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,33 @@
2323
<string>Axis Selection</string>
2424
</property>
2525
<layout class="QHBoxLayout" name="horizontalLayout_2">
26+
<item>
27+
<widget class="PushButton" name="pushbutton_9">
28+
<property name="text">
29+
<string>None</string>
30+
</property>
31+
<property name="checkable">
32+
<bool>true</bool>
33+
</property>
34+
<property name="autoExclusive">
35+
<bool>true</bool>
36+
</property>
37+
<property name="pin_name" stdset="0">
38+
<string>axis-none</string>
39+
</property>
40+
</widget>
41+
</item>
2642
<item>
2743
<widget class="PushButton" name="pushbutton">
2844
<property name="text">
2945
<string>X</string>
3046
</property>
47+
<property name="checkable">
48+
<bool>true</bool>
49+
</property>
50+
<property name="autoExclusive">
51+
<bool>true</bool>
52+
</property>
3153
<property name="pin_name" stdset="0">
3254
<string>axis-x</string>
3355
</property>
@@ -38,6 +60,12 @@
3860
<property name="text">
3961
<string>Y</string>
4062
</property>
63+
<property name="checkable">
64+
<bool>true</bool>
65+
</property>
66+
<property name="autoExclusive">
67+
<bool>true</bool>
68+
</property>
4169
<property name="pin_name" stdset="0">
4270
<string>axis-y</string>
4371
</property>
@@ -48,6 +76,12 @@
4876
<property name="text">
4977
<string>Z</string>
5078
</property>
79+
<property name="checkable">
80+
<bool>true</bool>
81+
</property>
82+
<property name="autoExclusive">
83+
<bool>true</bool>
84+
</property>
5185
<property name="pin_name" stdset="0">
5286
<string>axis-z</string>
5387
</property>
@@ -146,6 +180,90 @@
146180
</layout>
147181
</widget>
148182
</item>
183+
<item>
184+
<widget class="QGroupBox" name="groupBox_5">
185+
<property name="title">
186+
<string>Mode Comands</string>
187+
</property>
188+
<layout class="QHBoxLayout" name="horizontalLayout_6">
189+
<item>
190+
<widget class="PushButton" name="pushbutton_10">
191+
<property name="text">
192+
<string>Manual</string>
193+
</property>
194+
<property name="checkable">
195+
<bool>true</bool>
196+
</property>
197+
<property name="autoExclusive">
198+
<bool>true</bool>
199+
</property>
200+
<property name="pin_name" stdset="0">
201+
<string>manual-mode</string>
202+
</property>
203+
<property name="indicator_option" stdset="0">
204+
<bool>true</bool>
205+
</property>
206+
<property name="indicator_status_option" stdset="0">
207+
<bool>true</bool>
208+
</property>
209+
<property name="is_manual_status" stdset="0">
210+
<bool>true</bool>
211+
</property>
212+
</widget>
213+
</item>
214+
<item>
215+
<widget class="PushButton" name="pushbutton_11">
216+
<property name="text">
217+
<string>MDI</string>
218+
</property>
219+
<property name="checkable">
220+
<bool>true</bool>
221+
</property>
222+
<property name="autoExclusive">
223+
<bool>true</bool>
224+
</property>
225+
<property name="pin_name" stdset="0">
226+
<string>mdi-mode</string>
227+
</property>
228+
<property name="indicator_option" stdset="0">
229+
<bool>true</bool>
230+
</property>
231+
<property name="indicator_status_option" stdset="0">
232+
<bool>true</bool>
233+
</property>
234+
<property name="is_mdi_status" stdset="0">
235+
<bool>true</bool>
236+
</property>
237+
</widget>
238+
</item>
239+
<item>
240+
<widget class="PushButton" name="pushbutton_12">
241+
<property name="text">
242+
<string>Auto</string>
243+
</property>
244+
<property name="checkable">
245+
<bool>true</bool>
246+
</property>
247+
<property name="autoExclusive">
248+
<bool>true</bool>
249+
</property>
250+
<property name="pin_name" stdset="0">
251+
<string>auto-mode</string>
252+
</property>
253+
<property name="indicator_option" stdset="0">
254+
<bool>true</bool>
255+
</property>
256+
<property name="indicator_status_option" stdset="0">
257+
<bool>true</bool>
258+
</property>
259+
<property name="is_auto_status" stdset="0">
260+
<bool>true</bool>
261+
</property>
262+
</widget>
263+
</item>
264+
</layout>
265+
</widget>
266+
</item>
149267
<item>
150268
<widget class="QGroupBox" name="groupBox_7">
151269
<property name="title">
@@ -163,7 +281,7 @@
163281
</widget>
164282
</item>
165283
<item>
166-
<widget class="PushButton" name="pushbutton_17">
284+
<widget class="PushButton" name="pushbutton_20">
167285
<property name="text">
168286
<string>pause</string>
169287
</property>
@@ -172,6 +290,16 @@
172290
</property>
173291
</widget>
174292
</item>
293+
<item>
294+
<widget class="PushButton" name="pushbutton_17">
295+
<property name="text">
296+
<string>Abort</string>
297+
</property>
298+
<property name="pin_name" stdset="0">
299+
<string>cycle-abort</string>
300+
</property>
301+
</widget>
302+
</item>
175303
</layout>
176304
</widget>
177305
</item>

‎configs/sim/qtdragon/qtdragon_xyz/qtdragon_metric.ini‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DEBUG = 0x00000000
1010
# sets qtdragon as screen. for debug output to terminal add -d or -v
1111
# sets window title
1212
# sets icon in task manager
13-
DISPLAY = qtvcp qtdragon
13+
DISPLAY = qtvcp -d qtdragon
1414
TITLE = QtDragon XYZ Metric
1515
ICON = silver_dragon.png
1616

@@ -167,7 +167,7 @@ POSTGUI_HALFILE = qtdragon_postgui.hal
167167
# uncomment this one to print all HAL pins that start with qt
168168
#POSTGUI_HALCMD = show pin qt
169169
POSTGUI_HALCMD = show pin halui.gui
170-
POSTGUI_HALCMD = loadusr qtvcp -H panel.hal panel
170+
POSTGUI_HALCMD = loadusr qtvcp -a -H panel.hal panel
171171
[HALUI]
172172
# no content
173173

0 commit comments

Comments
 (0)