@@ -17,7 +17,7 @@ def __init__(self, toolhead, start_pos, end_pos, speed):
17
17
self .start_pos = tuple (start_pos )
18
18
self .end_pos = tuple (end_pos )
19
19
self .accel = toolhead .max_accel
20
- self .junction_deviation = toolhead .junction_deviation
20
+ self .equilateral_corner_v2 = toolhead .equilateral_corner_v2
21
21
self .timing_callbacks = []
22
22
velocity = min (speed , toolhead .max_velocity )
23
23
self .is_kinematic_move = True
@@ -82,8 +82,8 @@ def calc_junction(self, prev_move):
82
82
* prev_move .accel )
83
83
# Apply limits
84
84
self .max_start_v2 = min (
85
- R_jd * self .junction_deviation * self . accel ,
86
- R_jd * prev_move .junction_deviation * prev_move . accel ,
85
+ R_jd * self .equilateral_corner_v2 ,
86
+ R_jd * prev_move .equilateral_corner_v2 ,
87
87
move_centripetal_v2 , prev_move_centripetal_v2 ,
88
88
extruder_v2 , self .max_cruise_v2 , prev_move .max_cruise_v2 ,
89
89
prev_move .max_start_v2 + prev_move .delta_v2 )
@@ -218,7 +218,7 @@ def __init__(self, config):
218
218
self .max_accel_to_decel = self .requested_accel_to_decel
219
219
self .square_corner_velocity = config .getfloat (
220
220
'square_corner_velocity' , 5. , minval = 0. )
221
- self .junction_deviation = 0.
221
+ self .equilateral_corner_v2 = 0.
222
222
self ._calc_junction_deviation ()
223
223
# Print time tracking
224
224
self .buffer_time_low = config .getfloat (
@@ -547,7 +547,7 @@ def get_max_velocity(self):
547
547
return self .max_velocity , self .max_accel
548
548
def _calc_junction_deviation (self ):
549
549
scv2 = self .square_corner_velocity ** 2
550
- self .junction_deviation = scv2 * (math .sqrt (2. ) - 1. ) / self . max_accel
550
+ self .equilateral_corner_v2 = scv2 * (math .sqrt (2. ) - 1. )
551
551
self .max_accel_to_decel = min (self .requested_accel_to_decel ,
552
552
self .max_accel )
553
553
def cmd_G4 (self , gcmd ):
0 commit comments