Skip to content

Commit 772d5b8

Browse files
authored
Merge pull request #3697 from zz912/man-screen
GTK built panel - document addition
2 parents 9e7f3b8 + cc948de commit 772d5b8

File tree

5 files changed

+117
-75
lines changed

5 files changed

+117
-75
lines changed

docs/src/gui/gladevcp-panels.adoc

Lines changed: 115 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,124 @@ There are several *builtin panels* available.
1919

2020
In a terminal type `gladevcp` to see a list.
2121

22-
=== gtk_verser_probe
22+
---
23+
24+
=== GTK Verser Probe
2325
A GTK based version of the third party Verser probe.
2426

27+
2528
image::images/gtk_verser_probe.png["GTK Verser Probe",align="center"]
2629

27-
=== gtk_little_probe
28-
A GTK based version of the third party Verser probe in a tabbed layout for smaller displays.
30+
This is a version from 2015 by Serguei Glavatski which has **less functionality** than the current, but it **takes up less space on the screen** (no DRO e.g.).
31+
This can be useful on smaller displays.
32+
33+
**For Reference - The Current Version**
34+
35+
The documentation and source code of the current version can be found here:
36+
37+
* https://vers.ge/en/blog/useful-articles/probe-screen-v28
38+
* https://github.com/verser-git/probe_screen_v2.9
39+
40+
41+
**Modification of the INI file to use as embedded panel in Gmoccapy**
42+
```ini
43+
[DISPLAY]
44+
DISPLAY = gmoccapy
45+
EMBED_TAB_NAME = Probe
46+
EMBED_TAB_LOCATION = ntb_user_tabs
47+
EMBED_TAB_COMMAND = gladevcp -x {XID} gtk_verser_probe
48+
49+
[TOOLSENSOR]
50+
RAPID_SPEED = 600
51+
52+
[RS274NGC]
53+
# for package install:
54+
SUBROUTINE_PATH = ./macros:/usr/share/linuxcnc/nc_files/gtk_probe/
55+
56+
# For RIP installation, use the path according to your directory:
57+
# SUBROUTINE_PATH = ./macros:~/linuxcnc/nc_files/probe/gtk_probe/
58+
```
59+
60+
**Example using dbounce with a Mesa card (HAL file)**
61+
```hal
62+
# ---probe signal---
63+
loadrt dbounce names=dbounce.probe
64+
addf dbounce.probe servo-thread
65+
66+
setp dbounce.probe.delay 5
67+
net probe-db dbounce.probe.in <= hm2_7i96.0.gpio.000.in
68+
net probe-in motion.probe-input <= dbounce.probe.out
69+
```
70+
71+
---
72+
=== GTK Little Probe
73+
A GTK based version of the third party Verser probe, modified for a tabbed layout for smaller displays.
2974

3075
image::images/gtk_little_probe.png["GTK little Probe",align="center"]
76+
77+
This is a modification of the 2015 version of GTK Verser Probe. It moves the elements from one window to containers with switchable vertical tabs. The goal was to reduce the window size.
78+
79+
80+
**Modification of the INI file to use as embedded panel in Gmoccapy**
81+
```ini
82+
[DISPLAY]
83+
DISPLAY = gmoccapy
84+
EMBED_TAB_NAME = Probe
85+
EMBED_TAB_LOCATION = ntb_preview
86+
EMBED_TAB_COMMAND = gladevcp -x {XID} gtk_little_probe
87+
88+
[TOOLSENSOR]
89+
RAPID_SPEED = 600
90+
91+
[RS274NGC]
92+
# for package install:
93+
SUBROUTINE_PATH = ./macros:/usr/share/linuxcnc/nc_files/probe/gtk_probe/
94+
95+
# For RIP installation, use the path according to your directory:
96+
# SUBROUTINE_PATH = ./macros:~/linuxcnc/nc_files/probe/gtk_probe/
97+
```
98+
Use only one Probe Screen by Serguei Glavatski in one LCNC configuration.
99+
100+
101+
**Example using dbounce with Mesa card (HAL file)**
102+
```hal
103+
# ---probe signal---
104+
loadrt dbounce names=dbounce.probe
105+
addf dbounce.probe servo-thread
106+
107+
setp dbounce.probe.delay 5
108+
net probe-db dbounce.probe.in <= hm2_7i96.0.gpio.000.in
109+
net probe-in motion.probe-input <= dbounce.probe.out
110+
```
111+
---
112+
113+
=== GTK Mesa Tests
114+
This screen allows the user to verify whether they have a suitable and well-tuned PC for their Mesa card.
115+
116+
Based on the design of Mesa Configuration Tool II https://github.com/jethornton/mesact Copyright (c) 2022 jethornton
117+
118+
Although this screen was originally part of the configurator, it is not the configurator. It is a control system. Mesa tests uses data from a running LinuxCNC, but does not send any data to LinuxCNC, nor does it set anything. Parameter adjustment is only allowed to simulate the desired state.
119+
120+
image::images/gtk_mesa_tests-servo.png["GTK Mesa Tests, Servo Thread",align="center"]
121+
122+
Servo Thread test:
123+
124+
* press the "Get CPU speed" button
125+
* press the "Get tmax" button
126+
* press the "Get period" button
127+
* press the "Calculate" button
128+
* check the result [%]
129+
130+
image::images/gtk_mesa_tests-nic.png["GTK Mesa Tests, NIC",align="center"]
131+
132+
NIC test:
133+
134+
* press the "Get CPU speed" button
135+
* press the "Get read.tmax" button
136+
* press the "Get write.tmax" button
137+
* press the "Get period" button
138+
* press the "Calculate" button
139+
* check the result [%]
140+
141+
142+
Mesa Tests is a tool designed for beginners to sleep better or to know if they need to buy better hardware or tune their hardware better. It is better to use tools like Halshow or Halscope to monitor the parameters (pins,thread, ...) used. The list of parameters is displayed on the right side of the screen.
89.8 KB
Loading
72.4 KB
Loading

