Skip to content

Commit

Permalink
Correction for: two extruders, Sintaxe LCD_Encoder.c, CZ translation (b…
Browse files Browse the repository at this point in the history
  • Loading branch information
radek8 authored Apr 30, 2020
1 parent b2aa14a commit 6c1b2f0
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 3 deletions.
7 changes: 4 additions & 3 deletions TFT/src/User/API/LCD_Encoder.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ void loopCheckEncoder()
sy = ey;
return 2;
}
return 0;
//return 0;
}
else
{
Expand All @@ -178,7 +178,7 @@ void loopCheckEncoder()
sy = ey;
return 3;
}
return 0;
//return 0;
}
}
}
Expand All @@ -188,8 +188,9 @@ void loopCheckEncoder()
sy = ey =0;
MOVE = false;
skipMode = false; //resume mode change loop
return 0;
//return 0;
}
return 0;
}
#endif

Expand Down
21 changes: 21 additions & 0 deletions TFT/src/User/API/parseACK.c
Original file line number Diff line number Diff line change
Expand Up @@ -233,13 +233,27 @@ void parseACK(void)
if(ack_seen("Z")) setParameter(P_STEPS_PER_MM, Z_STEPPER, ack_value());
if(ack_seen("E")) setParameter(P_STEPS_PER_MM, E_STEPPER, ack_value());
}
else if(ack_seen("M92 T0 E")){
setParameter(P_STEPS_PER_MM, E_STEPPER, ack_value());
}
else if(ack_seen("M92 T1 E")){
setParameter(P_STEPS_PER_MM, E2_STEPPER, ack_value());
dualstepper[E_STEPPER] = true;
}
//parse and store Max Feed Rate values
else if(ack_seen("M203 X")){
setParameter(P_MAX_FEED_RATE, X_STEPPER, ack_value());
if(ack_seen("Y")) setParameter(P_MAX_FEED_RATE, Y_STEPPER, ack_value());
if(ack_seen("Z")) setParameter(P_MAX_FEED_RATE, Z_STEPPER, ack_value());
if(ack_seen("E")) setParameter(P_MAX_FEED_RATE, E_STEPPER, ack_value());
}
else if(ack_seen("M203 T0 E")){
setParameter(P_MAX_FEED_RATE, E_STEPPER, ack_value());
}
else if(ack_seen("M203 T1 E")){
setParameter(P_MAX_FEED_RATE, E2_STEPPER, ack_value());
dualstepper[E_STEPPER] = true;
}
//parse and store Max Acceleration values
else if(ack_seen("M201 X")){
setParameter(P_MAX_ACCELERATION, X_STEPPER, ack_value());
Expand All @@ -248,6 +262,13 @@ void parseACK(void)
if(ack_seen("E")) setParameter(P_MAX_ACCELERATION, E_STEPPER, ack_value());

}
else if(ack_seen("M201 T0 E")){
setParameter(P_MAX_ACCELERATION, E_STEPPER, ack_value());
}
else if(ack_seen("M201 T1 E")){
setParameter(P_MAX_ACCELERATION, E2_STEPPER, ack_value());
dualstepper[E_STEPPER] = true;
}
//parse and store Acceleration values
else if(ack_seen("M204 P")){
setParameter(P_ACCELERATION, X_STEPPER, ack_value());
Expand Down

0 comments on commit 6c1b2f0

Please sign in to comment.