Merge branch '2.9'

Author: c-morley

docs/src/Submakefile

@@ -66,6 +66,7 @@ DOC_SRCS_EN := \
 	drivers/gs2.adoc \
 	drivers/hostmot2.adoc \
 	drivers/mb2hal.adoc \
+	drivers/mesa_modbus.adoc \
 	drivers/motenc.adoc \
 	drivers/opto22.adoc \
 	drivers/pico-ppmc.adoc \

docs/src/drivers/mesa_modbus.adoc

@@ -1,6 +1,7 @@
 :lang: en
+:toc:
 
-[[cha:mesa_modbusl]]
+[[cha:mesa_modbus]]
 
 = Mesa Modbus =
 
@@ -11,27 +12,29 @@ There are several existing ways to control Modbus devices with LinuxCNC,
 and those should also be considered.
 They include, but are not limited to:
 
-<<cha:mb2hal>>
+<<cha:mb2hal,MB2HAL>>
 
 https://forum.linuxcnc.org/24-hal-components/38733-vfdmod-an-easy-vfd-control-over-modbus-rtu?start=0#162435[vfdmod]
 
-<<cha:cl-programming>>
+<<cha:cl-programming,Classic Ladder>>
 
 There are also several drivers for specific VFDs, for example
 
-<<cha:mitsub>>
+<<cha:mitsub,Mitsubishi VFD>>
 
-<<hy_gt_vfd>>
+<<cha:vfs11-vfd,Toshiba-Schneider VF-S11 VFD>>
 
-<<hy_vfd>>
+<<cha:vfs11-vfd,Toshiba-Schneider VF-S11 VFD>>
 
-<<gs2_vfd>>
+hy-vfd - HuangYang VFD
 
-<<vfdb_vfd>>
+hy-gt-vfd - HuangYang GT VFD
 
-<<vfs11_vfd>>
+gs2-vfd - Automation Direct GS2 VFD
 
-<<wj200_vfd>>
+vfdb-vfd - Delta VFD-B VFD
+
+wj200-vfd - Hitachi wj200 VFD
 
 For most applications (especially the "hy" (HuangYang) VFDs which do not
 actually conform to true modbus) it is likely to be less work to use
@@ -152,6 +155,7 @@ system runs as fast as it can.
 
 The fault codes returned in "last error" are
 
+[width="90%",options="header"]
 |===
 |Code|Fault
 |1|Illegal Function
@@ -256,8 +260,9 @@ HAL_S32.
 
 The supported Modbus command types are:
 
-[cols=description, code]
+[width="90%",options="header"]
 |===
+|Description|Code|
 |Read Coils|1|
 |Read Discrete Inputs|2|
 |Read Multiple Holding Registers|3|
@@ -288,9 +293,11 @@ necessary except in the special case of the 'modcompile all' command,
 which will compile and install all .mod files in the current directory.
 
 ----
-./modcompile my_file.mod
+/modcompile my_file.mod
 ----
+
 or
+
 ----
 ./modcompile all
 ----
@@ -300,10 +307,13 @@ or
 ----
 sudo apt-get install linuxcnc-uspace-dev
 ----
+
 or
+
 ----
 sudo apt-get install linuxcnc-dev
 ----
+
 if using RTAI kernel realtime.
 
 Alternatively the package should be installable with the Synaptic
@@ -315,7 +325,7 @@ The Mesa serial ports have separate pins for Tx and Tx pairs. For RS422
 Modbus RTU communications these should be connected at the Mesa card
 Tx+ to Rx+ and Tx- to Rx-.
 
-Nore that there are differing naming standards for Modbus pins.
+Note that there are differing naming standards for Modbus pins.
 Typically Rx+ and TX+ will connect to the B- pin on the modbus device
 and Rx- and Tx- will connect to the A+ pin. (ie, +/- will appear
 reversed.
@@ -365,3 +375,4 @@ mesaflash --device 7i96 --addr 10.10.10.10 --rpo 0x6500
 mesaflash --device 7i96 --addr 10.10.10.10 --rpo 0x6500
 ----
 
+// vim: set syntax=asciidoc:

docs/src/gui/qtdragon.adoc

@@ -567,6 +567,10 @@ It is up to the end user to supply the appropriate driver and HAL file connectio
 QtDragon can be set up to automatically raise and lower the Z axis when the spindle is paused. +
 When a program is paused, then you press the 'Spindle Pause' button to stop the spindle and raise it in Z. +
 Press the button again to start spindle and lower it, then unpause the program. +
+If you have the HAL pin 'spindle.0.at-speed' connected to a driving pin, the spindle will not lower until the pin is true +
+You typically connect this to a timer or logic that detects the speed of the spindle. +
+If that pin is not connected to a driving pin, a dialog will pop up to warn you to wait for the spindle response. +
+The spindle will lower when you close that dialog. +
 The amount to raise is set in the 'Settings' tab under the heading 'SPINDLE RAISE'. +
 This line edit box can only be directly set when not in Auto mode. +
 The up/down buttons can be used to adjust the raise amount at any time, including when the spindle is already raised. +

docs/src/index.tmpl

@@ -209,6 +209,7 @@ function setup_page(){
 		<li><a href="drivers/gs2.html">GS2 Driver</a></li>
 		<li><a href="drivers/hostmot2.html">Mesa HostMot2 Driver</a></li>
 		<li><a href="drivers/mb2hal.html">Modbus to HAL Driver</a></li>
+        <li><a href="drivers/mesa_modbus.html">Modbus framework for Mesa cards</a></li>
 		<li><a href="drivers/mitsub-vfd.html">Mitsubishi VFD Driver</a></li>
 		<li><a href="drivers/motenc.html">Motenc Driver</a></li>
 		<li><a href="drivers/opto22.html">Opto22 Driver</a></li>

lib/python/qtvcp/widgets/basic_probe.py

@@ -125,6 +125,7 @@ def homed_on_status():
 
         # must directly initialize
         self.statuslabel_motiontype.hal_init()
+        self.led_probe.hal_init()
 
         if self.PREFS_:
             self.lineEdit_probe_tool.setText(self.PREFS_.getpref('Probe tool', '0', str, 'PROBE OPTIONS'))