Browse Source

Sync config to examples

Scott Lahteine 4 years ago
parent
commit
c25c31b1de
2 changed files with 6 additions and 3 deletions
  1. 4
    3
      Marlin/Configuration.h
  2. 2
    0
      Marlin/Configuration_adv.h

+ 4
- 3
Marlin/Configuration.h View File

486
   //#define PID_AUTOTUNE_MENU     // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM)
486
   //#define PID_AUTOTUNE_MENU     // Add PID auto-tuning to the "Advanced Settings" menu. (~250 bytes of PROGMEM)
487
   //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
487
   //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
488
                                   // Set/get with gcode: M301 E[extruder number, 0-2]
488
                                   // Set/get with gcode: M301 E[extruder number, 0-2]
489
+
489
   #if ENABLED(PID_PARAMS_PER_HOTEND)
490
   #if ENABLED(PID_PARAMS_PER_HOTEND)
490
     // Specify between 1 and HOTENDS values per array.
491
     // Specify between 1 and HOTENDS values per array.
491
     // If fewer than EXTRUDER values are provided, the last element will be repeated.
492
     // If fewer than EXTRUDER values are provided, the last element will be repeated.
492
-    #define DEFAULT_Kp_LIST {  22.20,  20.0 }
493
-    #define DEFAULT_Ki_LIST {   1.08,   1.0 }
494
-    #define DEFAULT_Kd_LIST { 114.00, 112.0 }
493
+    #define DEFAULT_Kp_LIST {  22.20,  22.20 }
494
+    #define DEFAULT_Ki_LIST {   1.08,   1.08 }
495
+    #define DEFAULT_Kd_LIST { 114.00, 114.00 }
495
   #else
496
   #else
496
     #define DEFAULT_Kp  22.20
497
     #define DEFAULT_Kp  22.20
497
     #define DEFAULT_Ki   1.08
498
     #define DEFAULT_Ki   1.08

+ 2
- 0
Marlin/Configuration_adv.h View File

771
 //
771
 //
772
 //#define ASSISTED_TRAMMING
772
 //#define ASSISTED_TRAMMING
773
 #if ENABLED(ASSISTED_TRAMMING)
773
 #if ENABLED(ASSISTED_TRAMMING)
774
+
774
   // Define positions for probing points, use the hotend as reference not the sensor.
775
   // Define positions for probing points, use the hotend as reference not the sensor.
775
   #define TRAMMING_POINT_XY { {  20, 20 }, { 200,  20 }, { 200, 200 }, { 20, 200 } }
776
   #define TRAMMING_POINT_XY { {  20, 20 }, { 200,  20 }, { 200, 200 }, { 20, 200 } }
776
 
777
 
793
    *   M5: 50 = Clockwise, 51 = Counter-Clockwise
794
    *   M5: 50 = Clockwise, 51 = Counter-Clockwise
794
    */
795
    */
795
   #define TRAMMING_SCREW_THREAD 30
796
   #define TRAMMING_SCREW_THREAD 30
797
+
796
 #endif
798
 #endif
797
 
799
 
798
 // @section motion
800
 // @section motion

Loading…
Cancel
Save