Skip to content

Commit f0e353d

Browse files
committed
qtdragon/hd/vert qtaxis qttouchy -fix keyboard incremental jogging
Would work if you held the key down untill the jog finished. Now it will finish even if you release the key
1 parent 7a555b1 commit f0e353d

File tree

5 files changed

+30
-0
lines changed

5 files changed

+30
-0
lines changed

share/qtvcp/screens/qtaxis/qtaxis_handler.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -553,6 +553,12 @@ def kb_jog(self, state, joint, direction, fast = False, linear = True):
553553
rate = rate * 2
554554
ACTION.JOG(joint, direction, rate, distance)
555555
else:
556+
# incremental jogging?
557+
if joint in (3,4,5,'A','B','C'): # angualar axis
558+
if STATUS.get_jog_increment_angular() != 0: return
559+
elif STATUS.get_jog_increment() != 0: return
560+
561+
# otherwise stop jogging when key released
556562
ACTION.JOG(joint, 0, 0, 0)
557563

558564
# add spindle speed bar and at-speed led to tab corner

share/qtvcp/screens/qtdragon/qtdragon_handler.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,6 +1201,12 @@ def kb_jog(self, state, joint, direction, fast = False, linear = True):
12011201
rate = rate * 2
12021202
ACTION.JOG(joint, direction, rate, distance)
12031203
else:
1204+
# incremental jogging?
1205+
if joint in (3,4,5,'A','B','C'): # angualar axis
1206+
if STATUS.get_jog_increment_angular() != 0: return
1207+
elif STATUS.get_jog_increment() != 0: return
1208+
1209+
# otherwise stop jogging when key released
12041210
ACTION.JOG(joint, 0, 0, 0)
12051211

12061212
def add_status(self, message, alertLevel = DEFAULT):

share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,6 +1273,12 @@ def kb_jog(self, state, joint, direction, fast = False, linear = True):
12731273
rate = rate * 2
12741274
ACTION.JOG(joint, direction, rate, distance)
12751275
else:
1276+
# incremental jogging?
1277+
if joint in (3,4,5,'A','B','C'): # angualar axis
1278+
if STATUS.get_jog_increment_angular() != 0: return
1279+
elif STATUS.get_jog_increment() != 0: return
1280+
1281+
# otherwise stop jogging when key released
12761282
ACTION.JOG(joint, 0, 0, 0)
12771283

12781284
def add_status(self, message, alertLevel = DEFAULT):

share/qtvcp/screens/qtdragon_hd_vert/qtdragon_hd_vert_handler.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1273,6 +1273,12 @@ def kb_jog(self, state, joint, direction, fast = False, linear = True):
12731273
rate = rate * 2
12741274
ACTION.JOG(joint, direction, rate, distance)
12751275
else:
1276+
# incremental jogging?
1277+
if joint in (3,4,5,'A','B','C'): # angualar axis
1278+
if STATUS.get_jog_increment_angular() != 0: return
1279+
elif STATUS.get_jog_increment() != 0: return
1280+
1281+
# otherwise stop jogging when key released
12761282
ACTION.JOG(joint, 0, 0, 0)
12771283

12781284
def add_status(self, message, alertLevel = DEFAULT):

share/qtvcp/screens/qttouchy/qttouchy_handler.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,12 @@ def kb_jog(self, state, joint, direction, fast = False, linear = True):
276276
rate = rate * 2
277277
ACTION.JOG(joint, direction, rate, distance)
278278
else:
279+
# incremental jogging?
280+
if joint in (3,4,5,'A','B','C'): # angualar axis
281+
if STATUS.get_jog_increment_angular() != 0: return
282+
elif STATUS.get_jog_increment() != 0: return
283+
284+
# otherwise stop jogging when key released
279285
ACTION.JOG(joint, 0, 0, 0)
280286

281287
#####################

0 commit comments

Comments
 (0)