Browse Source

Merge pull request #4291 from esenapaj/Follow-up-the-PR-#4278

Follow-up the PR #4278 (Fixups for PID_ADD_EXTRUSION_RATE and HOTENDS==1)
Scott Lahteine 8 years ago
parent
commit
ed89c71e53
2 changed files with 2 additions and 2 deletions
  1. 1
    1
      Marlin/configuration_store.cpp
  2. 1
    1
      Marlin/temperature.cpp

+ 1
- 1
Marlin/configuration_store.cpp View File

617
   #endif
617
   #endif
618
 
618
 
619
   #if ENABLED(PIDTEMP)
619
   #if ENABLED(PIDTEMP)
620
-    #if ENABLED(PID_PARAMS_PER_HOTEND)
620
+    #if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1
621
       HOTEND_LOOP()
621
       HOTEND_LOOP()
622
     #else
622
     #else
623
       int e = 0; UNUSED(e); // only need to write once
623
       int e = 0; UNUSED(e); // only need to write once

+ 1
- 1
Marlin/temperature.cpp View File

68
 #endif
68
 #endif
69
 
69
 
70
 #if ENABLED(PIDTEMP)
70
 #if ENABLED(PIDTEMP)
71
-  #if ENABLED(PID_PARAMS_PER_HOTEND)
71
+  #if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1
72
     float Temperature::Kp[HOTENDS] = ARRAY_BY_HOTENDS1(DEFAULT_Kp),
72
     float Temperature::Kp[HOTENDS] = ARRAY_BY_HOTENDS1(DEFAULT_Kp),
73
           Temperature::Ki[HOTENDS] = ARRAY_BY_HOTENDS1((DEFAULT_Ki) * (PID_dT)),
73
           Temperature::Ki[HOTENDS] = ARRAY_BY_HOTENDS1((DEFAULT_Ki) * (PID_dT)),
74
           Temperature::Kd[HOTENDS] = ARRAY_BY_HOTENDS1((DEFAULT_Kd) / (PID_dT));
74
           Temperature::Kd[HOTENDS] = ARRAY_BY_HOTENDS1((DEFAULT_Kd) / (PID_dT));

Loading…
Cancel
Save