Skip to content

Commit f79fff0

Browse files
committed
qtplasmac: add online user manual to custom buttons
1 parent 5f60630 commit f79fff0

18 files changed

Lines changed: 717 additions & 47 deletions

configs/sim/qtplasmac/qtplasmac-imperial.prefs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ Camera port = 0
4646
7 Code = change-consumables X4 Y4 F120
4747
8 Name = GOTO\HOME
4848
8 Code = G53 G0 X#<_ini[joint_0]home> Y#<_ini[joint_1]home> Z#<_ini[joint_3]home>
49-
9 Name =
50-
9 Code =
49+
9 Name = USER\MANUAL
50+
9 Code = user-manual
5151
10 Name =
5252
10 Code =
5353
11 Name =
@@ -153,3 +153,12 @@ Delay = 0
153153
[POWERMAX]
154154
Port =
155155

156+
[CONVERSATIONAL]
157+
Preamble = G20 G64P0.001 G40 G49 G80 G90 G92.1 G94 G97
158+
Postamble = G20G64P0.001 G40 G49 G80 G90 G92.1 G94 G97
159+
Origin = 0
160+
Leadin = 0
161+
Leadout = 0
162+
Hole diameter = 1.25
163+
Hole speed = 60
164+
Grid Size = 0

configs/sim/qtplasmac/qtplasmac-metric.prefs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ Camera port = 0
4646
7 Code = change-consumables X100 Y100 F3000
4747
8 Name = GOTO\HOME
4848
8 Code = G53 G0 X#<_ini[joint_0]home> Y#<_ini[joint_1]home> Z#<_ini[joint_3]home>
49-
9 Name =
50-
9 Code =
49+
9 Name = USER\MANUAL
50+
9 Code = user-manual
5151
10 Name =
5252
10 Code =
5353
11 Name =
@@ -153,3 +153,12 @@ Delay = 0
153153
[POWERMAX]
154154
Port =
155155

156+
[CONVERSATIONAL]
157+
Preamble = G21 G64P0.25 G40 G49 G80 G90 G92.1 G94 G97
158+
Postamble = G21 G64P0.25 G40 G49 G80 G90 G92.1 G94 G97
159+
Origin = 0
160+
Leadin = 0
161+
Leadout = 0
162+
Hole diameter = 32
163+
Hole speed = 60
164+
Grid Size = 0

configs/sim/qtplasmac/qtplasmac_l_imperial.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ INCREMENTS = 1, .1, .01, .001, .0001
1010
MDI_HISTORY_FILE = imperial_mdi_history.txt
1111
TOOL_EDITOR = tooledit x y
1212
PROGRAM_PREFIX = ../../nc_files
13+
INTRO_GRAPHIC = linuxcnc.gif
14+
INTRO_TIME = 5
1315

1416
#INCLUDE qtplasmac_imperial_ini.inc

configs/sim/qtplasmac/qtplasmac_l_metric.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ INCREMENTS = 10, 1, .1, .01, .001
1010
MDI_HISTORY_FILE = metric_mdi_history.txt
1111
TOOL_EDITOR = tooledit x y
1212
PROGRAM_PREFIX = ../../nc_files
13+
INTRO_GRAPHIC = linuxcnc.gif
14+
INTRO_TIME = 5
1315

1416
#INCLUDE qtplasmac_metric_ini.inc

configs/sim/qtplasmac/qtplasmac_p_imperial.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ INCREMENTS = 1, .1, .01, .001, .0001
1010
MDI_HISTORY_FILE = imperial_mdi_history.txt
1111
TOOL_EDITOR = tooledit x y
1212
PROGRAM_PREFIX = ../../nc_files
13+
INTRO_GRAPHIC = linuxcnc.gif
14+
INTRO_TIME = 5
1315

1416
#INCLUDE qtplasmac_imperial_ini.inc

configs/sim/qtplasmac/qtplasmac_p_metric.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ INCREMENTS = 10, 1, .1, .01, .001
1010
MDI_HISTORY_FILE = metric_mdi_history.txt
1111
TOOL_EDITOR = tooledit x y
1212
PROGRAM_PREFIX = ../../nc_files
13+
INTRO_GRAPHIC = linuxcnc.gif
14+
INTRO_TIME = 5
1315

1416
#INCLUDE qtplasmac_metric_ini.inc

configs/sim/qtplasmac/qtplasmac_s_imperial.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ INCREMENTS = 1, .1, .01, .001, .0001
1010
MDI_HISTORY_FILE = imperial_mdi_history.txt
1111
TOOL_EDITOR = tooledit x y
1212
PROGRAM_PREFIX = ../../nc_files
13+
INTRO_GRAPHIC = linuxcnc.gif
14+
INTRO_TIME = 5
1315

1416
#INCLUDE qtplasmac_imperial_ini.inc

configs/sim/qtplasmac/qtplasmac_s_metric.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,7 @@ INCREMENTS = 10, 1, .1, .01, .001
1010
MDI_HISTORY_FILE = metric_mdi_history.txt
1111
TOOL_EDITOR = tooledit x y
1212
PROGRAM_PREFIX = ../../nc_files
13+
INTRO_GRAPHIC = linuxcnc.gif
14+
INTRO_TIME = 5
1315

