File tree 2 files changed +7
-3
lines changed 2 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -560,8 +560,9 @@ def setup_status_labels(parent):
560
560
p = p if p is not None else 3
561
561
parent .status_joint_prec [f'{ item } _{ i } ' ] = [i , p ] # add the label, tuple position & precision
562
562
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' }
565
566
# label : status item max_velocity_lb
566
567
parent .overrides = {}
567
568
for label , stat in override_items .items ():
Original file line number Diff line number Diff line change @@ -21,13 +21,16 @@ def is_int(string):
21
21
22
22
def all_homed (parent ):
23
23
parent .status .poll ()
24
+ '''
24
25
num_joints = parent.status.joints
25
26
home_status = parent.status.homed[:num_joints]
26
27
test_list = []
27
28
for i in range(num_joints):
28
29
test_list.append(1)
29
30
test_tuple = tuple(test_list)
30
31
return home_status == test_tuple
32
+ '''
33
+ return parent .status .homed .count (1 ) == parent .status .joints
31
34
32
35
def all_unhomed (parent ):
33
36
parent .status .poll ()
@@ -82,7 +85,7 @@ def feed_override(parent, value):
82
85
parent .command .wait_complete ()
83
86
84
87
def rapid_override (parent , value ):
85
- parent .command .maxvel (float (value / 100 ))
88
+ parent .command .rapidrate (float (value / 100 ))
86
89
parent .command .wait_complete ()
87
90
88
91
def spindle_override (parent , value ):
You can’t perform that action at this time.
0 commit comments