Skip to content

Commit d4f0fe7

Browse files
committed
fix rapid override
Signed-off-by: John Thornton <[email protected]>
1 parent 1a4c062 commit d4f0fe7

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

flexgui/src/libflexgui/startup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -560,8 +560,9 @@ def setup_status_labels(parent):
560560
p = p if p is not None else 3
561561
parent.status_joint_prec[f'{item}_{i}'] = [i, p] # add the label, tuple position & precision
562562

563-
#override_items = ['feedrate', ]
564-
override_items = {'feedrate_lb': 'feedrate' , 'max_velocity_lb': 'max_velocity'}
563+
#override_items = ['feedrate', 'rapidrate',]
564+
override_items = {'feedrate_lb': 'feedrate' , 'rapidrate_lb': 'rapidrate',
565+
'max_velocity_lb': 'max_velocity'}
565566
# label : status item max_velocity_lb
566567
parent.overrides = {}
567568
for label, stat in override_items.items():

flexgui/src/libflexgui/utilities.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,16 @@ def is_int(string):
2121

2222
def all_homed(parent):
2323
parent.status.poll()
24+
'''
2425
num_joints = parent.status.joints
2526
home_status = parent.status.homed[:num_joints]
2627
test_list = []
2728
for i in range(num_joints):
2829
test_list.append(1)
2930
test_tuple = tuple(test_list)
3031
return home_status == test_tuple
32+
'''
33+
return parent.status.homed.count(1) == parent.status.joints
3134

3235
def all_unhomed(parent):
3336
parent.status.poll()
@@ -82,7 +85,7 @@ def feed_override(parent, value):
8285
parent.command.wait_complete()
8386

8487
def rapid_override(parent, value):
85-
parent.command.maxvel(float(value / 100))
88+
parent.command.rapidrate(float(value / 100))
8689
parent.command.wait_complete()
8790

8891
def spindle_override(parent, value):

0 commit comments

Comments
 (0)