1416
#INCLUDE qtplasmac_metric_ini.inc

configs/sim/qtplasmac/qtvcp.prefs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@ AboutDialog-geometry = half
33
LncMessage-geometry = default
44

55
[DIALOG_OPTIONS]
6-
EntryDialog_play_sound = True
6+
EntryDialog_play_sound = False
77
EntryDialog_sound_type = READY
8-
fileDialog_play_sound = True
8+
fileDialog_play_sound = False
99
fileDialog_sound_type = READY
10-
KeyboardDialog_play_sound = True
10+
KeyboardDialog_play_sound = False
1111
KeyboardDialog_sound_type = READY
12-
CalculatorDialog_play_sound = True
12+
CalculatorDialog_play_sound = False
1313
CalculatorDialog_sound_type = READY
14-
MachineLogDialog_play_sound = True
14+
MachineLogDialog_play_sound = False
1515
MachineLogDialog_sound_type = READY
1616

1717
[BOOK_KEEPING]
18-
last_loaded_directory = /home/phill/git/linuxcnc-dev/configs/nc_files/plasmac
19-
RecentPath_0 = /home/phill/git/linuxcnc-dev/configs/nc_files/plasmac/metric_wrench.ngc
18+
last_loaded_directory = None
19+
RecentPath_0 = None
2020
style_QSS_Path = DEFAULT
2121

2222
[SCREEN_OPTIONS]
@@ -27,12 +27,12 @@ desktop_notify = True
2727
notify_max_msgs = 10
2828
shutdown_check = False
2929
sound_player_on = False
30-
MainWindow-geometry = 566 133 1348 702
30+
MainWindow-geometry = 6 56 1348 702
3131

3232
[MCH_MSG_OPTIONS]
33-
mchnMsg_play_sound = True
33+
mchnMsg_play_sound = False
3434
mchnMsg_speak_errors = False
35-
mchnMsg_speak_text = True
35+
mchnMsg_speak_text = False
3636
mchnMsg_sound_type = ATTENTION
3737

3838
[USR_MSG_OPTIONS]
@@ -41,7 +41,7 @@ userMsg_sound_type = ATTENTION
4141
userMsg_use_focusOverlay = True
4242

4343
[SHUTDOWN_OPTIONS]
44-
shutdown_play_sound = True
44+
shutdown_play_sound = False
4545
shutdown_alert_sound_type = READY
4646
shutdown_exit_sound_type = LOGOUT
4747
shutdown_msg_title = Do you want to Shutdown now?
@@ -55,7 +55,7 @@ notify_start_detail = This option can be changed in the preference file
5555
notify_start_timeout = 5
5656

5757
[SCREEN_CONTROL_LAST_SETTING]
58-
conv_preview-user-view = p
58+
conv_preview-user-view = z
5959
conv_preview-user-zoom = 10.0
6060
conv_preview-user-panx = 0.0
6161
conv_preview-user-pany = 0.0

docs/src/plasma/qtplasmac.adoc

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3195,6 +3195,7 @@ Buttons can run the following:
31953195
. <<plasma:button-mancut,Begin/End a manual cut>>
31963196
. <<plasma:button-offsets,Display/Hide an offsets viewer>>
31973197
. <<plasma:button-latest,Load the latest modified NGC file found in a directory>>
3198+
. <<plasma:button-umanual,Display/Hide the online HTML user manual>>
31983199

31993200
[[plasma:button-cmds]]
32003201
.External Commands
@@ -3532,7 +3533,8 @@ n Code = manual-cut
35323533
[[plasma:button-offsets]]
35333534
.Offset Viewer
35343535

3535-
This allows the showing/hiding of an offset viewing screen that displays all machine offsets. All relative offsets can be edited and the G54 ~ G59.3 work system coordinates are able to be given custom names.
3536+
This allows the showing/hiding of an offset viewing screen that displays all machine offsets.
3537+
All relative offsets can be edited and the G54 ~ G59.3 work system coordinates are able to be given custom names.
35363538

35373539
[source,{ini}]
35383540
----
@@ -3542,14 +3544,25 @@ n Code = offsets-view
35423544
[[plasma:button-latest]]
35433545
.Load Latest File
35443546

3545-
this allows the loading of the last modified file in a directory.
3547+
This allows the loading of the last modified file in a directory.
35463548
The directory name is optional and if omitted will default to the last directory a file was loaded from.
35473549

35483550
[source,{ini}]
35493551
----
35503552
n Code = latest-file /home/me/linuxcnc/nc_files/qtplasmac-test
35513553
----
35523554

3555+
[[plasma:button-umanual]]
3556+
.User Manual
3557+
3558+
This allows the showing/hiding of the online HTML user manual specific to the version of LinuxCNC currently running.
3559+
Note that internet access is required for this functionality.
3560+
3561+
[source,{ini}]
3562+
----
3563+
n Code = user-manual
3564+
----
3565+
35533566
[[peripheral-offsets]]
35543567
=== Peripheral Offsets (Laser, Camera, Scribe, Offset Probe)
35553568

0 commit comments

Comments
 (0)