Merge branch '2.9'

Author: phillc54

configs/sim/qtplasmac/qtplasmac-imperial.prefs

@@ -46,8 +46,8 @@ Camera port = 0
 7 Code = change-consumables X4 Y4 F120
 8 Name = GOTO\HOME
 8 Code = G53 G0 X#<_ini[joint_0]home> Y#<_ini[joint_1]home> Z#<_ini[joint_3]home>
-9 Name = 
-9 Code = 
+9 Name = USER\MANUAL
+9 Code = user-manual
 10 Name = 
 10 Code = 
 11 Name = 
@@ -153,3 +153,12 @@ Delay = 0
 [POWERMAX]
 Port = 
 
+[CONVERSATIONAL]
+Preamble = G20 G64P0.001 G40 G49 G80 G90 G92.1 G94 G97
+Postamble = G20G64P0.001 G40 G49 G80 G90 G92.1 G94 G97
+Origin = 0
+Leadin = 0
+Leadout = 0
+Hole diameter = 1.25
+Hole speed = 60
+Grid Size = 0

configs/sim/qtplasmac/qtplasmac-metric.prefs

@@ -46,8 +46,8 @@ Camera port = 0
 7 Code = change-consumables X100 Y100 F3000
 8 Name = GOTO\HOME
 8 Code = G53 G0 X#<_ini[joint_0]home> Y#<_ini[joint_1]home> Z#<_ini[joint_3]home>
-9 Name = 
-9 Code = 
+9 Name = USER\MANUAL
+9 Code = user-manual
 10 Name = 
 10 Code = 
 11 Name = 
@@ -153,3 +153,12 @@ Delay = 0
 [POWERMAX]
 Port = 
 
+[CONVERSATIONAL]
+Preamble = G21 G64P0.25 G40 G49 G80 G90 G92.1 G94 G97
+Postamble = G21 G64P0.25 G40 G49 G80 G90 G92.1 G94 G97
+Origin = 0
+Leadin = 0
+Leadout = 0
+Hole diameter = 32
+Hole speed = 60
+Grid Size = 0

configs/sim/qtplasmac/qtplasmac_l_imperial.ini

@@ -10,5 +10,7 @@ INCREMENTS              = 1, .1, .01, .001, .0001
 MDI_HISTORY_FILE        = imperial_mdi_history.txt
 TOOL_EDITOR             = tooledit x y
 PROGRAM_PREFIX          = ../../nc_files
+INTRO_GRAPHIC           = linuxcnc.gif
+INTRO_TIME              = 5
 
 #INCLUDE qtplasmac_imperial_ini.inc

configs/sim/qtplasmac/qtplasmac_l_metric.ini

@@ -10,5 +10,7 @@ INCREMENTS              = 10, 1, .1, .01, .001
 MDI_HISTORY_FILE        = metric_mdi_history.txt
 TOOL_EDITOR             = tooledit x y
 PROGRAM_PREFIX          = ../../nc_files
+INTRO_GRAPHIC           = linuxcnc.gif
+INTRO_TIME              = 5
 
 #INCLUDE qtplasmac_metric_ini.inc

configs/sim/qtplasmac/qtplasmac_p_imperial.ini

@@ -10,5 +10,7 @@ INCREMENTS              = 1, .1, .01, .001, .0001
 MDI_HISTORY_FILE        = imperial_mdi_history.txt
 TOOL_EDITOR             = tooledit x y
 PROGRAM_PREFIX          = ../../nc_files
+INTRO_GRAPHIC           = linuxcnc.gif
+INTRO_TIME              = 5
 
 #INCLUDE qtplasmac_imperial_ini.inc

configs/sim/qtplasmac/qtplasmac_p_metric.ini

@@ -10,5 +10,7 @@ INCREMENTS              = 10, 1, .1, .01, .001
 MDI_HISTORY_FILE        = metric_mdi_history.txt
 TOOL_EDITOR             = tooledit x y
 PROGRAM_PREFIX          = ../../nc_files
+INTRO_GRAPHIC           = linuxcnc.gif
+INTRO_TIME              = 5
 
 #INCLUDE qtplasmac_metric_ini.inc

configs/sim/qtplasmac/qtplasmac_s_imperial.ini

@@ -10,5 +10,7 @@ INCREMENTS              = 1, .1, .01, .001, .0001
 MDI_HISTORY_FILE        = imperial_mdi_history.txt
 TOOL_EDITOR             = tooledit x y
 PROGRAM_PREFIX          = ../../nc_files
+INTRO_GRAPHIC           = linuxcnc.gif
+INTRO_TIME              = 5
 
 #INCLUDE qtplasmac_imperial_ini.inc

configs/sim/qtplasmac/qtplasmac_s_metric.ini

@@ -10,5 +10,7 @@ INCREMENTS              = 10, 1, .1, .01, .001
 MDI_HISTORY_FILE        = metric_mdi_history.txt
 TOOL_EDITOR             = tooledit x y
 PROGRAM_PREFIX          = ../../nc_files
