|
|
|
|
1135
|
get_coordinates(); // For X Y Z E F
|
1135
|
get_coordinates(); // For X Y Z E F
|
1136
|
#ifdef FWRETRACT
|
1136
|
#ifdef FWRETRACT
|
1137
|
if(autoretract_enabled)
|
1137
|
if(autoretract_enabled)
|
1138
|
- if( !(code_seen(X_AXIS) || code_seen(Y_AXIS) || code_seen(Z_AXIS)) && code_seen(E_AXIS)) {
|
|
|
|
|
1138
|
+ if( !(code_seen('X') || code_seen('Y') || code_seen('Z')) && code_seen('E')) {
|
1139
|
float echange=destination[E_AXIS]-current_position[E_AXIS];
|
1139
|
float echange=destination[E_AXIS]-current_position[E_AXIS];
|
1140
|
- if((echange<-MIN_RETRACT && !retracted) || (echange>MIN_RETRACT && retracted)) { //move appears to be an attempt to attract or recover
|
|
|
|
|
1140
|
+ if((echange<-MIN_RETRACT && !retracted) || (echange>MIN_RETRACT && retracted)) { //move appears to be an attempt to retract or recover
|
1141
|
current_position[E_AXIS] = destination[E_AXIS]; //hide the slicer-generated retract/recover from calculations
|
1141
|
current_position[E_AXIS] = destination[E_AXIS]; //hide the slicer-generated retract/recover from calculations
|
1142
|
plan_set_e_position(current_position[E_AXIS]); //AND from the planner
|
1142
|
plan_set_e_position(current_position[E_AXIS]); //AND from the planner
|
1143
|
retract(!retracted);
|
1143
|
retract(!retracted);
|