From 6c1b2f096a51d0f0c830c9d77c59f0627eb952ce Mon Sep 17 00:00:00 2001 From: Radek <46979052+radek8@users.noreply.github.com> Date: Thu, 30 Apr 2020 03:09:03 +0200 Subject: [PATCH] Correction for: two extruders, Sintaxe LCD_Encoder.c, CZ translation (#621) --- TFT/src/User/API/LCD_Encoder.c | 7 ++++--- TFT/src/User/API/parseACK.c | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/TFT/src/User/API/LCD_Encoder.c b/TFT/src/User/API/LCD_Encoder.c index 3014290f57..e2392ac0fe 100644 --- a/TFT/src/User/API/LCD_Encoder.c +++ b/TFT/src/User/API/LCD_Encoder.c @@ -169,7 +169,7 @@ void loopCheckEncoder() sy = ey; return 2; } - return 0; + //return 0; } else { @@ -178,7 +178,7 @@ void loopCheckEncoder() sy = ey; return 3; } - return 0; + //return 0; } } } @@ -188,8 +188,9 @@ void loopCheckEncoder() sy = ey =0; MOVE = false; skipMode = false; //resume mode change loop - return 0; + //return 0; } + return 0; } #endif diff --git a/TFT/src/User/API/parseACK.c b/TFT/src/User/API/parseACK.c index 0d78d8a801..3b11dde5fb 100644 --- a/TFT/src/User/API/parseACK.c +++ b/TFT/src/User/API/parseACK.c @@ -233,6 +233,13 @@ 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()); @@ -240,6 +247,13 @@ void parseACK(void) 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()); @@ -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());