Skip to content

Commit 973ecc3

Browse files
committed
qtplasmac: no need to inhibit jogging while probing
1 parent 4b1eee1 commit 973ecc3

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

share/qtvcp/screens/qtplasmac/qtplasmac_handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION = '1.227.219'
1+
VERSION = '1.228.219'
22

33
'''
44
qtplasmac_handler.py

share/qtvcp/screens/qtplasmac/versions.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ <h2>QtPlasmaC Version History</h2>
3030
</table>
3131
<br>
3232
<!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
33+
<br><b><u>v1.228.219 2022 July 17</u></b>
34+
<ul style="margin:0;">
35+
<li>no need to inhibit jogging while probing</li>
36+
</ul>
37+
3338
<br><b><u>v1.227.219 2022 July 17</u></b>
3439
<ul style="margin:0;">
3540
<li>move options from ini file to prefs file</li>

src/hal/components/plasmac.comp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ A plasma cutting table control component for use with the LinuxCNC V2.8 or later
77

88
.I VERSION:
99
.br
10-
1.227
10+
1.228
1111

1212
.I SUMMARY:
1313
.br
@@ -825,7 +825,7 @@ FUNCTION(_) {
825825
puddle_jump_percent = puddle_jump_height == 0 ? 100:puddle_jump_height;
826826

827827
/* set jog inhibit if required */
828-
if(sensor_active && program_is_idle && !override_jog){
828+
if(sensor_active && program_is_idle && !(override_jog || state == PROBE_DOWN || state == PROBE_UP)){
829829
jog_inhibit = TRUE;
830830
}else{
831831
jog_inhibit = FALSE;

0 commit comments

Comments
 (0)