Selaa lähdekoodia

Fix error next command in autotune (PR#2274)

Now send only temperature for T or B, but not send OK.
Host interprets the line to show the right temperature, but not in
response to M105 then stop and send commands until it ends the autotune.
MagoKimbra 10 vuotta sitten
vanhempi
commit
eb81982fcd
3 muutettua tiedostoa jossa 5 lisäystä ja 9 poistoa
  1. 0
    3
      Marlin/Marlin_main.cpp
  2. 2
    2
      Marlin/language.h
  3. 3
    4
      Marlin/temperature.cpp

+ 0
- 3
Marlin/Marlin_main.cpp Näytä tiedosto

@@ -4510,9 +4510,6 @@ inline void gcode_M303() {
4510 4510
   int c = code_seen('C') ? code_value_short() : 5;
4511 4511
   float temp = code_seen('S') ? code_value() : (e < 0 ? 70.0 : 150.0);
4512 4512
   PID_autotune(temp, e, c);
4513
-  // Suppress a line mismatch error
4514
-  gcode_LastN += 1;
4515
-  FlushSerialRequestResend();
4516 4513
 }
4517 4514
 
4518 4515
 #ifdef SCARA

+ 2
- 2
Marlin/language.h Näytä tiedosto

@@ -195,8 +195,8 @@
195 195
 #define MSG_KP                              " Kp: "
196 196
 #define MSG_KI                              " Ki: "
197 197
 #define MSG_KD                              " Kd: "
198
-#define MSG_OK_B                            "ok B:"
199
-#define MSG_OK_T                            "ok T:"
198
+#define MSG_B                               "B:"
199
+#define MSG_T                               "T:"
200 200
 #define MSG_AT                              " @:"
201 201
 #define MSG_PID_AUTOTUNE_FINISHED           MSG_PID_AUTOTUNE " finished! Put the last Kp, Ki and Kd constants from below into Configuration.h"
202 202
 #define MSG_PID_DEBUG                       " PID_DEBUG "

+ 3
- 4
Marlin/temperature.cpp Näytä tiedosto

@@ -191,8 +191,7 @@ static void updateTemperaturesFromRawValues();
191 191
 //================================ Functions ================================
192 192
 //===========================================================================
193 193
 
194
-void PID_autotune(float temp, int extruder, int ncycles)
195
-{
194
+void PID_autotune(float temp, int extruder, int ncycles) {
196 195
   float input = 0.0;
197 196
   int cycles = 0;
198 197
   bool heating = true;
@@ -324,11 +323,11 @@ void PID_autotune(float temp, int extruder, int ncycles)
324 323
       int p;
325 324
       if (extruder < 0) {
326 325
         p = soft_pwm_bed;
327
-        SERIAL_PROTOCOLPGM(MSG_OK_B);
326
+        SERIAL_PROTOCOLPGM(MSG_B);
328 327
       }
329 328
       else {
330 329
         p = soft_pwm[extruder];
331
-        SERIAL_PROTOCOLPGM(MSG_OK_T);
330
+        SERIAL_PROTOCOLPGM(MSG_T);
332 331
       }
333 332
 
334 333
       SERIAL_PROTOCOL(input);

Loading…
Peruuta
Tallenna