+INTRO_GRAPHIC           = linuxcnc.gif
+INTRO_TIME              = 5
 
 #INCLUDE qtplasmac_metric_ini.inc

configs/sim/qtplasmac/qtvcp.prefs

@@ -3,20 +3,20 @@ AboutDialog-geometry = half
 LncMessage-geometry = default
 
 [DIALOG_OPTIONS]
-EntryDialog_play_sound = True
+EntryDialog_play_sound = False
 EntryDialog_sound_type = READY
-fileDialog_play_sound = True
+fileDialog_play_sound = False
 fileDialog_sound_type = READY
-KeyboardDialog_play_sound = True
+KeyboardDialog_play_sound = False
 KeyboardDialog_sound_type = READY
-CalculatorDialog_play_sound = True
+CalculatorDialog_play_sound = False
 CalculatorDialog_sound_type = READY
-MachineLogDialog_play_sound = True
+MachineLogDialog_play_sound = False
 MachineLogDialog_sound_type = READY
 
 [BOOK_KEEPING]
-last_loaded_directory = /home/phill/git/linuxcnc-dev/configs/nc_files/plasmac
-RecentPath_0 = /home/phill/git/linuxcnc-dev/configs/nc_files/plasmac/metric_wrench.ngc
+last_loaded_directory = None
+RecentPath_0 = None
 style_QSS_Path = DEFAULT
 
 [SCREEN_OPTIONS]
@@ -27,12 +27,12 @@ desktop_notify = True
 notify_max_msgs = 10
 shutdown_check = False
 sound_player_on = False
-MainWindow-geometry = 566 133 1348 702
+MainWindow-geometry = 6 56 1348 702
 
 [MCH_MSG_OPTIONS]
-mchnMsg_play_sound = True
+mchnMsg_play_sound = False
 mchnMsg_speak_errors = False
-mchnMsg_speak_text = True
+mchnMsg_speak_text = False
 mchnMsg_sound_type = ATTENTION
 
 [USR_MSG_OPTIONS]
@@ -41,7 +41,7 @@ userMsg_sound_type = ATTENTION
 userMsg_use_focusOverlay = True
 
 [SHUTDOWN_OPTIONS]
-shutdown_play_sound = True
+shutdown_play_sound = False
 shutdown_alert_sound_type = READY
 shutdown_exit_sound_type = LOGOUT
 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
 notify_start_timeout = 5
 
 [SCREEN_CONTROL_LAST_SETTING]
-conv_preview-user-view = p
+conv_preview-user-view = z
 conv_preview-user-zoom = 10.0
 conv_preview-user-panx = 0.0
 conv_preview-user-pany = 0.0

docs/src/plasma/qtplasmac.adoc

@@ -3212,6 +3212,7 @@ Buttons can run the following:
 . <<plasma:button-mancut,Begin/End a manual cut>>
 . <<plasma:button-offsets,Display/Hide an offsets viewer>>
 . <<plasma:button-latest,Load the latest modified NGC file found in a directory>>
+. <<plasma:button-umanual,Display/Hide the online HTML user manual>>
 
 [[plasma:button-cmds]]
 .External Commands
@@ -3404,10 +3405,12 @@ n Code = cut-type
 
 Pressing this button moves the torch to the specified coordinates when the machine is paused to allow the user easy access to change the torch consumables.
 
-Valid entries are X__nnn__ Y__nnn__ F__nnn__. Feed Rate (F) is mandatory and at least one of the X or Y coordinates are required.
+Valid entries are X__nnn__ Y__nnn__ F__nnn__. At least one of the X or Y coordinates are required, Feed Rate (F) is optional.
 
 The X and Y coordinates are in absolute machine coordinates. If X or Y are missing then the current coordinate for that axis will be used.
 
+Feed Rate (F) is optional, if it is missing or invalid then the feed rate of the current material will be used.
+
 There are three methods to return to the previous coordinates:
 
 . Press the *Change Consumables* button again - the torch will return to the original coordinates and the machine will wait in this position for the user to resume the program.
@@ -3547,7 +3550,8 @@ n Code = manual-cut
 [[plasma:button-offsets]]
 .Offset Viewer
 
-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.
+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.
 
 [source,{ini}]
 ----
@@ -3557,14 +3561,25 @@ n Code = offsets-view
 [[plasma:button-latest]]
 .Load Latest File
 
-this allows the loading of the last modified file in a directory.
+This allows the loading of the last modified file in a directory.
 The directory name is optional and if omitted will default to the last directory a file was loaded from.
 
 [source,{ini}]
 ----
 n Code = latest-file /home/me/linuxcnc/nc_files/qtplasmac-test
 ----
 
+[[plasma:button-umanual]]
+.User Manual
+
+This allows the showing/hiding of the online HTML user manual specific to the version of LinuxCNC currently running.
+Note that internet access is required for this functionality.
+
+[source,{ini}]
+----
+n Code = user-manual
+----
+
 [[peripheral-offsets]]
 === Peripheral Offsets (Laser, Camera, Scribe, Offset Probe)