Sfoglia il codice sorgente

Adapt to latest PID code and fix typos

Scott Lahteine 10 anni fa
parent
commit
3a26804d80
1 ha cambiato i file con 3 aggiunte e 4 eliminazioni
  1. 3
    4
      Marlin/ultralcd.cpp

+ 3
- 4
Marlin/ultralcd.cpp Vedi File

863
         void copy_and_scalePID_d_E3() { copy_and_scalePID_d(2); }
863
         void copy_and_scalePID_d_E3() { copy_and_scalePID_d(2); }
864
         #if EXTRUDERS > 3
864
         #if EXTRUDERS > 3
865
           void copy_and_scalePID_i_E4() { copy_and_scalePID_i(3); }
865
           void copy_and_scalePID_i_E4() { copy_and_scalePID_i(3); }
866
-          void copy_and_scalePID_d_E5() { copy_and_scalePID_d(3); }
866
+          void copy_and_scalePID_d_E4() { copy_and_scalePID_d(3); }
867
         #endif //EXTRUDERS > 3
867
         #endif //EXTRUDERS > 3
868
       #endif //EXTRUDERS > 2
868
       #endif //EXTRUDERS > 2
869
     #endif //EXTRUDERS > 1
869
     #endif //EXTRUDERS > 1
905
   #endif
905
   #endif
906
   #ifdef PIDTEMP
906
   #ifdef PIDTEMP
907
     // set up temp variables - undo the default scaling
907
     // set up temp variables - undo the default scaling
908
-    pid_current_extruder = 0;
909
     raw_Ki = unscalePID_i(PID_PARAM(Ki,0));
908
     raw_Ki = unscalePID_i(PID_PARAM(Ki,0));
910
     raw_Kd = unscalePID_d(PID_PARAM(Kd,0));
909
     raw_Kd = unscalePID_d(PID_PARAM(Kd,0));
911
     MENU_ITEM_EDIT(float52, MSG_PID_P, &PID_PARAM(Kp,0), 1, 9990);
910
     MENU_ITEM_EDIT(float52, MSG_PID_P, &PID_PARAM(Kp,0), 1, 9990);
912
     // i is typically a small value so allows values below 1
911
     // i is typically a small value so allows values below 1
913
-    MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I, &raw_Ki, 0.01, 9990, copy_and_scalePID_i);
914
-    MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D, &raw_Kd, 1, 9990, copy_and_scalePID_d);
912
+    MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E1);
913
+    MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D, &raw_Kd, 1, 9990, copy_and_scalePID_d_E1);
915
     #ifdef PID_ADD_EXTRUSION_RATE
914
     #ifdef PID_ADD_EXTRUSION_RATE
916
       MENU_ITEM_EDIT(float3, MSG_PID_C, &PID_PARAM(Kc,0), 1, 9990);
915
       MENU_ITEM_EDIT(float3, MSG_PID_C, &PID_PARAM(Kc,0), 1, 9990);
917
     #endif//PID_ADD_EXTRUSION_RATE
916
     #endif//PID_ADD_EXTRUSION_RATE

Loading…
Annulla
Salva