Browse Source

Always report all PIDs in M503

Fix #14474
Scott Lahteine 5 years ago
parent
commit
af80653f3f
1 changed files with 13 additions and 28 deletions
  1. 13
    28
      Marlin/src/module/configuration_store.cpp

+ 13
- 28
Marlin/src/module/configuration_store.cpp View File

2964
     #if HAS_PID_HEATING
2964
     #if HAS_PID_HEATING
2965
 
2965
 
2966
       CONFIG_ECHO_HEADING("PID settings:");
2966
       CONFIG_ECHO_HEADING("PID settings:");
2967
+
2967
       #if ENABLED(PIDTEMP)
2968
       #if ENABLED(PIDTEMP)
2968
-        #if HOTENDS > 1
2969
-          if (forReplay) {
2970
-            HOTEND_LOOP() {
2971
-              CONFIG_ECHO_START();
2972
-              SERIAL_ECHOPAIR(
2973
-                  "  M301 E", e
2974
-                , " P", PID_PARAM(Kp, e)
2975
-                , " I", unscalePID_i(PID_PARAM(Ki, e))
2976
-                , " D", unscalePID_d(PID_PARAM(Kd, e))
2977
-              );
2978
-              #if ENABLED(PID_EXTRUSION_SCALING)
2979
-                SERIAL_ECHOPAIR(" C", PID_PARAM(Kc, e));
2980
-                if (e == 0) SERIAL_ECHOPAIR(" L", thermalManager.lpq_len);
2981
-              #endif
2982
-              SERIAL_EOL();
2983
-            }
2984
-          }
2985
-          else
2986
-        #endif // HOTENDS > 1
2987
-        // !forReplay || HOTENDS == 1
2988
-        {
2969
+        HOTEND_LOOP() {
2989
           CONFIG_ECHO_START();
2970
           CONFIG_ECHO_START();
2990
-          SERIAL_ECHOLNPAIR(
2991
-              "  M301 P", PID_PARAM(Kp, 0) // for compatibility with hosts, only echo values for E0
2992
-            , " I", unscalePID_i(PID_PARAM(Ki, 0))
2993
-            , " D", unscalePID_d(PID_PARAM(Kd, 0))
2994
-            #if ENABLED(PID_EXTRUSION_SCALING)
2995
-              , " C", PID_PARAM(Kc, 0)
2996
-              , " L", thermalManager.lpq_len
2971
+          SERIAL_ECHOPAIR("  M301"
2972
+            #if HOTENDS > 1 && ENABLED(PID_PARAMS_PER_HOTEND)
2973
+              " E", e,
2997
             #endif
2974
             #endif
2975
+              " P", PID_PARAM(Kp, e)
2976
+            , " I", unscalePID_i(PID_PARAM(Ki, e))
2977
+            , " D", unscalePID_d(PID_PARAM(Kd, e))
2998
           );
2978
           );
2979
+          #if ENABLED(PID_EXTRUSION_SCALING)
2980
+            SERIAL_ECHOPAIR(" C", PID_PARAM(Kc, e));
2981
+            if (e == 0) SERIAL_ECHOPAIR(" L", thermalManager.lpq_len);
2982
+          #endif
2983
+          SERIAL_EOL();
2999
         }
2984
         }
3000
       #endif // PIDTEMP
2985
       #endif // PIDTEMP
3001
 
2986
 

Loading…
Cancel
Save