lib/python/gladevcp/builtin-panels/gtk_little_probe/README.md

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -12,40 +12,4 @@ The modification was made by zz912.
1212
### Load with gladevcp command:
1313
```bash
1414
gladevcp gtk_little_probe
15-
```
16-
17-
---
18-
19-
## Modification INI file for embedded panel in Gmoccapy:
20-
```ini
21-
[DISPLAY]
22-
DISPLAY = gmoccapy
23-
EMBED_TAB_NAME = Probe
24-
EMBED_TAB_LOCATION = ntb_preview
25-
EMBED_TAB_COMMAND = gladevcp -x {XID} gtk_little_probe
26-
27-
[TOOLSENSOR]
28-
RAPID_SPEED = 600
29-
30-
[RS274NGC]
31-
# for package install:
32-
SUBROUTINE_PATH = ./macros:/usr/share/linuxcnc/nc_files/probe/gtk_probe/
33-
34-
# For RIP installation, use the path according to your directory:
35-
# SUBROUTINE_PATH = ./macros:~/linuxcnc/nc_files/probe/gtk_probe/
36-
```
37-
Use only one Probe Screen by Serguei Glavatski in one LCNC configuration.
38-
39-
40-
---
41-
42-
## Example using dbounce with Mesa card in HAL file:
43-
```hal
44-
# ---probe signal---
45-
loadrt dbounce names=dbounce.probe
46-
addf dbounce.probe servo-thread
47-
48-
setp dbounce.probe.delay 5
49-
net probe-db dbounce.probe.in <= hm2_7i96.0.gpio.000.in
50-
net probe-in motion.probe-input <= dbounce.probe.out
51-
```
15+
```

lib/python/gladevcp/builtin-panels/gtk_verser_probe/README.md

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -11,38 +11,4 @@ Old version from 2015. This older version has **less functionality**, but it **t
1111
### Load with gladevcp command:
1212
```bash
1313
gladevcp gtk_verser_probe
14-
```
15-
16-
---
17-
18-
## Modification INI file for embedded panel in Gmoccapy:
19-
```ini
20-
[DISPLAY]
21-
DISPLAY = gmoccapy
22-
EMBED_TAB_NAME = Probe
23-
EMBED_TAB_LOCATION = ntb_user_tabs
24-
EMBED_TAB_COMMAND = gladevcp -x {XID} gtk_verser_probe
25-
26-
[TOOLSENSOR]
27-
RAPID_SPEED = 600
28-
29-
[RS274NGC]
30-
# for package install:
31-
SUBROUTINE_PATH = ./macros:/usr/share/linuxcnc/nc_files/gtk_probe/
32-
33-
# For RIP installation, use the path according to your directory:
34-
# SUBROUTINE_PATH = ./macros:~/linuxcnc/nc_files/probe/gtk_probe/
35-
```
36-
37-
---
38-
39-
## Example using dbounce with Mesa card in HAL file:
40-
```hal
41-
# ---probe signal---
42-
loadrt dbounce names=dbounce.probe
43-
addf dbounce.probe servo-thread
44-
45-
setp dbounce.probe.delay 5
46-
net probe-db dbounce.probe.in <= hm2_7i96.0.gpio.000.in
47-
net probe-in motion.probe-input <= dbounce.probe.out
48-
```
14+
```

0 commit comments

Comments
 (0)